diff --git a/home-manager/roles/desktop/default.nix b/home-manager/roles/desktop/default.nix
index 74a4defc..48e41e7f 100644
--- a/home-manager/roles/desktop/default.nix
+++ b/home-manager/roles/desktop/default.nix
@@ -16,7 +16,7 @@ in {
       package = pkgs.arc-icon-theme;
     };
     theme = {
-      name = "Arc-Dark";
+      name = "Arc";
       package = pkgs.arc-theme;
     };
   };
diff --git a/home-manager/roles/desktop/kitty.nix b/home-manager/roles/desktop/kitty.nix
index 067d2bff..f802810c 100644
--- a/home-manager/roles/desktop/kitty.nix
+++ b/home-manager/roles/desktop/kitty.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 let
   my-lib = import ../../../lib;
-  inherit (my-lib) colors;
+  theme = my-lib.themes.default;
 in {
   home.sessionVariables.TERMINAL = "${pkgs.kitty}/bin/kitty";
   home.packages = [
@@ -23,43 +23,42 @@ in {
 
       font_size = "10.5";
 
-      foreground = colors.foreground;
-      background = colors.background;
-      background_opacity = "0.9";
+      foreground = theme.primary.foreground;
+      background = theme.primary.background;
 
-      selection_foreground = colors.background;
-      selection_background = colors.foreground;
+      selection_foreground = theme.primary.background;
+      selection_background = theme.primary.foreground;
 
       # black
-      color0 = colors.black;
-      color8 = colors.brightBlack;
+      color0 = theme.normal.white;
+      color8 = theme.bright.white;
 
       # red
-      color1 = colors.red;
-      color9 = colors.brightRed;
+      color1 = theme.normal.red;
+      color9 = theme.bright.red;
 
       # green
-      color2 = colors.green;
-      color10 = colors.brightGreen;
+      color2 = theme.normal.green;
+      color10 = theme.bright.green;
 
       # yellow
-      color3 = colors.yellow;
-      color11 = colors.brightYellow;
+      color3 = theme.normal.yellow;
+      color11 = theme.bright.yellow;
 
       # blue
-      color4 = colors.blue;
-      color12 = colors.brightBlue;
+      color4 = theme.normal.blue;
+      color12 = theme.bright.blue;
 
       # magenta
-      color5 = colors.magenta;
-      color13 = colors.brightMagenta;
+      color5 = theme.normal.magenta;
+      color13 = theme.bright.magenta;
 
       # cyan
-      color6 = colors.cyan;
-      color14 = colors.brightCyan;
+      color6 = theme.normal.cyan;
+      color14 = theme.bright.cyan;
 
-      color7 = colors.white;
-      color15 = colors.brightWhite;
+      color7 = theme.normal.black;
+      color15 = theme.bright.black;
     };
   };
 }
diff --git a/home-manager/roles/desktop/status.toml b/home-manager/roles/desktop/status.toml
deleted file mode 100644
index 256f2ae2..00000000
--- a/home-manager/roles/desktop/status.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-theme = "solarized-dark"
-icons = "awesome"
-
-[[block]]
-block = "music"
-buttons = ["play", "next"]
-max_width = 64
-
-[[block]]
-block = "net"
-device = "wlp61s0"
-ssid = true
-ip = false
-speed_up = false
-speed_down = false
-graph_up = false
-graph_down = false
-interval = 5
-
-[[block]]
-block = "disk_space"
-path = "/"
-alias = "/"
-info_type = "available"
-unit = "GB"
-interval = 60
-warning = 20.0
-alert = 10.0
-
-[[block]]
-block = "memory"
-display_type = "memory"
-format_mem = "{Mup}%"
-format_swap = "{SUp}%"
-
-[[block]]
-block = "sound"
-
-[[block]]
-block = "backlight"
-device = "intel_backlight"
-
-[[block]]
-block = "battery"
-driver = "upower"
-format = "{percentage}% ({power}W) {time}"
-
-[[block]]
-block = "time"
-interval = 5
-format = "%F %a %T"
diff --git a/home-manager/roles/neovim/vimrc b/home-manager/roles/neovim/vimrc
index 546513d6..8512b2a3 100644
--- a/home-manager/roles/neovim/vimrc
+++ b/home-manager/roles/neovim/vimrc
@@ -8,7 +8,7 @@ let g:tex_flavor = 'latex'
 nmap <space>e :CocCommand explorer --no-toggle<CR>
 
 set foldcolumn=1
-set background=dark
+set background=light
 set autoindent
 set nosmartindent
 set listchars=tab:»\ ,trail:.,extends:#
