diff --git a/packages/numen-phrases/default.nix b/packages/numen-phrases/default.nix
index 43b9532..a8ee70b 100644
--- a/packages/numen-phrases/default.nix
+++ b/packages/numen-phrases/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     pkgs.libnotify
     pkgs.run
+    pkgs.kb-one.vosk-model-small-en-us
+    pkgs.kb-one.vosk-model-small-de
   ];
 
   installPhase = ''
diff --git a/systems/x86_64-linux/Ohybke/default.nix b/systems/x86_64-linux/Ohybke/default.nix
index d077930..35ee7fe 100644
--- a/systems/x86_64-linux/Ohybke/default.nix
+++ b/systems/x86_64-linux/Ohybke/default.nix
@@ -16,8 +16,6 @@
     "olm-3.2.16"
     "electron-34.5.8"
   ];
-
-  # Distributed Builds
   nix.buildMachines = [
     {
       hostName = "kb-senfnvp-remotebuild";
@@ -37,21 +35,15 @@
   # Networking
   networking.hostName = "Ohybke";
   networking.networkmanager.enable = true;
-  #networking.wireless.enable = true;
-  # Allow KDE Connect Ports
-  networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
-  networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
-  # Allow VLC Chromecast
-  networking.firewall.allowedTCPPorts = [ 8010 ];
+  networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; # Allow KDE Connect
+  networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }]; # Allow KDE Connect
+  networking.firewall.allowedTCPPorts = [ 8010 ]; # Allow VLC Chromecast
 
   # Enable Bluetooth
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
 
-  # Enable ThunderBolt 3
-  #services.hardware.bolt.enable = true;
-
-  # Locale
+  # Localisation
   time.timeZone = "Europe/Berlin";
   i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {
@@ -65,15 +57,6 @@
     LC_TELEPHONE = "de_DE.UTF-8";
     LC_TIME = "de_DE.UTF-8";
   };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.displayManager.sddm.enable = true;
-  services.desktopManager.plasma6.enable = true;
-
-  # Keyboard and Keymap
   services.xserver.xkb = {
     layout = "de";
     variant = "mac_nodeadkeys";
@@ -85,10 +68,16 @@
     useXkbConfig = true;
   };
 
-  # Enable CUPS to print documents.
+  # Desktop
+  services.xserver.enable = true;
+  services.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
+
+
+  # Printing
   services.printing.enable = true;
 
-  # Enable sound with pipewire.
+  # Sound
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -98,17 +87,13 @@
     pulse.enable = true;
   };
 
-  # Protonmail Bridge
+  # Services
   services.protonmail-bridge.enable = true;
-
-  # Languagetool Spellchecking Server  
   services.languagetool = {
     enable = true;
     allowOrigin = "*";
   };
-
-  # Enable Avahi Daemon for Chromecast
-  services.avahi.enable = true;
+  services.avahi.enable = true; # For Chromecast
 
   # Users
   users.users.kb = { # Managed by Homemanager
@@ -117,6 +102,11 @@
     extraGroups = [ "networkmanager" "wheel" ];
   };
 
+  # Default Editor
+  programs.vim.enable = true;
+  programs.vim.defaultEditor = true;
+
+
   # Enable SSH-Agent
   programs.ssh.startAgent = true;
 
@@ -150,14 +140,6 @@
     curl
     python3
     sops
-
-    # Voice Control
-    kb-one.numen
-    kb-one.numen-phrases
-    libnotify
-    kb-one.dotool
-    kb-one.vosk-model-small-en-us
-    kb-one.vosk-model-small-de
   ];
 
   system.stateVersion = "24.11"; # NEVER Change this!