diff --git a/content/intro/arch.md b/content/intro/arch.md
index dd26bf702..273f270ac 100644
--- a/content/intro/arch.md
+++ b/content/intro/arch.md
@@ -8,23 +8,6 @@ dashboardAudit: n/a
 
 # Architecture Diagrams
 
-## Overview Diagram
-{{< details title="TODO" >}}
-- cleanup / reorganize
-  - this diagram is accurate, and helps lots to navigate, but it's still a bit confusing
-  - the arrows and lines make it a bit hard to follow. We should have a much cleaner version (maybe based on [C4](https://c4model.com))
-- reflect addition of Token system
-  - move data_transfers into Token
-{{< /details >}}
+Actor State Diagram
 
-![Protocol Overview Diagram](diagrams/overview1/overview.dot)
-
-## Protocol Flow Diagram
-
-![Deals on Chain](diagrams/sequence/full-deals-on-chain.mmd)
-
-## Parameter Calculation Dependency Graph
-
-This is a diagram of the model for parameter calculation. This is made with [orient](https://github.com/filecoin-project/orient), our tool for modeling and solving for constraints.
-
-![Protocol Overview Diagram](diagrams/orient/filecoin.dot)
\ No newline at end of file
+![Actor State Diagram](/intro/new-state-diagram.mmd)
diff --git a/content/intro/new-state-diagram.mmd b/content/intro/new-state-diagram.mmd
new file mode 100644
index 000000000..40033ada6
--- /dev/null
+++ b/content/intro/new-state-diagram.mmd
@@ -0,0 +1,19 @@
+stateDiagram
+
+    Null --> Precommitted: PreCommitSectors
+    Precommitted --> Committed: CommitSectors
+    Precommitted --> Deleted: CronPreCommitExpiry (PCD)
+    Committed --> Active: SubmittedWindowPoSt
+    Committed --> Faulty: DeclareFault\nSubmitWindowPoSt (SP)\nProvingDeadline (SP)
+    Committed --> Terminated: TerminateSectors\n(TF)
+    Faulty --> Active: SubmittedWindowPoSt (FF)
+    Faulty --> Faulty: ProvingDeadline (FF)
+    Faulty --> Recovering: DeclareFaultRecovered
+    Faulty --> Terminated: EarlyExpiration (TF)\nTerminateSectors (TF)
+    Recovering --> Active: SubmittedWindowPoSt (FF)
+    Recovering --> Faulty: DeclareFault\nProvingDeadline (SP)
+    Recovering --> Terminated: TerminateSectors (TF)
+    Active --> Active: SubmittedWindowPoSt
+    Active --> Faulty: DeclareFault\nSubmitWindowPoSt (SP)\nProvingDeadline (SP)
+    Active --> Terminated: CronExpiration\nTerminateSectors (TF)
+    Terminated --> Deleted: CompactSectors
diff --git a/layouts/shortcodes/mermaid.html b/layouts/shortcodes/mermaid.html
index 5960f84e0..417f87ecb 100644
--- a/layouts/shortcodes/mermaid.html
+++ b/layouts/shortcodes/mermaid.html
@@ -4,7 +4,7 @@
     <script>
     mermaid.initialize({
       startOnLoad:false,
-      theme: 'dark',
+      theme: 'forest',
       flowchart: { useMaxWidth:true }
     });
     </script>
@@ -58,4 +58,4 @@
     };
     mermaid.render('temp-{{ $uuid }}', {{- .Inner -}}, insertSvg)
   </script>
-{{ end }}
\ No newline at end of file
+{{ end }}