diff --git a/assets/.bashrc b/assets/.bashrc
index e69de29..06867f4 100644
--- a/assets/.bashrc
+++ b/assets/.bashrc
@@ -0,0 +1 @@
+hyfetch
\ No newline at end of file
diff --git a/assets/avatar.png b/assets/avatar.png
index f55269b..de10a35 100644
Binary files a/assets/avatar.png and b/assets/avatar.png differ
diff --git a/home.nix b/home.nix
index 4845b19..95f4f3e 100644
--- a/home.nix
+++ b/home.nix
@@ -129,7 +129,7 @@
   };
 
   programs.git = {
-    userName = "Seven Of Aces";
+    userName = "Seven of Aces";
     userEmail = "sevenofaces42@gmail.com";
   };
 }
\ No newline at end of file
diff --git a/hosts/blackstar/nixos/configuration.nix b/hosts/blackstar/nixos/configuration.nix
index 03686ad..261f644 100644
--- a/hosts/blackstar/nixos/configuration.nix
+++ b/hosts/blackstar/nixos/configuration.nix
@@ -40,11 +40,12 @@
         minecraft.enable = true;
         chat.enable = true;
     };
-    system.boot.grub.enable = true;
+ #   system.boot.grub.enable = true;
+    system.audio.enable = true;
   };
 
-  #boot.loader.systemd-boot.enable = true;
-  #boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   nixpkgs = {
     # You can add overlays here
diff --git a/hosts/shared/nixos/shared_config.nix b/hosts/shared/nixos/shared_config.nix
index da1f53d..7b58394 100644
--- a/hosts/shared/nixos/shared_config.nix
+++ b/hosts/shared/nixos/shared_config.nix
@@ -7,7 +7,8 @@
   ...
 }: {
     environment.systemPackages = with pkgs; [ 
-
+        steam
+        wallpaper_engine
         # code
         cargo rustc # Rust
         jetbrains.pycharm-professional
@@ -46,14 +47,30 @@
         # other
         discord
         nodejs_22
-        obs-studio
 
         # sys utils
-        gnupg ffmpeg unzip 
+        gnupg ffmpeg unzip
         mpv gparted
         libappindicator-gtk3
+        pavucontrol
+        hyfetch
     ];
-    
+
+    hardware.bluetooth.enable = true;
+    hardware.bluetooth.powerOnBoot = true;
+    services.blueman.enable = true;
+
+    services.pipewire.wireplumber.enable = true;
+    services.pipewire.wireplumber.extraConfig.bluetoothEnhancements = {
+        "monitor.bluez.properties" = {
+            "bluez5.enable-sbc-xq" = true;
+            "bluez5.enable-msbc" = true;
+            "bluez5.enable-hw-volume" = true;
+            "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ];
+        };
+    };
+
+
     programs.nix-ld.enable = true;
     programs.firefox.enable = true;
 
diff --git a/modules/desktop/apps/art.nix b/modules/desktop/apps/art.nix
index b8ad4b7..040ec89 100644
--- a/modules/desktop/apps/art.nix
+++ b/modules/desktop/apps/art.nix
@@ -4,13 +4,15 @@ with lib;
 let cfg = config.modules.desktop.apps.art;
 in {
   options.modules.desktop.apps.art = {
-    enable = mkBoolOpt false;
+    enable = mkEnableOption false;
   };
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
         aseprite
         krita
+        lmms
+        inkscape
     ];
   };
 }
\ No newline at end of file
diff --git a/modules/desktop/apps/cad.nix b/modules/desktop/apps/cad.nix
index 9ec71f6..bb0997b 100644
--- a/modules/desktop/apps/cad.nix
+++ b/modules/desktop/apps/cad.nix
@@ -4,11 +4,11 @@ with lib;
 let cfg = config.modules.desktop.apps.cad;
 in {
   options.modules.desktop.apps.cad = {
-    enable = mkBoolOpt false;
+    enable = mkEnableOption false;
   };
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
         (blender.override {
             cudaSupport = true;
         })
diff --git a/modules/desktop/apps/cam.nix b/modules/desktop/apps/cam.nix
index ed7e21b..1d085ca 100644
--- a/modules/desktop/apps/cam.nix
+++ b/modules/desktop/apps/cam.nix
@@ -4,11 +4,11 @@ with lib;
 let cfg = config.modules.desktop.apps.cam;
 in {
   options.modules.desktop.apps.cam = {
-    enable = mkBoolOpt false;
+    enable = mkEnableOption false;
   };
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
         prusa-slicer
     ];
   };
