diff --git a/derivations/default.nix b/derivations/default.nix
index 4b3603a7..4aac7071 100644
--- a/derivations/default.nix
+++ b/derivations/default.nix
@@ -9,7 +9,7 @@
   dconf-editor-wrapped = pkgs.callPackage ./dconf-editor-wrapped {};
   dell-b1160w = pkgs.callPackage ./dell-b1160w {};
   firefox-gnome-theme = pkgs.callPackage ./firefox-gnome-theme {src = inputs.firefox-gnome-theme;};
-  modules-options-doc = pkgs.callPackage ./modules-options-doc {mylib = mylib;};
+  # modules-options-doc = pkgs.callPackage ./modules-options-doc {mylib = mylib;}; # TODO: Borked
   spotdl-4_1_6 = pkgs.callPackage ./spotdl-4_1_6 {};
   xdg-desktop-portal-termfilechooser = pkgs.callPackage ./xdg-desktop-portal-termfilechooser {};
   wiiu-downloader = pkgs.callPackage ./wiiu-downloader {};
diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 6304475a..74b2e2f8 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -386,12 +386,12 @@ rec {
     glxinfo # opengl info
     wayland-utils # wayland-info
     aha # ansi html adapter? TODO: Why did I install this?
-    radeontop
+    # radeontop
     clinfo # OpenCL info
     vulkan-tools # vulkaninfo
     libva-utils # vainfo
     vdpauinfo
-    rocminfo # radeon comptute platform info
+    # rocminfo # radeon comptute platform info
     hwloc
     lm_sensors
     acpica-tools # Dump ACPI tables etc.
@@ -476,10 +476,10 @@ rec {
     cachix
 
     # Generate documentation
-    modules-options-doc
+    # modules-options-doc
   ];
 
-  home.file.".options-doc".source = "${pkgs.modules-options-doc}";
+  # home.file.".options-doc".source = "${pkgs.modules-options-doc}";
 
   # Packages with extra options managed by HomeManager natively
   programs = {
@@ -517,12 +517,12 @@ rec {
 
           # Cursor colors
           cursor = {
-              text = "#EFF1F5"; # base
-              cursor = "#DC8A78"; # rosewater
+            text = "#EFF1F5"; # base
+            cursor = "#DC8A78"; # rosewater
           };
           vi_mode_cursor = {
-              text = "#EFF1F5"; # base
-              cursor = "#7287FD"; # lavender
+            text = "#EFF1F5"; # base
+            cursor = "#7287FD"; # lavender
           };
 
           # Search colors
@@ -548,8 +548,8 @@ rec {
               background = "#DF8E1D"; # yellow
             };
             end = {
-                foreground = "#EFF1F5"; # base
-                background = "#6C6F85"; # subtext0
+              foreground = "#EFF1F5"; # base
+              background = "#6C6F85"; # subtext0
             };
           };
 
@@ -613,12 +613,15 @@ rec {
       enable = true;
 
       themes = {
-        catppuccin-latte = builtins.readFile (pkgs.fetchFromGitHub {
-          owner = "catppuccin";
-          repo = "bat";
-          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-          sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-        } + "/Catppuccin-latte.tmTheme");
+        catppuccin-latte = {
+          src = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "bat";
+            rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+            sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+          };
+          file = "Catppuccin-latte.tmTheme";
+        };
       };
 
       config = {
@@ -821,43 +824,43 @@ rec {
 
       options = {
         # Catppuccin Latte
-        default-fg                = "#4C4F69";
-        default-bg 			          = "#EFF1F5";
+        default-fg = "#4C4F69";
+        default-bg = "#EFF1F5";
 
-        completion-bg		          = "#CCD0DA";
-        completion-fg		          = "#4C4F69";
-        completion-highlight-bg	  = "#575268";
-        completion-highlight-fg	  = "#4C4F69";
-        completion-group-bg		    = "#CCD0DA";
-        completion-group-fg		    = "#1E66F5";
+        completion-bg = "#CCD0DA";
+        completion-fg = "#4C4F69";
+        completion-highlight-bg = "#575268";
+        completion-highlight-fg = "#4C4F69";
+        completion-group-bg = "#CCD0DA";
+        completion-group-fg = "#1E66F5";
 
-        statusbar-fg		          = "#4C4F69";
-        statusbar-bg		          = "#CCD0DA";
+        statusbar-fg = "#4C4F69";
+        statusbar-bg = "#CCD0DA";
 
-        notification-bg		        = "#CCD0DA";
-        notification-fg		        = "#4C4F69";
-        notification-error-bg	    = "#CCD0DA";
-        notification-error-fg	    = "#D20F39";
-        notification-warning-bg	  = "#CCD0DA";
-        notification-warning-fg	  = "#FAE3B0";
+        notification-bg = "#CCD0DA";
+        notification-fg = "#4C4F69";
+        notification-error-bg = "#CCD0DA";
+        notification-error-fg = "#D20F39";
+        notification-warning-bg = "#CCD0DA";
+        notification-warning-fg = "#FAE3B0";
 
-        inputbar-fg			          = "#4C4F69";
-        inputbar-bg 		          = "#CCD0DA";
+        inputbar-fg = "#4C4F69";
+        inputbar-bg = "#CCD0DA";
 
-        recolor-lightcolor		    = "#EFF1F5";
-        recolor-darkcolor		      = "#4C4F69";
+        recolor-lightcolor = "#EFF1F5";
+        recolor-darkcolor = "#4C4F69";
 
-        index-fg			            = "#4C4F69";
-        index-bg			            = "#EFF1F5";
-        index-active-fg		        = "#4C4F69";
-        index-active-bg		        = "#CCD0DA";
+        index-fg = "#4C4F69";
+        index-bg = "#EFF1F5";
+        index-active-fg = "#4C4F69";
+        index-active-bg = "#CCD0DA";
 
-        render-loading-bg		      = "#EFF1F5";
-        render-loading-fg		      = "#4C4F69";
+        render-loading-bg = "#EFF1F5";
+        render-loading-fg = "#4C4F69";
 
-        highlight-color		        = "#575268";
-        highlight-fg              = "#EA76CB";
-        highlight-active-color	  = "#EA76CB";
+        highlight-color = "#575268";
+        highlight-fg = "#EA76CB";
+        highlight-active-color = "#EA76CB";
       };
     };