diff --git a/applications/kitty.desktop b/applications/kitty.desktop
index 97b12af..a7a8a56 100644
--- a/applications/kitty.desktop
+++ b/applications/kitty.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Kitty
 Exec="$HOME/.local/kitty.app/bin/kitty"
-Icon="$XDG_DATA_HOME/icons/kitty-whiskers.svg"
+Icon=kitty
 Type=Application
 Categories=Utility
diff --git a/icons/hicolor/256x256/apps/kitty.png b/icons/hicolor/256x256/apps/kitty.png
new file mode 100644
index 0000000..4bc2317
Binary files /dev/null and b/icons/hicolor/256x256/apps/kitty.png differ
diff --git a/icons/kitty-whiskers.svg b/icons/hicolor/scalable/apps/kitty.svg
similarity index 100%
rename from icons/kitty-whiskers.svg
rename to icons/hicolor/scalable/apps/kitty.svg
diff --git a/install.sh b/install.sh
index 03152f4..30d58e0 100755
--- a/install.sh
+++ b/install.sh
@@ -13,15 +13,15 @@ echo "Installing homebrew dependencies"
 brew bundle install
 
 echo "Installing application icons and entries"
-icons_dir="$XDG_DATA_HOME/icons/"
-mkdir -p "$icons_dir"
-cp -f icons/* "$icons_dir"
+ln -sf "$PWD/icons" "$XDG_DATA_HOME/icons"
+xdg-icon-resource forceupdate
+
 applications_dir="$XDG_DATA_HOME/applications/"
 mkdir -p "$applications_dir"
 envsubst > "$applications_dir/kitty.desktop" < applications/kitty.desktop
 xdg-desktop-menu forceupdate
 
-echo "Creating symlinks"
+echo "Creating app configuration symlinks"
 ln -sf "$PWD/nvim" "$XDG_CONFIG_HOME/nvim"
 ln -sf "$PWD/kitty" "$XDG_CONFIG_HOME/kitty"
 ln -sf "$PWD/zsh/zshrc" "$HOME/.zshrc"
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index a7fc91a..92e02fc 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -2783,3 +2783,5 @@ font_size 12.0
 #: }}}
 
 #: }}}
+
+include tokyonight_night.conf
diff --git a/kitty/tokyonight_night.conf b/kitty/tokyonight_night.conf
new file mode 100644
index 0000000..d8a8e2a
--- /dev/null
+++ b/kitty/tokyonight_night.conf
@@ -0,0 +1,50 @@
+# vim:ft=kitty
+
+## name: Tokyo Night
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
+
+
+background #1a1b26
+foreground #c0caf5
+selection_background #283457
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #1a1b26
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #16161e
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #15161e
+
+# Windows
+active_border_color #7aa2f7
+inactive_border_color #292e42
+
+# normal
+color0 #15161e
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8  #414868
+color9  #ff899d
+color10 #9fe044
+color11 #faba4a
+color12 #8db0ff
+color13 #c7a9ff
+color14 #a4daff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
diff --git a/nvim/init.lua b/nvim/init.lua
index b1c88aa..4b5c35a 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -365,7 +365,11 @@ require('lazy').setup({
       dependencies = { "nvim-tree/nvim-web-devicons", opt = true },
       config = function()
         local lualine = require("lualine")
-        lualine.setup({})
+        lualine.setup({
+          options = {
+            theme = 'tokyonight'
+          }
+        })
       end,
     },
   },
diff --git a/zsh/zshrc b/zsh/zshrc
index 83c90c3..2967d1a 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -27,3 +27,6 @@ export NVM_DIR="$HOME/.nvm"
 [[ -f "$HOME/.zsh_aliases" ]] && . "$HOME/.zsh_aliases"
 [[ -f "$HOME/.zsh_plugins" ]] && . "$HOME/.zsh_plugins"
 [[ -f "$HOME/.zsh_prompt" ]] && . "$HOME/.zsh_prompt"
+
+# completions
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"