diff --git a/app/Jobs/StatusPipeline/NewStatusPipeline.php b/app/Jobs/StatusPipeline/NewStatusPipeline.php
index 2ba51114d..0b392639b 100644
--- a/app/Jobs/StatusPipeline/NewStatusPipeline.php
+++ b/app/Jobs/StatusPipeline/NewStatusPipeline.php
@@ -41,16 +41,6 @@ class NewStatusPipeline implements ShouldQueue
      */
     public function handle()
     {
-        $status = $this->status;
-
-        StatusEntityLexer::dispatch($status);
-
-        if(config('pixelfed.activitypub_enabled') == true) {
-            StatusActivityPubDeliver::dispatch($status);
-        }
-        
-        // Cache::forever('post.'.$status->id, $status);
-        // $redis = Redis::connection();
-        // $redis->lpush(config('cache.prefix').':user.'.$status->profile_id.'.posts', $status->id);
+        StatusEntityLexer::dispatch($this->status);
     }
 }
diff --git a/app/Jobs/StatusPipeline/StatusEntityLexer.php b/app/Jobs/StatusPipeline/StatusEntityLexer.php
index 72cd0394c..5fe3cf34a 100644
--- a/app/Jobs/StatusPipeline/StatusEntityLexer.php
+++ b/app/Jobs/StatusPipeline/StatusEntityLexer.php
@@ -75,7 +75,6 @@ class StatusEntityLexer implements ShouldQueue
     public function storeEntities()
     {
         $this->storeHashtags();
-        $this->storeMentions();
         DB::transaction(function () {
             $status = $this->status;
             $status->rendered = nl2br($this->autolink);
@@ -100,6 +99,7 @@ class StatusEntityLexer implements ShouldQueue
                 );
             });
         }
+        $this->storeMentions();
     }
 
     public function storeMentions()
@@ -123,5 +123,13 @@ class StatusEntityLexer implements ShouldQueue
                 MentionPipeline::dispatch($status, $m);
             });
         }
+        $this->deliver();
+    }
+
+    public function deliver()
+    {
+        if(config('pixelfed.activitypub_enabled') == true) {
+            StatusActivityPubDeliver::dispatch($this->status);
+        }
     }
 }
diff --git a/public/js/timeline.js b/public/js/timeline.js
index 5e409d7fd..358ac25ad 100644
Binary files a/public/js/timeline.js and b/public/js/timeline.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index c5c0513a2..67b084cc6 100644
Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ
diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index a518ce327..0d60705be 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -204,10 +204,6 @@
 							<label class="custom-control-label font-weight-bold" for="mode-mod">Moderator Mode</label>
 						</div>
 						<!-- <div class="custom-control custom-switch mb-3">
-							<input type="checkbox" class="custom-control-input" id="mode-dark" v-on:click="modeDarkToggle()" v-model="modes.dark">
-							<label class="custom-control-label font-weight-bold" for="mode-dark">Dark Mode</label>
-						</div>
-						<div class="custom-control custom-switch mb-3">
 							<input type="checkbox" class="custom-control-input" id="mode-notify" v-on:click="modeNotifyToggle()"  v-model="!modes.notify">
 							<label class="custom-control-label font-weight-bold" for="mode-notify">Disable Notifications</label>
 						</div> -->
@@ -215,6 +211,12 @@
 							<input type="checkbox" class="custom-control-input" id="mode-infinite" v-on:click="modeInfiniteToggle()" v-model="modes.infinite">
 							<label class="custom-control-label font-weight-bold" for="mode-infinite">Enable Infinite Scroll</label>
 						</div>
+						<hr>
+						<p class="font-weight-bold">BETA FEATURES</p>
+						<div class="custom-control custom-switch">
+							<input type="checkbox" class="custom-control-input" id="mode-dark" v-on:click="modeDarkToggle()" v-model="modes.dark">
+							<label class="custom-control-label font-weight-bold" for="mode-dark">Dark Mode</label>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -793,23 +795,15 @@
 				// todo: more graceful stylesheet change
 				if(this.modes.dark == true) {
 					this.modes.dark = false;
-					$('link[rel=stylesheet]').remove();
-					let head = document.head;
-					let link = document.createElement("link");
-					link.type = "text/css";
-					link.rel = "stylesheet";
-					link.href = "/css/app.css";
-					head.appendChild(link);
+					$('link[data-stylesheet=dark]').remove();
 				} else {
 					this.modes.dark = true;
-					$('link[rel=stylesheet]').remove();
 					let head = document.head;
 					let link = document.createElement("link");
-					link.id = "darkModeSheet";
 					link.type = "text/css";
 					link.rel = "stylesheet";
 					link.href = "/css/appdark.css";
-
+					link.setAttribute('data-stylesheet','dark');
 					head.appendChild(link);
 				}
 				window.ls.set('pixelfed-classicui-settings', this.modes);
diff --git a/resources/views/layouts/anon.blade.php b/resources/views/layouts/anon.blade.php
index 737b6fc17..a97bd5da4 100644
--- a/resources/views/layouts/anon.blade.php
+++ b/resources/views/layouts/anon.blade.php
@@ -25,7 +25,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
     <link rel="canonical" href="{{request()->url()}}">
-    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/app.css') }}" rel="stylesheet" data-stylesheet="light">
     @stack('styles')
 </head>
 <body class="">
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index dfbe77a56..6f7c571f7 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -23,7 +23,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
     <link rel="canonical" href="{{request()->url()}}">
-    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/app.css') }}" rel="stylesheet" data-stylesheet="light">
     @stack('styles')
 
 </head>
diff --git a/resources/views/layouts/blank.blade.php b/resources/views/layouts/blank.blade.php
index c7969dfe0..089d8a261 100644
--- a/resources/views/layouts/blank.blade.php
+++ b/resources/views/layouts/blank.blade.php
@@ -22,7 +22,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
     <link rel="canonical" href="{{request()->url()}}">
-    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/app.css') }}" rel="stylesheet" data-stylesheet="light">
     @stack('styles')
 </head>
 <body class="">
diff --git a/resources/views/layouts/bundle.blade.php b/resources/views/layouts/bundle.blade.php
index 99775f597..e212cf2a2 100644
--- a/resources/views/layouts/bundle.blade.php
+++ b/resources/views/layouts/bundle.blade.php
@@ -23,7 +23,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
     <link rel="canonical" href="{{request()->url()}}">
-    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/app.css') }}" rel="stylesheet" data-stylesheet="light">
     @stack('styles')
 
 </head>