diff --git a/configuration.nix b/configuration.nix
index 4dd453f..68d1b9c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -98,7 +98,13 @@
       package = pkgs.plocate;
     };
 
-    tailscale.enable = true;
+    tailscale = {
+      enable = true;
+      extraUpFlags = [
+          "--operator=${builtins.getEnv "USER"}"
+          "--accept-routes"
+      ];
+    };
     
     #Enable CUPS to print documents.
     printing.enable = true;
diff --git a/flake.lock b/flake.lock
index 8ca4402..2049deb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -97,27 +97,9 @@
         "grub2-themes": "grub2-themes",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs_2",
-        "trayscale-src": "trayscale-src",
         "zen-browser": "zen-browser"
       }
     },
-    "trayscale-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1754401603,
-        "narHash": "sha256-rk4JfK0wBvWLis9XvaZuwAoMyLfoySt3SHLJChYl0SE=",
-        "owner": "DeedleFake",
-        "repo": "trayscale",
-        "rev": "16e99fbe859bf8316977640bdc8c5e0679b5ab85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "DeedleFake",
-        "ref": "v0.18.3",
-        "repo": "trayscale",
-        "type": "github"
-      }
-    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",
diff --git a/flake.nix b/flake.nix
index d81669a..60090f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,13 +12,9 @@
     
     grub2-themes = { url = "github:vinceliuice/grub2-themes"; };
 
-    trayscale-src = {
-      url = "github:DeedleFake/trayscale/v0.18.3";
-      flake = false;
-    };
-  };
+ };
 
-  outputs = inputs@{ nixpkgs, home-manager, zen-browser, grub2-themes, trayscale-src, ... }:
+  outputs = inputs@{ nixpkgs, home-manager, zen-browser, grub2-themes, ... }:
     let
 	  username = "cookiez";
 	  version = "25.05";
@@ -28,36 +24,7 @@
 	  hyprlandEnabled = false;
 	  plasmaEnabled = true;
 
-	  trayscale-flake = pkgs.buildGoModule {
-        pname = "trayscale-flake";
-        version = "0.18.3";
-        src = trayscale-src;
-        vendorHash = "sha256-8Um5Ps1EEVShJEeCRkGE3pJi2/5PxgEVNqq3JsKdivA=";
-
-        # Trayscale uses gotk4 → needs pkg-config, GTK4, libadwaita, etc.
-        nativeBuildInputs = [
-          pkgs.pkg-config
-          pkgs.wrapGAppsHook4
-        ];
-        buildInputs = [
-          pkgs.gtk4
-          pkgs.libadwaita
-          pkgs.gobject-introspection
-          pkgs.gdk-pixbuf
-          pkgs.glib
-          pkgs.cairo
-          pkgs.pango
-          pkgs.harfbuzz
-          pkgs.librsvg
-        ];
-
-        # gotk4 uses cgo
-        env.CGO_ENABLED = 1;
-
-        # Only build the actual app binary
-        subPackages = [ "cmd/trayscale" ];
-      };
-    in
+   in
     {
       nixosConfigurations = {
         #Replace the below with your hostname!!! Like: {hostname} = nixpkgs.lib.nixosSystem {
@@ -65,7 +32,6 @@
           inherit system;
           specialArgs = { 
             inherit inputs username version hyprlandEnabled;
-            trayscale-flake = trayscale-flake;
           };
           modules = [
             ./configuration.nix
@@ -75,11 +41,11 @@
             ./packages.nix
             grub2-themes.nixosModules.default
             home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.${username} = ./home.nix;
-              home-manager.backupFileExtension = "backup";		# Automatically backs up conflicting files during activation
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.${username} = ./home.nix;
+            home-manager.backupFileExtension = "backup";		# Automatically backs up conflicting files during activation
               home-manager.extraSpecialArgs = { inherit inputs username version hyprlandEnabled; system = "x86_64-linux"; };
             }
             #Conditional Modules!
diff --git a/neovim-home.nix b/neovim-home.nix
index 0e6754e..9a22877 100644
--- a/neovim-home.nix
+++ b/neovim-home.nix
@@ -69,6 +69,8 @@
         vim.opt.clipboard = "unnamedplus"
         vim.opt.shiftwidth = 2
 
+        vim.opt.mousescroll = "ver:0,hor:0" 
+
       	vim.opt.rtp:prepend("${pkgs.vimPlugins.lazy-nvim}")
 
         require("lazy").setup({
diff --git a/packages.nix b/packages.nix
index 4ae0740..cb092b8 100644
--- a/packages.nix
+++ b/packages.nix
@@ -1,4 +1,4 @@
-{config, pkgs, libs, inputs, trayscale-flake, ...}:
+{config, pkgs, libs, inputs, ...}:
 {
   environment.systemPackages = with pkgs;
   [
@@ -44,8 +44,7 @@
   #heroic
   #putty	Need to find alternative as it sucks on linux
   mission-center
-  trayscale
-  #trayscale-flake
+  trayscale   #sudo tailscale set --operator=$USER  --> Needed to make it work!
   spotify
   rpi-imager
   kdePackages.yakuake
diff --git a/plasma/autostart.nix b/plasma/autostart.nix
index 7461e69..1fc5cdb 100644
--- a/plasma/autostart.nix
+++ b/plasma/autostart.nix
@@ -16,18 +16,19 @@
   systemd.user.services.autostart-yakuake = {
       enable = true;
       description = "Automatically start Yakuake";
-      #after = [ "plasma-desktop.service" ];
+      after = [ "graphical-session.target" ];
       serviceConfig.ExecStart = [ "${pkgs.kdePackages.yakuake}/bin/yakuake" ];
-      wantedBy = [ "default.target" ];
+      wantedBy = [ "graphical-session.target" ];
       serviceConfig = {
        	Type = "oneshot";
         Restart = "on-failure";
         RestartSec = "5s";
+        Environment = "PATH=/run/current-system/sw/bin:/etc/profiles/per-user/$USER/bin";
       };
   };
 
   systemd.user.services.autostart-trayscale = {
-        enable = false;
+        enable = true;
         description = "Automatically start Trayscale";
         #after = [ "plasma-desktop.service" ];
         serviceConfig.ExecStart = [ "${pkgs.trayscale}/bin/trayscale --hide-window" ];
diff --git a/plasma/kde-plasma.nix b/plasma/kde-plasma.nix
index f030e8e..d7b755d 100644
--- a/plasma/kde-plasma.nix
+++ b/plasma/kde-plasma.nix
@@ -49,12 +49,12 @@ in
    # Enable the KDE Plasma Desktop Environment.
   services.desktopManager.plasma6.enable = true;
   
-#  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [
 #    (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" ''
 #      [General]
 #      background = "${background-package}"
 #    '')
-#  ];
+  ];
   
 
   programs.steam.enable = true;