diff --git a/.install/symlinks.sh b/.install/symlinks.sh
index 78d0ed2..8a01634 100644
--- a/.install/symlinks.sh
+++ b/.install/symlinks.sh
@@ -53,6 +53,7 @@ CONFIG_LINKED_FILES_HOME=(
     ".config/yay"
     ".config/zathura"
     ".config/zsh"
+    ".config/kitty"
     ".local/bin"
     ".local/share/gnupg/gpg-agent.conf"
 )
diff --git a/system/.config/X11/xinitrc b/system/.config/X11/xinitrc
index 9136aec..029a000 100644
--- a/system/.config/X11/xinitrc
+++ b/system/.config/X11/xinitrc
@@ -17,17 +17,15 @@
 # the monitor names are different.
 NVIDIA_CHECK="$(xrandr | grep "eDP-1-1 connected")"
 if [ -z "${NVIDIA_CHECK}" ]; then
-    I3_SCREEN_CONFIG="${XDG_CONFIG_HOME}/i3/config.intel" 
+    SCREEN_I3_CONFIG="${XDG_CONFIG_HOME}/i3/config.intel" 
 else 
-    I3_SCREEN_CONFIG="${XDG_CONFIG_HOME}/i3/config.nvidia"
+    SCREEN_I3_CONFIG="${XDG_CONFIG_HOME}/i3/config.nvidia"
 fi
 
-# Load different i3 configuration depending on if it's a work computer.
-LOCAL_I3_CONFIG="${XDG_CONFIG_HOME}/i3/config.private"
-if [ "${IS_WORK}" = "1" ]; then
-    LOCAL_I3_CONFIG="${XDG_CONFIG_HOME}/i3/config.work" 
-fi
+# Load different i3 configuration depending on the hostname
+HOST="$(hostname)"
+HOST_I3_CONFIG="${XDG_CONFIG_HOME}/i3/config.${HOST}"
 
-cat "${I3_SCREEN_CONFIG}" "${XDG_CONFIG_HOME}/i3/config.base" "${LOCAL_I3_CONFIG}" > "${XDG_CONFIG_HOME}/i3/config"
+cat "${SCREEN_I3_CONFIG}" "${XDG_CONFIG_HOME}/i3/config.base" "${HOST_I3_CONFIG}" > "${XDG_CONFIG_HOME}/i3/config"
 
 i3 > "${XDG_LOG_HOME}/i3.log" 2>&1
\ No newline at end of file
diff --git a/system/.config/X11/xsetup b/system/.config/X11/xsetup
index 396dfa0..f58cf38 100644
--- a/system/.config/X11/xsetup
+++ b/system/.config/X11/xsetup
@@ -22,7 +22,6 @@ setxkbmap -model pc105 -layout ch
 numlockx &
 
 # Start applications
-picom -b --experimental-backends &
 nm-applet &
 redshift-gtk &
 sxhkd &
diff --git a/system/.config/custom/env b/system/.config/custom/env
index f6f76a7..f2185b4 100644
--- a/system/.config/custom/env
+++ b/system/.config/custom/env
@@ -111,7 +111,7 @@ export MTGA_WINE_BINARY="/usr/bin/wine"
 # Setting applications
 export VISUAL=vim
 export EDITOR="${VISUAL}"
-export TERMINAL="alacritty"
+export TERMINAL="kitty"
 export BROWSER="chromium"
 export PAGER="less"
 export MANPAGER="${PAGER}"
diff --git a/system/.config/dconf/root.conf b/system/.config/dconf/root.conf
index 5a8f942..d40ea8e 100644
--- a/system/.config/dconf/root.conf
+++ b/system/.config/dconf/root.conf
@@ -17,7 +17,7 @@ default-zoom-level='smaller'
 show-desktop-icons=false
 
 [org/cinnamon/desktop/default-applications/terminal]
-exec='alacritty'
+exec='kitty'
 
 [desktop/ibus/general]
 engines-order=['xkb:ch::ger', 'anthy']
