diff --git a/system/home/browser/config.lisp b/system/home/browser/config.lisp
index 36c62deb..952602ec 100644
--- a/system/home/browser/config.lisp
+++ b/system/home/browser/config.lisp
@@ -61,8 +61,7 @@
 (define-configuration context-buffer
     "Go through the search engines above and make-search-engine out of them."
   ((search-engines
-    (mapcar (lambda (engine) (apply 'make-search-engine engine))
-            *my-search-engines*))))
+    (mapcar (lambda (engine) (apply 'make-search-engine engine)) *my-search-engines*))))
 
 (define-configuration browser
     ((restore-session-on-startup-p t)))
diff --git a/system/home/browser/nyxt.nix b/system/home/browser/nyxt.nix
index 516bda73..a713977d 100644
--- a/system/home/browser/nyxt.nix
+++ b/system/home/browser/nyxt.nix
@@ -18,33 +18,32 @@
           ;; Define custom theme
           (define-configuration browser
             ((theme (make-instance 'theme:theme
-                                   :dark-p ${if variant == "light" then "nil" else "t"}
                                    :font-family "${fonts.sansSerif.name}"
                                    :monospace-font-family "${fonts.monospace.name}"
                                    :text-color "${scheme.base05}"
-                                   :contrast-text-color "${scheme.base01}"
+                                   :contrast-text-color "${scheme.base04}"
                                    :background-color "${scheme.base00}"
-                                   :primary-color "${scheme.base02}"
+                                   :primary-color "${scheme.base04}"
                                    :secondary-color "${scheme.base03}"
                                    :tertiary-color "${scheme.base03}"
                                    :quaternary-color "${scheme.base03}"
-                                   :accent-color "${scheme.base0E}"
+                                   :accent-color "${accent}"
                                    :action-color "${scheme.cyan}"
                                    :success-color "${scheme.green}"
                                    :warning-color "${scheme.yellow}"
-                                   :highlight-color "${scheme.base01}"
+                                   :highlight-color "${scheme.base04}"
                                    :codeblock-color "${scheme.base01}"
-                                   ;; :on-background-color "${scheme.base05}"
-                                   ;; :on-primary-color "${scheme.base05}"
-                                   ;; :on-secondary-color "${scheme.base05}"
-                                   ;; :on-tertiary-color "${scheme.base05}"
-                                   ;; :on-quaternary-color "${scheme.base05}"
-                                   ;; :on-accent-color "${scheme.base01}"
-                                   ;; :on-action-color "${scheme.base01}"
-                                   ;; :on-success-color "${scheme.base01}"
-                                   ;; :on-warning-color "${scheme.base01}"
-                                   ;; :on-highlight-color "${scheme.base01}"
-                                   ;; :on-codeblock-color "${scheme.base05}"
+                                   :on-background-color "${scheme.base05}"
+                                   :on-primary-color "${scheme.base01}"
+                                   :on-secondary-color "${scheme.base01}"
+                                   :on-tertiary-color "${scheme.base01}"
+                                   :on-quaternary-color "${scheme.base01}"
+                                   :on-accent-color "${scheme.base01}"
+                                   :on-action-color "${scheme.base01}"
+                                   :on-success-color "${scheme.base01}"
+                                   :on-warning-color "${scheme.base01}"
+                                   :on-highlight-color "${scheme.base01}"
+                                   :on-codeblock-color "${scheme.base05}"
                                    ))))
         '';
     };
@@ -53,8 +52,8 @@
         # Make a string of lisp-style list of strings, from nix-style
         # list
         convertTags = tags: "(" + (builtins.foldl' (x: y: x + " \"" + y + "\"") "" tags) + " )";
-        # Take bookmarks as returned from JSON file and convert to NYXT
-        # expected format
+        # Take bookmarks as returned from JSON file and convert to
+        # NYXT expected format
         convertBookmark =
           {
             name,
@@ -64,10 +63,10 @@
           "(:url \"${url}\" :title \"${name}\" :tags ${convertTags tags})\n";
       in
       (
-        # Fold all entries in bookmarks.json into single string of NYXT
-        # format bookmarks, each entry on a new line and with 2 space
-        # indentation, just for visual clarity if reading the outputted
-        # file
+        # Fold all entries in bookmarks.json into single string of
+        # NYXT format bookmarks, each entry on a new line and with 2
+        # space indentation, just for visual clarity if reading the
+        # outputted file
         "(\n"
         + (builtins.foldl' (x: y: x + "  " + convertBookmark y) "" (
           builtins.fromJSON (builtins.readFile ./bookmarks.json)