diff --git a/common/files.nix b/common/files.nix
index 493bb8d..0c3366e 100644
--- a/common/files.nix
+++ b/common/files.nix
@@ -1,4 +1,9 @@
 { config }: rec{
+  lazygit = {
+    recursive = true;
+    source = ../dotfiles/lazygit;
+    target = "./.config/lazygit";
+  };
   kitty = {
     recursive = true;
     source = ../dotfiles/kitty;
diff --git a/common/services.nix b/common/services.nix
new file mode 100644
index 0000000..4d1b1e0
--- /dev/null
+++ b/common/services.nix
@@ -0,0 +1,13 @@
+{ pkgs, config }: {
+  polychromatic = {
+    Unit = {
+      Description = "razer chroma applet/daemon";
+    };
+    Install = {
+        WantedBy = [ "default.target" ];
+    };
+    Service = {
+        ExecStart = "${pkgs.polychromatic}/bin/polychromatic-tray-applet";
+    };
+  };
+}
diff --git a/common/shell.nix b/common/shell.nix
index 9ab93d3..8c432f1 100644
--- a/common/shell.nix
+++ b/common/shell.nix
@@ -14,6 +14,7 @@
   };
   common = {
     env = {
+      LG_CONFIG_FILE = "./config/lazygit/tokyonight_night.conf";
       BAT_THEME = "Dracula";
       EDITOR = "nvim";
       MANPAGER = "nvim +Man!";
diff --git a/dotfiles/kitty/kitty.conf b/dotfiles/kitty/kitty.conf
index 7f49e9c..b08e8bb 100644
--- a/dotfiles/kitty/kitty.conf
+++ b/dotfiles/kitty/kitty.conf
@@ -1,3 +1,4 @@
+# vim:ft=kitty
 linux_display_server x11
 wayland_titlebar_color background
 font_family ComicShannsMono Nerd Font
@@ -16,81 +17,52 @@ initial_window_height 35c
 confirm_os_window_close 0
 
 map kitty_mod+t     new_tab_with_cwd
-# Tokyo Night color scheme for kitty terminal emulator
-# https://github.com/davidmathers/tokyo-night-kitty-theme
-#
-# Based on Tokyo Night color theme for Visual Studio Code
-# https://github.com/enkia/tokyo-night-vscode-theme
 
-foreground #a9b1d6
-# background #1a1b26
-background #000000
+## name: Tokyo Night
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
 
-# Black
-color0 #414868
-color8 #414868
 
-# Red
-color1 #f7768e
-color9 #f7768e
-
-# Green
-color2  #73daca
-color10 #73daca
-
-# Yellow
-color3  #e0af68
-color11 #e0af68
-
-# Blue
-color4  #7aa2f7
-color12 #7aa2f7
-
-# Magenta
-color5  #bb9af7
-color13 #bb9af7
-
-# Cyan
-color6  #7dcfff
-color14 #7dcfff
-
-# White
-color7  #c0caf5
-color15 #c0caf5
-
-# Cursor
+background #1a1b26
+foreground #c0caf5
+selection_background #283457
+selection_foreground #c0caf5
+url_color #73daca
 cursor #c0caf5
 cursor_text_color #1a1b26
 
-# Selection highlight
-selection_foreground none
-selection_background #28344a
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #16161e
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #15161e
 
-# The color for highlighting URLs on mouse-over
-url_color #9ece6a
+# Windows
+active_border_color #7aa2f7
+inactive_border_color #292e42
 
-# Window borders
-active_border_color #3d59a1
-inactive_border_color #101014
-bell_border_color #e0af68
+# normal
+color0 #15161e
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
 
-# Tab bar
-tab_bar_style fade
-tab_fade 1
-active_tab_foreground   #3d59a1
-active_tab_background   #16161e
-active_tab_font_style   bold
-inactive_tab_foreground #787c99
-inactive_tab_background #16161e
-inactive_tab_font_style bold
-tab_bar_background #101014
+# bright
+color8 #414868
+color9 #f7768e
+color10 #9ece6a
+color11 #e0af68
+color12 #7aa2f7
+color13 #bb9af7
+color14 #7dcfff
+color15 #c0caf5
 
-# Title bar
-macos_titlebar_color #16161e
-
-# Storm
-# background #24283b
-# cursor_text_color #24283b
-# active_tab_background   #1f2335
-# inactive_tab_background #1f2335
-# macos_titlebar_color #1f2335
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
diff --git a/dotfiles/lazygit/tokyonight_night.conf b/dotfiles/lazygit/tokyonight_night.conf
new file mode 100644
index 0000000..97b1f23
--- /dev/null
+++ b/dotfiles/lazygit/tokyonight_night.conf
@@ -0,0 +1,27 @@
+gui:
+  nerdFontsVersion: "3"
+  theme:
+    activeBorderColor:
+      - "#ff9e64"
+      - "bold"
+    inactiveBorderColor:
+      - "#27a1b9"
+    searchingActiveBorderColor:
+      - "#ff9e64"
+      - "bold"
+    optionsTextColor:
+      - "#7aa2f7"
+    selectedLineBgColor:
+      - "#283457"
+    cherryPickedCommitFgColor:
+      - "#7aa2f7"
+    cherryPickedCommitBgColor:
+      - "#bb9af7"
+    markedBaseCommitFgColor:
+      - "#7aa2f7"
+    markedBaseCommitBgColor:
+      - "#e0af68"
+    unstagedChangesColor:
+      - "#db4b4b"
+    defaultFgColor:
+      - "#c0caf5"