diff --git a/colors/default.nix b/colors/default.nix
index d221312..7e8d926 100644
--- a/colors/default.nix
+++ b/colors/default.nix
@@ -1,12 +1,8 @@
 let
   theme = import ./everforest;
-  colors = {
-    undefined = "#ff00ff";
-    fg1 = "#ffffff";
-  };
 in
 {
+  undefined = "#ff00ff";
+  fg1 = "#ffffff";
   css = lib: lib.strings.concatStringsSep "\n" (lib.attrValues (lib.mapAttrs (k: v: "  --${k}: ${v};") theme.colors));
-}
-// colors // theme.colors # Root colors
-// theme // { colors = theme.colors // colors; } # Dedicated color set
+} // theme // theme.colors
diff --git a/colors/everforest/default.nix b/colors/everforest/default.nix
index a7515a0..a5b4ce5 100644
--- a/colors/everforest/default.nix
+++ b/colors/everforest/default.nix
@@ -1,6 +1,4 @@
 {
-  theme = "everforest";
-
   kitty-theme = "Everforest Dark Hard";
   gtkTheme = pkgs: {
     package = pkgs.callPackage ./gtk.nix {};
diff --git a/colors/nord/default.nix b/colors/nord/default.nix
index e8e6f6e..af7f861 100644
--- a/colors/nord/default.nix
+++ b/colors/nord/default.nix
@@ -1,6 +1,4 @@
 {
-  theme = "nord";
-
   kitty-theme = "Nord";
   wallpaper = "roxynord.png";
   gtkTheme = pkgs: {
diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el
index 24e78a0..071a476 100644
--- a/emacs/.doom.d/init.el
+++ b/emacs/.doom.d/init.el
@@ -153,7 +153,7 @@
        ;;nim               ; python + lisp at the speed of c
        nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
-       (org +roam2)               ; organize your plain life in plain text
+       org               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
@@ -207,6 +207,3 @@
 ;; LaTeX editing
 (add-hook 'org-mode-hook 'org-fragtog-mode) ;; automatically expand/preview LaTeX
 (add-hook 'org-mode-hook 'org-latex-preview) ;; automatically preview LaTeX on open
-
-;; Display .rasi (rofi theme files) as CSS
-(add-to-list 'auto-mode-alist '("\\.rasi\\'" . css-mode))
diff --git a/hosts/desktop/i3/default.nix b/hosts/desktop/i3/default.nix
index 550dbb4..feea8f7 100644
--- a/hosts/desktop/i3/default.nix
+++ b/hosts/desktop/i3/default.nix
@@ -1,14 +1,10 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   xsession.windowManager.i3.config = {
     startup = [
       {
-        command = let layout = pkgs.substituteAll {
-          src = ./layout.sh;
-          tree = ./tree.json;
-          isExecutable = true;
-        }; in "${layout}";
+        command = ''i3-msg workspace 1 && (firefox &) && i3-msg "workspace 2; append_layout ${./tree.json}; open" && (for i in {1..4}; do i3-msg move left; done) && (discord &) && firefox --new-window https://youtube.com && i3-msg workspace 1'';
         always = true;
         notification = false;
       }
diff --git a/hosts/desktop/i3/layout.sh b/hosts/desktop/i3/layout.sh
deleted file mode 100644
index 31173fc..0000000
--- a/hosts/desktop/i3/layout.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-i3-msg workspace 1
-firefox &
-
-i3-msg "workspace 2; append_layout @tree@; open"
-for i in {1..4}; do
-    i3-msg move left
-done
-discord
-firefox --new-window https://youtube.com
-i3-msg workspace 1
diff --git a/rofi/default.nix b/rofi/default.nix
index a1948be..4ff19b8 100644
--- a/rofi/default.nix
+++ b/rofi/default.nix
@@ -1,18 +1,13 @@
 { pkgs, ... }:
 
-let
-  colors = import ../colors;
-  theme = colors.theme;
-in {
+{
   home.packages = with pkgs; [
     (pkgs.callPackage ./power.nix { })
     wmctrl # TODO: add as dependency of rofi-power
   ];
   programs.rofi = {
     enable = true;
-    inherit theme;
+    theme = "theme";
   };
-  home.file.".config/rofi/${theme}.rasi".source = pkgs.substituteAll ({
-    src = ./theme.rasi;
-  } // colors.colors);
+  home.file.".config/rofi/theme.rasi".text = import ./theme.nix;
 }
diff --git a/rofi/theme.rasi b/rofi/theme.nix
similarity index 71%
rename from rofi/theme.rasi
rename to rofi/theme.nix
index 4b19e8e..3e04f6b 100644
--- a/rofi/theme.rasi
+++ b/rofi/theme.nix
@@ -1,4 +1,6 @@
-/* Modified from https://github.com/undiabler/nord-rofi-theme */
+# Modified from https://github.com/undiabler/nord-rofi-theme
+let colors = import ../colors; in
+''
 configuration {
   font: "Noto Sans Mono 12";
 	width: 30;
@@ -16,7 +18,7 @@ configuration {
 
 * {
   background-color: transparent;
-  highlight: underline bold @fg1@;
+  highlight: underline bold ${colors.fg1};
 }
 
 window {
@@ -38,16 +40,16 @@ mainbox {
 }
 
 message {
-  color: @bg0@;
+  color: ${colors.bg0};
   padding: 5;
-  border-color: @fg0@;
+  border-color: ${colors.fg0};
   border:  0px 2px 2px 2px;
 }
 
 inputbar {
-  color: @fg0@;
+  color: ${colors.fg0};
   padding: 11px;
-  background-color: @bg1@;
+  background-color: ${colors.bg1};
 }
 
 entry, prompt, case-indicator {
@@ -62,22 +64,23 @@ prompt {
 listview {
   padding: 8px;
   border: 0;
-  background-color: @bg0@e5;
+  background-color: ${colors.bg0}e5;
   dynamic: false;
 }
 
 element {
   padding: 3px;
   border-radius: 4px;
-  text-color: @fg0@;
+  text-color: ${colors.fg0};
 }
 
 element selected.normal {
-	background-color: @primary@;
-  text-color: @bg0@;
+	background-color: ${colors.primary};
+	text-color: ${colors.bg0};
 }
 
 element-text, element-icon {
   background-color: inherit;
   text-color: inherit;
 }
+''