diff --git a/.config/hypr/config/Keybinds.conf b/.config/hypr/config/Keybinds.conf
index 2d0e386..7b8158e 100644
--- a/.config/hypr/config/Keybinds.conf
+++ b/.config/hypr/config/Keybinds.conf
@@ -97,13 +97,14 @@ bind = $mainMod, Space, fullscreen, 0
 
 # rofi App launcher
 #bind = $mainMod, Tab, exec, nwg-drawer -pbexit "wayland-logout" -pbpoweroff "systemctl poweroff" -pbreboot "systemctl reboot"
-bind = $mainMod, Tab, exec, $appLauncher
+bind = , Home, exec, $appLauncher
 bind = ALT, Tab, exec, rofi -show window -show-icons
 
 bind = $mainMod, Return, exec, $term
 bind = $mainMod Shift, Return, exec, hyprdrop ghostty --identifier term_hyprdrop
 bind = $mainMod, Z, exec, $files
 
+
 bind = $mainMod, R, focusurgentorlast
 bind = $mainMod SHIFT, P, exec, rofi -modes "2fa" -show 2fa
 
diff --git a/.config/hypr/config/settings/Input.conf b/.config/hypr/config/settings/Input.conf
index d2afefa..f173220 100644
--- a/.config/hypr/config/settings/Input.conf
+++ b/.config/hypr/config/settings/Input.conf
@@ -36,6 +36,13 @@ device {
   accel_profile = flat
 }
 
+device {
+  name = keychron-keychron-q10-max-keyboard
+  kb_layout = us
+  kb_variant = altgr-intl
+  kb_options = fkeys:basic_13-24
+}
+
 device {
   name = keychron-keychron-q10-max
   kb_layout = us
@@ -43,6 +50,12 @@ device {
   kb_options = fkeys:basic_13-24
 }
 
+device {
+  name = dygma-defy-keyboard
+  kb_layout = us
+  kb_variant = altgr-intl
+  kb_options = fkeys:basic_13-24
+}
 device {
   name = evremap-virtual-input-for-/dev/input/event31
   kb_layout = us
@@ -55,6 +68,3 @@ device {
   kb_variant = altgr-intl
   kb_options = fkeys:basic_13-24
 }
-
-
-source = ~/.cache/evremap_hyprland_config.conf
diff --git a/.config/rofi/scripts/calc.sh b/.config/rofi/scripts/calc.sh
index a625c42..773800f 100755
--- a/.config/rofi/scripts/calc.sh
+++ b/.config/rofi/scripts/calc.sh
@@ -12,9 +12,9 @@ case $ROFI_RETV in
   IFS=' '
 
   for number in $NUMBERS; do
-    echo $number
+    echo -en "$number\\0icon\\x1fnum-lock-on\\n"
   done
-  echo -en "$result\0non-selectable\x1ftrue\n"
+  echo -en "$result\\0non-selectable\\x1ftrue\\x1ficon\\x1fcalc\n"
   ;;
 
 esac
diff --git a/.config/rofi/scripts/pactl.sh b/.config/rofi/scripts/pactl.sh
index 67a8e00..c4c0cca 100755
--- a/.config/rofi/scripts/pactl.sh
+++ b/.config/rofi/scripts/pactl.sh
@@ -6,7 +6,10 @@ setOption no-custom true
 case $ROFI_RETV in
 0)
   defaultSink=$(pactl get-default-sink)
-  echo -en $(pactl --format=json list sinks | jq --arg default "$defaultSink" -r 'map("\(.name)\\0display\\x1f\(.description)\\x1fmeta\\x1fsinks,output,\(.description)\\x1factive\\x1f\(.name == $default)\\n") | add')
+  echo -en $(pactl --format=json list sinks | jq --arg default "$defaultSink" -r 'map("\(.name)\\0display\\x1f\(.description)\\x1fmeta\\x1fsinks,output,\(.description)\\x1ficon\\x1faudio-ready\\n") | add')
+
+  defaultSource=$(pactl get-default-source)
+  echo -en $(pactl --format=json list sources | jq --arg default "$defaultSource" -r 'map("\(.name)\\0display\\x1f\(.description)\\x1fmeta\\x1fsource,input,\(.description)\\x1ficon\\x1fmic-ready\\n") | add')
   ;;
 1)
   name=$@
diff --git a/.config/theming/applications/rofi/style.scss b/.config/theming/applications/rofi/style.scss
index 9aea64d..84ebdbd 100644
--- a/.config/theming/applications/rofi/style.scss
+++ b/.config/theming/applications/rofi/style.scss
@@ -5,6 +5,8 @@ $border-primary: $color2;
 
 $transparentBackground: rgba(128,128,128, 0.6);
 
+$activeBackgroundColor: rgb(20,128,20);
+
 * {
 
   text-color: $foreground;
@@ -55,8 +57,16 @@ element {
   border-radius: $border-radius;
   padding: $input-padding;
 
+
+  normal.active {
+    background-color: rgba($activeBackgroundColor, 0.25);
+  }
+
   selected {
     background-color: $transparentBackground;
+    &.active {
+      background-color: rgba($activeBackgroundColor, 0.6);
+    }
   }
 }