diff --git a/home-manager/roles/zsh/zshrc b/home-manager/roles/zsh/zshrc
index 71e25023..95015890 100644
--- a/home-manager/roles/zsh/zshrc
+++ b/home-manager/roles/zsh/zshrc
@@ -45,7 +45,6 @@ alias nom-build-remote="nom-build --builders '@/etc/nix/machines' --max-jobs 0"
 alias nix-build-remote="nix-build --builders '@/etc/nix/machines' --max-jobs 0"
 alias nixpkgs-review-pr-remote='nixpkgs-review pr --build-args "--builders @/etc/nix/machines --max-jobs 0"'
 alias nixpkgs-review-rev-remote='nixpkgs-review rev --build-args "--builders @/etc/nix/machines --max-jobs 0"'
-alias cat=bat
 alias accounting='hledger -f ~/git/buchhaltung/buchhaltung.ledger ui -- --watch --theme=terminal -T -E'
 alias o=xdg-open
 alias sudo='sudo -A'
diff --git a/lib/default.nix b/lib/default.nix
index 3c9021a1..2a29a864 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,22 +1,86 @@
 rec {
-  colors = {
-    "foreground" = "#dddbff";
-    "background" = "#000018";
-    "black" = "#000000";
-    "brightBlack" = "#55508f";
-    "red" = "#e34b4f";
-    "brightRed" = "#e34b4f";
-    "green" = "#67b779";
-    "brightGreen" = "#45b75e";
-    "yellow" = "#ff9c00";
-    "brightYellow" = "#ff9c00";
-    "blue" = "#5c67ff";
-    "brightBlue" = "#5c67ff";
-    "magenta" = "#cb85ff";
-    "brightMagenta" = "#cb85ff";
-    "cyan" = "#17d0f4";
-    "brightCyan" = "#17d0f4";
-    "white" = "#dddbff";
-    "brightWhite" = "#ffffff";
+  themes = rec {
+    default = papercolor-light;
+    papercolor-light = rec {
+      primary = {
+        foreground = normal.black;
+        background = normal.white;
+      };
+      normal = {
+        white = "#eeeeee";
+        red = "#af0000";
+        green = "#008700";
+        yellow = "#5f8700";
+        blue = "#0087af";
+        magenta = "#878787";
+        cyan = "#005f87";
+        black = "#444444";
+      };
+
+      bright = {
+        white = "#bcbcbc";
+        red = "#d70000";
+        green = "#d70087";
+        yellow = "#8700af";
+        blue = "#d75f00";
+        magenta = "#d75f00";
+        cyan = "#005faf";
+        black = "#005f87";
+      };
+    };
+    solarized-light = {
+      primary = {
+        foreground = "#586e75";
+        background = "#fdf6e3";
+      };
+      normal = {
+        black = "#073642";
+        red = "#dc322f";
+        green = "#859900";
+        yellow = "#b58900";
+        blue = "#268bd2";
+        magenta = "#d33682";
+        cyan = "#2aa198";
+        white = "#eee8d5";
+      };
+
+      bright = {
+        black = "#002b36";
+        red = "#cb4b16";
+        green = "#586e75";
+        yellow = "#657b83";
+        blue = "#839496";
+        magenta = "#6c71c4";
+        cyan = "#93a1a1";
+        white = "#fdf6e3";
+      };
+    };
+    maralorn-dark = {
+      primary = {
+        foreground = "#dddbff";
+        background = "#000018";
+      };
+      normal = {
+        black = "#000000";
+        red = "#e34b4f";
+        green = "#67b779";
+        yellow = "#ff9c00";
+        blue = "#5c67ff";
+        magenta = "#cb85ff";
+        cyan = "#17d0f4";
+        white = "#dddbff";
+      };
+      bright = {
+        black = "#55508f";
+        red = "#e34b4f";
+        green = "#45b75e";
+        yellow = "#ff9c00";
+        blue = "#5c67ff";
+        magenta = "#cb85ff";
+        cyan = "#17d0f4";
+        white = "#ffffff";
+      };
+    };
   };
+
 }
diff --git a/nixos/roles/monitoring/grafana-dashboards/health-status.json b/nixos/roles/monitoring/grafana-dashboards/health-status.json
index 91c7155b..b75f4933 100644
--- a/nixos/roles/monitoring/grafana-dashboards/health-status.json
+++ b/nixos/roles/monitoring/grafana-dashboards/health-status.json
@@ -653,7 +653,7 @@
   ],
   "refresh": "1m",
   "schemaVersion": 26,
-  "style": "dark",
+  "style": "light",
   "tags": [],
   "templating": {
     "list": []
diff --git a/nixos/roles/monitoring/grafana-dashboards/node-exporter.json b/nixos/roles/monitoring/grafana-dashboards/node-exporter.json
index 2f988d5c..63e6254d 100644
--- a/nixos/roles/monitoring/grafana-dashboards/node-exporter.json
+++ b/nixos/roles/monitoring/grafana-dashboards/node-exporter.json
@@ -12159,7 +12159,7 @@
   ],
   "refresh": false,
   "schemaVersion": 22,
-  "style": "dark",
+  "style": "light",
   "tags": [],
   "templating": {
     "list": [