diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml
index 504f1b6..5d2e32c 100644
--- a/alacritty/alacritty.toml
+++ b/alacritty/alacritty.toml
@@ -16,9 +16,20 @@ family = "MesloLGS NF"
 [font.normal]
 family = "MesloLGS NF"
 
-[keyboard]
-bindings = [
-{ key = "T", mods = "Control|Shift", action = "SpawnNewInstance" },
-{ key = "PageUp",  action = "ScrollLineUp" },
-{ key = "PageDown", action = "ScrollLineDown" },
-]
+[[keyboard.bindings]]
+key = "T"
+mods = "Control|Shift"
+action = "SpawnNewInstance"
+
+[[keyboard.bindings]]
+key = "PageUp"
+action = "ScrollLineUp"
+
+[[keyboard.bindings]]
+key = "PageDown"
+action = "ScrollLineDown"
+
+[[keyboard.bindings]]
+key = "Return"
+mods = "Shift"
+chars = "\u001b\r"
diff --git a/alacritty/alacritty.toml.dc947f6f.bak b/alacritty/alacritty.toml.dc947f6f.bak
new file mode 100644
index 0000000..504f1b6
--- /dev/null
+++ b/alacritty/alacritty.toml.dc947f6f.bak
@@ -0,0 +1,24 @@
+[window]
+startup_mode = "Maximized"
+
+[font]
+size = 14.0
+
+[font.bold]
+family = "MesloLGS NF"
+
+[font.bold_italic]
+family = "MesloLGS NF"
+
+[font.italic]
+family = "MesloLGS NF"
+
+[font.normal]
+family = "MesloLGS NF"
+
+[keyboard]
+bindings = [
+{ key = "T", mods = "Control|Shift", action = "SpawnNewInstance" },
+{ key = "PageUp",  action = "ScrollLineUp" },
+{ key = "PageDown", action = "ScrollLineDown" },
+]
diff --git a/sway/config b/sway/config
index b3d046f..8fd0694 100644
--- a/sway/config
+++ b/sway/config
@@ -24,7 +24,7 @@ set $menu rofi -show drun
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-set $bg /data/sync/images/wallpapers/0002.jpg
+set $bg /data/sync/images/wallpapers/0002.png
 set $screenlock 'swaylock -i $bg'
 set $images $(xdg-user-dir PICTURES)/$(date +'%s_grim.png')
 #
@@ -76,8 +76,9 @@ input "5426:156:Razer_Razer_DeathAdder_V2_X_HyperSpeed" {
 }
 
 #exec --no-startup-id /usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh
-exec --no-startup-id kwalletd6
+exec --no-startup-id source ~/.config/fcitx.sh
 exec --no-startup-id fcitx5
+exec --no-startup-id kwalletd6
 #exec --no-startup-id blueman-applet
 exec --no-startup-id owncloud 
 exec --no-startup-id waybar
@@ -97,7 +98,7 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id $raise-volume
 bindsym XF86AudioLowerVolume exec --no-startup-id $lower-volume
 bindsym XF86AudioMute        exec --no-startup-id $mute-sink
 bindsym XF86AudioMicMute     exec --no-startup-id $mute-source
-bindsym $mod+slash  exec --no-startup-id wpctl $mute-sink
+bindsym $mod+slash  exec --no-startup-id $mute-sink
 bindsym $mod+period exec --no-startup-id $raise-volume
 bindsym $mod+comma  exec --no-startup-id $lower-volume
 
diff --git a/sway/swaylock.conf b/sway/swaylock.conf
new file mode 100644
index 0000000..adeb4c7
--- /dev/null
+++ b/sway/swaylock.conf
@@ -0,0 +1,5 @@
+# Set a background image
+image=/data/sync/images/wallpapers/0002.png
+
+# Set the scaling mode for the image
+scaling=fill
diff --git a/waybar/config b/waybar/config
index d800255..c3cb358 100644
--- a/waybar/config
+++ b/waybar/config
@@ -4,7 +4,7 @@
                   // Choose the order of the modules
         "modules-left": ["sway/workspaces", "sway/window"],
         "modules-center": ["clock"],
-        "modules-right": ["custom/tiramisu","battery", "bluetooth", "network", "wireplumber", "tray"],
+        "modules-right": ["custom/tiramisu","battery", "network", "bluetooth", "wireplumber", "tray"],
         //"modules-right": ["custom/tiramisu", "bluetooth",network", "wireplumber", "tray"],
         // Modules configuration
         //        "hyprland/workspaces": {
@@ -29,19 +29,20 @@
             //"format": "{status}  ",
             "format-on": "",
             "format-off": "󰂲",
-            "format-connected": "{device_alias} 󰂱",
+            //"format-connected": "{device_alias} 󰂱",
+            "format-connected": "󰂱",
             // "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device
             "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
             "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
             "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
             "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
-            "on-click": "~/.local/bin/rofi-bluetooth"
-            //"on-click": "blueman-manager"
+            "on-click": "dbus-launch --exit-with-session blueman-manager"
         },
         "network": {
-            "interface": "wls2",
+            "interface": "wlp0s20f3",
             "format": "{ifname}",
-            "format-wifi": "{essid} {icon}",
+            //"format-wifi": "{essid} {icon}",
+            "format-wifi": "{icon}",
             "format-ethernet": "{ipaddr}/{cidr} 󰊗",
             "format-disconnected": "", //An empty format will hide the module.
             "tooltip-format": "{ifname} via {gwaddr} 󰊗",
diff --git a/waybar/style.css b/waybar/style.css
index 8653dd7..2aa19d7 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -83,15 +83,6 @@ tooltip label{
     background: @bg_hover;
     color: @content_main;
 }
-button {
-    border: none;
-    border-radius: 0;
-}
-button:hover {
-    box-shadow: inherit;
-    text-shadow: inherit;
-    background: inherit;
-}
 
 #taskbar {
 }