diff --git a/config/mars.png b/config/mars.png
new file mode 100644
index 0000000..5f9dea7
Binary files /dev/null and b/config/mars.png differ
diff --git a/flake.nix b/flake.nix
index 459411e..a630406 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
       editor = "neovim"; # neovim, vscode
 
       # List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes
-      theme = "tokyo-night-dark"; # catppuccin-mocha, tokyo-night-dark, one-dark
+      theme = "catppuccin-mocha"; # catppuccin-mocha, tokyo-night-dark, one-dark
       background =
         if userSettings.theme == "catppuccin-mocha"
         then "aurora_borealis.png"
diff --git a/kogami/configuration.nix b/kogami/configuration.nix
index 791a67d..5c8cd74 100644
--- a/kogami/configuration.nix
+++ b/kogami/configuration.nix
@@ -36,7 +36,6 @@
     #bootloader.systemd-boot.enable = true;
     desktop = {
       hyprland.enable = true;
-      gnome.enable = true;
       steamdeck.enable = false;
     };
     fonts.packages = true;
diff --git a/nixos/home/desktop/hyprland/hyprlock.nix b/nixos/home/desktop/hyprland/hyprlock.nix
index 981af8f..8ce935a 100644
--- a/nixos/home/desktop/hyprland/hyprlock.nix
+++ b/nixos/home/desktop/hyprland/hyprlock.nix
@@ -95,16 +95,16 @@
           get_cover() {
             DOWNLOAD_PATH="$HOME/.cache/cover.png"
             FALLBACK_PATH="./images/music.png" # Change this to your static image path
-          
+              
             # Get the image URL from playerctl
             URL=$(playerctl metadata mpris:artUrl 2>/dev/null)
-          
+              
             # If the URL is empty or playerctl fails, return the fallback path
             if [[ -z "$URL" ]]; then
                 echo "$FALLBACK_PATH"
                 return
             fi
-          
+              
             # Try downloading the image
             if curl -s -o "$DOWNLOAD_PATH" "$URL"; then
                 echo "$DOWNLOAD_PATH"
@@ -116,7 +116,7 @@
           get_watched_length() {
             total_length=$(playerctl metadata --format "{{ duration(mpris:length) }}" | awk -F: '{ print ($1 * 60) + $2 }')
             current_position=$(playerctl metadata --format "{{ duration(position) }}" | awk -F: '{ print ($1 * 60) + $2 }')
-          
+              
             if [[ "$total_length" -gt 0 ]]; then
                 percentage=$(awk "BEGIN { printf \"%.2f\", ($current_position / $total_length) * 100 }")
                 echo "$percentage"
@@ -275,7 +275,7 @@
         label = [
           {
             monitor = "";
-            text = "$TIME ";
+            text = "$TIME";
             color = "$text";
             font_size = 12;
 
@@ -342,11 +342,11 @@
           #{
           #  monitor = "";
           #  text = "cmd[update:1000] playerctl-hyprlock --status-symbol";
-#
+          #
           #  color = "$fg0";
           #  font_size = 16;
           #  font_family = "$font-symbol";
-#
+          #
           #  position = "700, -370";
           #  halign = "left";
           #  valign = "bottom";
diff --git a/nixos/home/packages/programming/git.nix b/nixos/home/packages/programming/git.nix
index 0f7d7f1..b92fd33 100644
--- a/nixos/home/packages/programming/git.nix
+++ b/nixos/home/packages/programming/git.nix
@@ -13,7 +13,7 @@
     programs.git = {
       enable = true;
       userName = "${userSettings.username}";
-      userEmail = "kohout.fi.2023@skola.ssps.cz";
+      userEmail = "sigma@goon.cz";
       lfs.enable = true;
     };
 
diff --git a/nixos/system/packages/tor.nix b/nixos/system/packages/tor.nix
index d14d7ad..0cab2aa 100644
--- a/nixos/system/packages/tor.nix
+++ b/nixos/system/packages/tor.nix
@@ -12,8 +12,30 @@
     (lib.mkIf config.program.tor.enable {
       services.tor = {
         enable = true;
+        # ** This block exposes your service to the tor network **
+        # ** Change the port and target to your service **
+        # ** Get the onion address from /var/lib/tor/[myOnion]/hostname **
+        #enableGeoIP = false;
+        #relay.onionServices = {
+        #myOnion = {
+        #  version = 3;
+        #  map = [
+        #    {
+        #      port = 80;
+        #      target = {
+        #        addr = "127.0.0.1";
+        #        port = 3000;
+        #      };
+        #    }
+        #  ];
+        #};
+        #};
+        #settings = {
+        #  ClientUseIPv4 = true;
+        #  ClientUseIPv6 = false;
+        #  ClientPreferIPv6ORPort = false;
+        #};
       };
-      services.tor.client.enable = true;
     })
     (lib.mkIf config.program.proxychains.enable {
       programs.proxychains = {
diff --git a/nixos/system/settings/default-applications.nix b/nixos/system/settings/default-applications.nix
index f2b238b..b400511 100644
--- a/nixos/system/settings/default-applications.nix
+++ b/nixos/system/settings/default-applications.nix
@@ -15,13 +15,18 @@
   };
 
   config = lib.mkIf config.sys.default-applications.enable {
-    environment.sessionVariables = {
+    environment.sessionVariables = let
+      editor-bin =
+        if userSettings.editor == "neovim"
+        then "nvim"
+        else userSettings.editor;
+    in {
       DEFAULT_BROWSER =
         if userSettings.browser != "zen"
         then "${pkgs."${userSettings.browser}"}/bin/${userSettings.browser}"
         else "zen";
       TERMINAL = "${pkgs."${userSettings.terminal}"}/bin/${userSettings.terminal}";
-      EDITOR = "${pkgs."${userSettings.editor}"}/bin/${userSettings.editor}";
+      EDITOR = "${pkgs."${userSettings.editor}"}/bin/${editor-bin}";
       FLAKE = "/home/${userSettings.username}/.dotfiles";
     };
 
diff --git a/nixos/system/settings/nvidia.nix b/nixos/system/settings/nvidia.nix
index 66f4942..95d2bb6 100644
--- a/nixos/system/settings/nvidia.nix
+++ b/nixos/system/settings/nvidia.nix
@@ -53,8 +53,8 @@
         # Enable the Nvidia settings menu,
         # accessible via `nvidia-settings`.
         nvidiaSettings = true;
-        prime.amdgpuBusId = "pci@000:04:0";
-        prime.nvidiaBusId = "pci@000:01:0";
+        prime.amdgpuBusId = "PCI:4:0:0";
+        prime.nvidiaBusId = "PCI:1:0:0";
         # Optionally, you may need to select the appropriate driver version for your specific GPU.
         package = config.boot.kernelPackages.nvidiaPackages.stable;
       };
diff --git a/nixos/system/settings/printing.nix b/nixos/system/settings/printing.nix
index deed650..fdc7e29 100644
--- a/nixos/system/settings/printing.nix
+++ b/nixos/system/settings/printing.nix
@@ -30,7 +30,7 @@
     # Scanning
     hardware.sane.enable = true;
     services.ipp-usb.enable = true;
-    #hardware.sane.extraBackends = [pkgs.hplipWithPlugin];
+    hardware.sane.extraBackends = [pkgs.hplipWithPlugin];
 
     users.users.${userSettings.username}.extraGroups = ["lp" "scanner"];
   };
diff --git a/nixos/system/settings/style.nix b/nixos/system/settings/style.nix
index 94aba3c..7fd0abb 100644
--- a/nixos/system/settings/style.nix
+++ b/nixos/system/settings/style.nix
@@ -16,7 +16,24 @@
       image = ../../../config/backgrounds/${userSettings.background};
       base16Scheme =
         if userSettings.theme == "catppuccin-mocha"
-        then "${pkgs-stable.base16-schemes}/share/themes/${userSettings.theme}.yaml"
+        then {
+          base00 = "#1e1e2e";
+          base01 = "#181825"; # mantle
+          base02 = "#313244"; # surface0
+          base03 = "#45475a"; # surface1
+          base04 = "#585b70"; # surface2
+          base05 = "#cdd6f4"; # text
+          base06 = "#f5e0dc"; # rosewater
+          base07 = "#b4befe"; # lavender
+          base08 = "#f38ba8"; # red
+          base09 = "#fab387"; # peach
+          base0A = "#f9e2af"; # yellow
+          base0B = "#a6e3a1"; # green
+          base0C = "#94e2d5"; # teal
+          base0D = "#89b4fa"; # blue
+          base0E = "#cba6f7"; # mauve
+          base0F = "#f2cdcd"; # flamingo
+        }
         else if userSettings.theme == "evangelion-blood"
         then # List all possible themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes
           {
@@ -77,13 +94,13 @@
         };
 
         serif = {
-          package = pkgs.nerd-fonts.monaspace;
-          name = "Monaspace Xenon";
+          package = pkgs.nerd-fonts.ubuntu;
+          name = "Ubuntu NF";
         };
 
         sansSerif = {
-          package = pkgs.nerd-fonts.monaspace;
-          name = "Monaspace Argon";
+          package = pkgs.nerd-fonts.ubuntu;
+          name = "Ubuntu NF";
         };
 
         monospace = {
@@ -100,11 +117,11 @@
       targets = {
         plymouth = {
           logo =
-            if (userSettings.theme == "evangelion-blood")
+            if userSettings.theme == "evangelion-blood"
             then ../../../config/nerv.png
             else if (userSettings.theme == "tokyo-night-dark")
             then ../../../config/copeland.png
-            else "";
+            else ../../../config/mars.png;
           logoAnimated =
             if "evangelion-blood" == userSettings.theme || "tokyo-night-dark" == userSettings.theme
             then false