diff --git a/config/clipboard.rasi b/config/clipboard.rasi
index 5f21ee9..c299006 100644
--- a/config/clipboard.rasi
+++ b/config/clipboard.rasi
@@ -42,7 +42,7 @@ wallbox {
     expand:                      false;
     orientation:                 horizontal;
     background-color:            transparent;
-    background-image:            url("~/dotfiles/config/backgrounds/aurora_borealis.png", width);
+    background-image:            url("~/.dotfiles/config/backgrounds/aurora_borealis.png", width);
     children:                    [ "wallframe" , "inputbar" ];
 }
 wallframe {
@@ -51,7 +51,7 @@ wallframe {
     padding:                     0em;
     expand:                      false;
     background-color:            @main-bg;
-    background-image:            url("~/dotfiles/config/backgrounds/aurora_borealis.png", width);
+    background-image:            url("~/.dotfiles/config/backgrounds/aurora_borealis.png", width);
 }
 
 
diff --git a/config/hyprlock.conf b/config/hyprlock.conf
index 09dd309..6650228 100644
--- a/config/hyprlock.conf
+++ b/config/hyprlock.conf
@@ -10,7 +10,7 @@ general {
 
 background {
     monitor =
-    path = /home/foglar/dotfiles/config/backgrounds/aurora_borealis.png
+    path = /home/shinya/.dotfiles/config/backgrounds/aurora_borealis.png
     color = rgba(25, 20, 20, 1.0)
 
     # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
diff --git a/nixos/home/apps/applications.nix b/nixos/home/apps/applications.nix
index c007318..eececaf 100644
--- a/nixos/home/apps/applications.nix
+++ b/nixos/home/apps/applications.nix
@@ -12,7 +12,7 @@
   config = lib.mkIf config.app_list.applications.enable {
     home.packages =
       (with pkgs; [
-        #librewolf
+        librewolf
         qutebrowser
         ferdium
 
diff --git a/nixos/home/desktop/hyprland/rofi.nix b/nixos/home/desktop/hyprland/rofi.nix
index 0036a00..14715a3 100644
--- a/nixos/home/desktop/hyprland/rofi.nix
+++ b/nixos/home/desktop/hyprland/rofi.nix
@@ -58,7 +58,7 @@
           orientation = mkLiteral "vertical";
           children = ["inputbar" "listbox"];
           background-color = mkLiteral "transparent";
-          background-image = mkLiteral "url(\"~/dotfiles/config/backgrounds/aurora_borealis.png\", height)";
+          background-image = mkLiteral "url(\"~/.dotfiles/config/backgrounds/aurora_borealis.png\", height)";
         };
       
         # Input bar settings
@@ -68,7 +68,7 @@
           padding = mkLiteral "5em";
           children = ["entry"];
           background-color = mkLiteral "transparent";
-          background-image = mkLiteral "url(\"~/dotfiles/config/backgrounds/aurora_borealis.png\", width)";
+          background-image = mkLiteral "url(\"~/.dotfiles/config/backgrounds/aurora_borealis.png\", width)";
         };
       
         # Entry field settings
diff --git a/nixos/home/desktop/hyprland/waybar.nix b/nixos/home/desktop/hyprland/waybar.nix
index a7e4403..08fb633 100644
--- a/nixos/home/desktop/hyprland/waybar.nix
+++ b/nixos/home/desktop/hyprland/waybar.nix
@@ -44,7 +44,7 @@
           };
 
           "hyprland/window" = {
-            format = "   {}";
+            format = "  {}";
             #rotate = ${r_deg};
             separate-outputs = true;
             rewrite = {
@@ -75,12 +75,12 @@
               "m" = 30; # medium
             };
             interval = 30;
-            format = "󰾆  {used}GB";
+            format = "󰾆 {used}GB";
             #rotate = ${r_deg};
-            format-m = "󰾅  {used}GB";
-            format-h = "󰓅  {used}GB";
-            format-c = "  {used}GB";
-            format-alt = "󰾆  {percentage}%";
+            format-m = "󰾅 {used}GB";
+            format-h = "󰓅 {used}GB";
+            format-c = " {used}GB";
+            format-alt = "󰾆 {percentage}%";
             max-length = 10;
             tooltip = true;
             tooltip-format = "󰾆  {percentage}%\n  {used:0.1f}GB/{total:0.1f}GB";
@@ -188,13 +188,13 @@
           };
 
           "pulseaudio" = {
-            format = "{icon}  {volume}";
+            format = "{icon} {volume}";
             rotate = 0;
             format-muted = "婢";
-            on-click = "pavucontrol -t 3";
-            on-click-middle = "swayosd-client --output-volume mute-toggle";
-            on-scroll-up = "swayosd-client --output-volume 5";
-            on-scroll-down = "swayosd-client --output-volume -5";
+            on-click = "${pkgs.pavucontrol}/bin/pavucontrol -t 3";
+            on-click-middle = "${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle";
+            on-scroll-up = "${pkgs.swayosd}/bin/swayosd-client --output-volume 5";
+            on-scroll-down = "${pkgs.swayosd}/bin/swayosd-client --output-volume -5";
             tooltip-format = "{icon} {desc} // {volume}%";
             scroll-step = 5;
             format-icons = {
@@ -213,10 +213,10 @@
             rotate = 0;
             format-source = "";
             format-source-muted = "";
-            on-click = "pavucontrol -t 4";
-            on-click-middle = "swayosd-client --input-volume mute-toggle";
-            on-scroll-up = "swayosd-client --input-volume 5";
-            on-scroll-down = "swayosd-client --input-volume -5";
+            on-click = "${pkgs.pavucontrol}/bin/pavucontrol -t 4";
+            on-click-middle = "${pkgs.swayosd}/bin/swayosd-client --input-volume mute-toggle";
+            on-scroll-up = "${pkgs.swayosd}/bin/swayosd-client --input-volume 5";
+            on-scroll-down = "${pkgs.swayosd}/bin/swayosd-client --input-volume -5";
             tooltip-format = "{format_source} {source_desc} // {source_volume}%";
             scroll-step = 5;
           };
@@ -236,8 +236,8 @@
             format = " {}";
             rotate = 0;
             exec = "echo ; echo  logout";
-            on-click = "wlogout -b 2";
-            on-click-right = "wlogout -b 2";
+            on-click = "${pkgs.wlogout}/bin/wlogout -b 2";
+            on-click-right = "${pkgs.wlogout}/bin/wlogout -b 2";
             interval = 86400; # once every day
             tooltip = true;
           };
diff --git a/nixos/home/packages/applications/firefox.nix b/nixos/home/packages/applications/firefox.nix
index a4f3703..4bafc5f 100644
--- a/nixos/home/packages/applications/firefox.nix
+++ b/nixos/home/packages/applications/firefox.nix
@@ -13,6 +13,7 @@
   config = lib.mkIf config.program.firefox.enable {
     programs.firefox = {
       enable = true;
+      package = pkgs.firefox;
 
       profiles.default = {
         search.engines = {
diff --git a/nixos/home/packages/programming/code.nix b/nixos/home/packages/programming/code.nix
index d628ff0..0e5580f 100644
--- a/nixos/home/packages/programming/code.nix
+++ b/nixos/home/packages/programming/code.nix
@@ -80,6 +80,9 @@
           # Remote
           ms-vscode-remote.remote-ssh
           ms-vscode-remote.remote-ssh-edit
+
+          pkief.material-product-icons
+          pkief.material-icon-theme
         ];
       };
     })
@@ -206,8 +209,6 @@
         zhuangtongfa.material-theme
         oderwat.indent-rainbow
         enkia.tokyo-night
-        pkief.material-product-icons
-        pkief.material-icon-theme
       ];
     })