diff --git a/system/.config/i3/config.private b/system/.config/i3/config.odin
similarity index 60%
rename from system/.config/i3/config.private
rename to system/.config/i3/config.odin
index f713c8a..97039a0 100644
--- a/system/.config/i3/config.private
+++ b/system/.config/i3/config.odin
@@ -1,19 +1,7 @@
 ###############################################################################
 # Layouts                                                                     #
 ###############################################################################
-exec --no-startup-id "i3-msg 'workspace 10: ; \
-append_layout /home/severin/.config/i3/workspace-10.json; \
-exec alacritty --class=cmus -e ncmpcpp ; \
-exec alacritty --class=cava -e cava ; \
-exec kunst --music_dir /home/severin/music/ --size 512x512'"
-
-exec --no-startup-id "i3-msg 'workspace 2: ; \
-append_layout /home/severin/.config/i3/workspace-2.json; \
-exec alacritty; \
-exec alacritty; \
-exec alacritty; \
-exec alacritty'" 
-
+exec --no-startup-id "i3-msg 'workspace 2: ; exec kitty'" 
 exec --no-startup-id "i3-msg 'workspace 1: '"
 
 ###############################################################################
@@ -21,11 +9,12 @@ exec --no-startup-id "i3-msg 'workspace 1: '"
 ###############################################################################
 # Setup monitor
 exec_always --no-startup-id monitor-setup
+exec_always --no-startup-id picom -b --experimental-backends
 
 # Other applications
 exec chromium
 
-exec ferdi
+exec discord
 exec joplin-desktop
 exec nemo
 exec nemo