diff --git a/modules/desktop/apps/chat.nix b/modules/desktop/apps/chat.nix
index 532c2c6..583a06f 100644
--- a/modules/desktop/apps/chat.nix
+++ b/modules/desktop/apps/chat.nix
@@ -4,13 +4,13 @@ with lib;
 let cfg = config.modules.desktop.apps.chat;
 in {
   options.modules.desktop.apps.chat = {
-    enable = mkBoolOpt false;
+    enable = mkEnableOption false;
   };
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
         discord
-        element-app
+        element-desktop
     ];
   };
 }
\ No newline at end of file
diff --git a/modules/desktop/apps/code.nix b/modules/desktop/apps/code.nix
index 1df9290..de76354 100644
--- a/modules/desktop/apps/code.nix
+++ b/modules/desktop/apps/code.nix
@@ -4,11 +4,17 @@ with lib;
 let cfg = config.modules.desktop.apps.code;
 in {
   options.modules.desktop.apps.code = {
-    enable = mkBoolOpt false;
+    enable = mkEnableOption false;
   };
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs.unstable; [
+    programs.nix-ld = {
+      enable = true;
+      libraries = with pkgs; [
+        stdenv.cc.cc.lib
+      ];
+    };
+    environment.systemPackages = with pkgs; [
         rustc rustup # Rust
         # pkgs.rust-bin.stable.latest.default
         jetbrains.idea-ultimate
@@ -21,6 +27,16 @@ in {
         python3
         lua
         git
+        github-desktop
+
+        distrobox
+
+        # -- C/C++
+        gcc
+        libgcc
+        gnumake
+        cmake
+        extra-cmake-modules
     ];
   };
 }
\ No newline at end of file
diff --git a/modules/desktop/apps/godot.nix b/modules/desktop/apps/godot.nix
index 7920e3e..4376dcc 100644
--- a/modules/desktop/apps/godot.nix
+++ b/modules/desktop/apps/godot.nix
@@ -4,13 +4,21 @@ with lib;
 let cfg = config.modules.desktop.apps.godot;
 in {
   options.modules.desktop.apps.godot = {
-    enable = mkBoolOpt false;
+    enable = mkEnableOption false;
   };
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs.unstable; [
+    programs.nix-ld.enable = true;
+    programs.nix-ld.libraries = with pkgs; [
+      libgcc
+    ];
+
+    environment.systemPackages = with pkgs.unstable; [
       godot_4
       godot_4-export-templates
+      gcc-unwrapped
     ];
+
+    environment.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib"; };
   };
 }
\ No newline at end of file
diff --git a/modules/desktop/apps/minecraft.nix b/modules/desktop/apps/minecraft.nix
index bb56307..bb51bd7 100644
--- a/modules/desktop/apps/minecraft.nix
+++ b/modules/desktop/apps/minecraft.nix
@@ -4,11 +4,11 @@ with lib;
 let cfg = config.modules.desktop.apps.minecraft;
 in {
   options.modules.desktop.apps.minecraft = {
-    enable = mkBoolOpt false;
+    enable = mkEnableOption false;
   };
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
         modrinth-app
     ];
     environment.variables = {
diff --git a/modules/desktop/apps/xiv.nix b/modules/desktop/apps/xiv.nix
index daf9d4b..7e2a3de 100644
--- a/modules/desktop/apps/xiv.nix
+++ b/modules/desktop/apps/xiv.nix
@@ -4,11 +4,11 @@ with lib;
 let cfg = config.modules.desktop.apps.xiv;
 in {
   options.modules.desktop.apps.xiv = {
-    enable = mkBoolOpt false;
+    enable = mkEnableOption false;
   };
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
         xivlauncher
     ];
   };
diff --git a/modules/system/audio.nix b/modules/system/audio.nix
index 425adc4..7a5700e 100644
--- a/modules/system/audio.nix
+++ b/modules/system/audio.nix
@@ -4,7 +4,7 @@ with lib;
 let cfg = config.modules.system.audio;
 in {
   options.modules.system.audio = {
-    enable = mkBoolOpt true;
+    enable = mkEnableOption true;
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/system/boot/.grub.nix.swp b/modules/system/boot/.grub.nix.swp
new file mode 100644
index 0000000..26c9f3d
Binary files /dev/null and b/modules/system/boot/.grub.nix.swp differ
diff --git a/modules/system/boot/grub.nix b/modules/system/boot/grub.nix
index 2994e95..a1fc99c 100644
--- a/modules/system/boot/grub.nix
+++ b/modules/system/boot/grub.nix
@@ -4,14 +4,17 @@ with lib;
 let cfg = config.modules.system.boot.grub;
 in {
   options.modules.system.boot.grub = {
-    enable = mkBoolOpt true;
+    enable = mkEnableOption true;
   };
 
   config = mkIf cfg.enable {
+
     boot.loader = {
+	systemd-boot.enable = false;
         grub = {
-            enable = true;
-            useOSProver = true;
+          #  efiInstallAsRemovable = true;
+	    enable = true;
+            useOSProber = true;
             efiSupport = true;
             fsIdentifier = "label";
             devices = [ "nodev" ];
@@ -20,9 +23,9 @@ in {
                     reboot
                 }
                 menuentry "Poweroff" {
-                    halt
-                }
-            '';
+                   halt
+               }
+           '';
             theme = pkgs.stdenv.mkDerivation {
                 pname = "distro-grub-themes";
                 version = "3.1";
@@ -37,7 +40,8 @@ in {
         };
         efi = {
             canTouchEfiVariables = true;
+     	    efiSysMountPoint = "/boot";
         };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 12ef4b2..2bda00e 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -2,5 +2,5 @@
 # You can build them using 'nix build .#example'
 pkgs: {
   # example = pkgs.callPackage ./example { };;
-  custom_godot = pkgs.callPackage ./custom_godot {};
+  wallpaper_engine = pkgs.callPackage ./wallpaper-engine {};
 }
\ No newline at end of file
diff --git a/pkgs/wallpaper-engine.nix b/pkgs/wallpaper-engine.nix
new file mode 100644
index 0000000..3388f0d
--- /dev/null
+++ b/pkgs/wallpaper-engine.nix
@@ -0,0 +1,44 @@
+{ mkDerivation
+, fetchFromGitHub
+, cmake
+, extra-cmake-modules
+, plasma-framework
+, gst-libav
+, mpv
+, websockets
+, qtwebsockets
+, qtwebchannel
+, qtdeclarative
+, qtx11extras
+, vulkan-headers
+, vulkan-loader
+, vulkan-tools
+, pkg-config
+, lz4
+, glslang
+}:
+
+mkDerivation rec {
+  pname = "wallpaper-engine-kde-plugin";
+  version = "0.5.3";
+
+  cmakeFlags = [ "-DUSE_PLASMAPKG=ON" ];
+  nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
+  buildInputs = [ 
+    plasma-framework mpv qtwebsockets websockets qtwebchannel
+    qtdeclarative qtx11extras lz4
+    vulkan-headers vulkan-tools vulkan-loader
+  ];
+
+  postPatch = ''
+    rmdir src/backend_scene/third_party/glslang
+    ln -s ${glslang.src} src/backend_scene/third_party/glslang
+  '';
+
+  src = fetchFromGitHub {
+    owner = "catsout";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "qmg+g1you3rm1EAfZWRUBBkEQm1QQ0V9/mIn8bBgbu4=";
+  };
+}
\ No newline at end of file