diff --git a/colors.nix b/colors.nix
index ae8b939..36eb83a 100644
--- a/colors.nix
+++ b/colors.nix
@@ -75,7 +75,7 @@ let inherit (builtins) mapAttrs map; in rec {
         yellow = {
             normal = "fcfc51";
             bright = "fcfc51";
-            pastel = "";
+            pastel = "e9ff87";
         };
 
         purple = {
diff --git a/machines/sif/configuration.nix b/machines/sif/configuration.nix
index ffbba39..55d8211 100644
--- a/machines/sif/configuration.nix
+++ b/machines/sif/configuration.nix
@@ -9,10 +9,10 @@
 		../../modules
 
 		# Reverse proxy
-		./nginx.nix
+		./services/nginx.nix
 
 		# Website
-		./website.nix
+		./services/website.nix
 
     ];
 
diff --git a/machines/sif/nginx.nix b/machines/sif/services/nginx.nix
similarity index 100%
rename from machines/sif/nginx.nix
rename to machines/sif/services/nginx.nix
diff --git a/machines/sif/website.nix b/machines/sif/services/website.nix
similarity index 100%
rename from machines/sif/website.nix
rename to machines/sif/services/website.nix
diff --git a/modules/kak/colors.nix b/modules/kak/colors.nix
index ba9bade..5296eb3 100644
--- a/modules/kak/colors.nix
+++ b/modules/kak/colors.nix
@@ -16,13 +16,23 @@ pkgs.writeTextFile (rec {
         face global module   rgb:${yellow.normal}
         face global meta     rgb:${green.bright}
         face global type     rgb:${blue.bright}
+        face global trait    rgb:${purple.bright}
+        face global macro    +b@meta
+        face global method   function
+        face global variant  rgb:${blue.normal}
 
         face global LineNumbers	      rgb:${background.slight}
         face global BufferPadding     rgb:${background.slight}
         face global LineNumberCursor  rgb:${foreground.primary}
-        face global crosshairs_line   "default,rgb:212121"
-        face global MenuForeground    "default,rgb:${blue.normal}"
-        face global MenuBackground	  "default,rgb:313131"
+        face global crosshairs_line   default,rgb:212121
+        face global MenuForeground    default,rgb:${blue.normal}
+        face global MenuBackground	  default,rgb:313131
+
+        face global DiagnosticWarning default,default,yellow+c
+        face global DiagnosticError   default,default,red+c
+        face global DiagnosticHint    default,default,green+c
+
+        face global Reference         default,rgb:323232,default
 
     '';
 })
diff --git a/modules/kak/kak-lsp.nix b/modules/kak/kak-lsp.nix
index f00a724..b4087ed 100644
--- a/modules/kak/kak-lsp.nix
+++ b/modules/kak/kak-lsp.nix
@@ -47,6 +47,7 @@ let semantic-tokens =
         "comparison"      = "operator";
         "logical"         = "operator";
         "macro"           = "macro";
+        "macroBang"       = "macro";
         "lifetime"        = "lifetime";
         "variable"        = "variable";
         "attribute"       = "attribute";
diff --git a/modules/kak/kakrc.nix b/modules/kak/kakrc.nix
index be4a4f8..f3117c0 100644
--- a/modules/kak/kakrc.nix
+++ b/modules/kak/kakrc.nix
@@ -62,10 +62,13 @@ let keybinds = ''
 
         hook -once -always window WinSetOption filetype=.* %{ remove-hooks window semtok }
 
-        map global normal <a-down>  ': lsp-next-function<ret>'
-        map global normal <a-up>    ': lsp-previous-function<ret>'
+        map global normal <up>      ': lsp-previous-symbol<ret>'
+        map global normal <down>    ': lsp-next-symbol<ret>'
+        map global normal <a-down>  ': lsp-hover-next-symbol<ret>'
+        map global normal <a-up>    ': lsp-hover-previous-symbol<ret>'
+
         map global normal <a-left>  ': lsp-previous-location *goto*<ret>'
-        map global normal <a-right> ': lsp-next-location *goto*<ret>'
+        map global normal <a-right> ': lsp-next-location     *goto*<ret>'
 
     ''; in
 
@@ -147,6 +150,29 @@ let nix-config = (lib.optionalString nix ''
 
             }
 
+            hook global NormalIdle .* %{ lsp-highlight-references }
+            hook global InsertMove .* %{ lsp-highlight-references }
+
+            face global meta      white
+            face global type      rgb:${theme.blue.bright}
+            face global trait     rgb:${theme.pink.normal}
+            face global macro     rgb:${theme.green.bright}
+            face global format    rgb:${theme.green.bright}
+            face global attribute rgb:${theme.orange.bright}
+            face global operator  rgb:${theme.yellow.normal}
+            face global keyword   rgb:${theme.purple.pastel}
+            face global function  rgb:${theme.green.bright}
+            face global keyword   rgb:${theme.misc.blueGrey}
+
+            face global alias  rgb:${theme.orange.normal}
+            face global enum   type
+            face global struct type
+            face global union  type
+
+            face global lifetime rgb:${theme.pink.pastel}
+
+            face global module rgb:ffffff
+
         }
     '');
 
diff --git a/modules/mpd.nix b/modules/mpd.nix
new file mode 100644
index 0000000..6cc71a1
--- /dev/null
+++ b/modules/mpd.nix
@@ -0,0 +1,27 @@
+{ config, pkgs, lib, ... }:
+
+let cfg = config.riley.mpd; in
+
+with lib; {
+
+    options.riley.mpd = {
+        enable = mkEnableOption "music player daemon";
+    };
+    
+	config = mkIf (cfg.enable) {
+
+    	# Enable the service
+        home-manager.users."riley" = {
+            services.mpd = {
+                enable = true;
+                musicDirectory = "$HOME/media/music";
+            };
+        };
+
+    	users.users."riley".packages = with pkgs; [
+        	mpc_cli
+    	];
+        
+	};
+
+}