diff --git a/system/.config/i3/workspace-10.json b/system/.config/i3/workspace-10.json
deleted file mode 100644
index d23fee5..0000000
--- a/system/.config/i3/workspace-10.json
+++ /dev/null
@@ -1,96 +0,0 @@
-[
-	{
-		"border": "none",
-		"floating": "auto_off",
-		"fullscreen_mode": 0,
-		"layout": "splith",
-		"percent": 1,
-		"type": "con",
-		"nodes": [
-			{
-				"border": "none",
-				"floating": "auto_off",
-				"layout": "splith",
-				"percent": 1,
-				"type": "con",
-				"nodes": [
-					{
-						"border": "pixel",
-						"current_border_width": 0,
-						"floating": "auto_off",
-						"geometry": {
-							"height": 434,
-							"width": 736,
-							"x": 0,
-							"y": 0
-						},
-						"name": "cmus v2.7.1",
-						"percent": 0.7,
-						"swallows": [
-							{
-								"instance": "^cmus$"
-							}
-						],
-						"type": "con"
-					},
-					{
-						"border": "none",
-						"floating": "auto_off",
-						"layout": "splitv",
-						"percent": 0.3,
-						"type": "con",
-						"nodes": [
-							{
-								"border": "pixel",
-								"current_border_width": 0,
-								"floating": "auto_off",
-								"geometry": {
-									"height": 1080,
-									"width": 1920,
-									"x": 0,
-									"y": 0
-								},
-								"name": "sxiv",
-								"percent": 0.5,
-								"swallows": [
-									{
-										"instance": "^Kunst$"
-									}
-								],
-								"type": "con"
-							},
-							{
-								"border": "none",
-								"floating": "auto_off",
-								"layout": "splith",
-								"percent": 0.5,
-								"type": "con",
-								"nodes": [
-									{
-										"border": "pixel",
-										"current_border_width": 0,
-										"floating": "auto_off",
-										"geometry": {
-											"height": 434,
-											"width": 736,
-											"x": 0,
-											"y": 0
-										},
-										"name": "cava",
-										"percent": 1,
-										"swallows": [
-											{
-												"instance": "^cava$"
-											}
-										],
-										"type": "con"
-									}
-								]
-							}
-						]
-					}
-				]
-			}
-		]
-	}
-]
\ No newline at end of file
diff --git a/system/.config/i3/workspace-2.json b/system/.config/i3/workspace-2.json
deleted file mode 100644
index 8c76eb3..0000000
--- a/system/.config/i3/workspace-2.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-	{
-		"border": "none",
-		"floating": "auto_off",
-		"fullscreen_mode": 0,
-		"layout": "splith",
-		"percent": null,
-		"type": "con",
-		"nodes": [
-			{
-				"border": "none",
-				"floating": "auto_off",
-				"layout": "splitv",
-				"percent": 0.5,
-				"type": "con",
-				"nodes": [
-					{
-						"border": "pixel",
-						"current_border_width": 0,
-						"floating": "auto_off",
-						"geometry": {
-							"height": 434,
-							"width": 736,
-							"x": 0,
-							"y": 0
-						},
-						"name": null,
-						"percent": 0.5,
-						"swallows": [
-							{
-								"instance": "^Alacritty$"
-							}
-						],
-						"type": "con"
-					},
-					{
-						"border": "pixel",
-						"current_border_width": 0,
-						"floating": "auto_off",
-						"geometry": {
-							"height": 434,
-							"width": 736,
-							"x": 0,
-							"y": 0
-						},
-						"name": null,
-						"percent": 0.5,
-						"swallows": [
-							{
-								"instance": "^Alacritty$"
-							}
-						],
-						"type": "con"
-					}
-				]
-			},
-			{
-				"border": "none",
-				"floating": "auto_off",
-				"layout": "splitv",
-				"percent": 0.5,
-				"type": "con",
-				"nodes": [
-					{
-						"border": "pixel",
-						"current_border_width": 0,
-						"floating": "auto_off",
-						"geometry": {
-							"height": 434,
-							"width": 736,
-							"x": 0,
-							"y": 0
-						},
-						"name": null,
-						"percent": 0.5,
-						"swallows": [
-							{
-								"instance": "^Alacritty$"
-							}
-						],
-						"type": "con"
-					},
-					{
-						"border": "pixel",
-						"current_border_width": 0,
-						"floating": "auto_off",
-						"geometry": {
-							"height": 434,
-							"width": 736,
-							"x": 0,
-							"y": 0
-						},
-						"name": null,
-						"percent": 0.5,
-						"swallows": [
-							{
-								"instance": "^Alacritty$"
-							}
-						],
-						"type": "con"
-					}
-				]
-			}
-		]
-	}
-]
\ No newline at end of file
diff --git a/system/.config/kitty/kitty.conf b/system/.config/kitty/kitty.conf
new file mode 100644
index 0000000..0a70f31
--- /dev/null
+++ b/system/.config/kitty/kitty.conf
@@ -0,0 +1,29 @@
+font_family JetBrainsMono Nerd Font
+bold_font JetBrainsMono Nerd Font
+italic_font JetBrainsMono Nerd Font
+bold_italic_font JetBrainsMono Nerd Font
+
+font_size 14
+window_padding_width 2
+
+background_opacity 0.67
+
+cursor_shape beam
+
+color0 #252525
+color1 #ff5252
+color2 #c3d82c
+color3 #ffd740
+color4 #40c4ff
+color5 #ff4081
+color6 #70c0ba
+color7 #eaeaea
+
+color8 #252525
+color9 #ff5252
+color10 #c3d82c
+color11 #ffd740
+color12 #40c4ff
+color13 #ff4081
+color14 #54ced6
+color15 #ffffff
\ No newline at end of file
diff --git a/system/.config/sxhkd/sxhkdrc b/system/.config/sxhkd/sxhkdrc
index 48a952a..8db18d6 100644
--- a/system/.config/sxhkd/sxhkdrc
+++ b/system/.config/sxhkd/sxhkdrc
@@ -23,7 +23,7 @@ super + g
 ###############################################################################
 # Open terminal emulator
 super + Return
-    alacritty
+    kitty
 
 # Open file browser
 super + e