diff --git a/config b/config
index 4364421..b0a6c26 100644
--- a/config
+++ b/config
@@ -47,9 +47,9 @@ bindsym $mod+Shift+q kill
 #bindsym $mod+Shift+d exec dmenu_run
 #bindsym $mod+d exec j4-dmenu-desktop
 
-bindsym --release $mod+Shift+d exec "rofi -show run"
-bindsym --release $mod+d exec "rofi -show drun"
-bindsym --release $mod+Control+d exec "rofi -show window"
+bindsym --release $mod+Shift+d exec "xkb-switch -s us && rofi -show run"
+bindsym --release $mod+d exec "xkb-switch -s us && rofi -show drun"
+bindsym --release $mod+Control+d exec "xkb-switch -s us && rofi -show window"
 
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
@@ -153,6 +153,7 @@ bindsym $mod+Shift+c reload
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+bindsym $mod+Shift+b exec "~/.config/i3/rofi-btooth"
 
 bindsym $mod+Shift+grave move scratchpad
 bindsym $mod+grave scratchpad show
@@ -194,12 +195,12 @@ bindsym --release Print                   exec --no-startup-id scrot -m '%Y%m%d-
 bindsym --release $mod+Print              exec --no-startup-id scrot -s '/tmp/%F_%T_$wx$h.png' -e 'xclip -selection clipboard -target image/png -i $f'
 
 ### Audio volume
-bindsym XF86AudioMute                   exec --no-startup-id "amixer -D pulse sset Master toggle"
-bindsym XF86AudioRaiseVolume            exec --no-startup-id "amixer -D pulse sset Master 10%+"
-bindsym Shift+XF86AudioRaiseVolume      exec --no-startup-id "amixer -D pulse sset Master 5%+"
-bindsym XF86AudioLowerVolume            exec --no-startup-id "amixer -D pulse sset Master 10%-"
-bindsym Shift+XF86AudioLowerVolume      exec --no-startup-id "amixer -D pulse sset Master 5%-"
-bindsym XF86AudioMicMute                exec --no-startup-id "amixer -D pulse sset Capture toggle"
+bindsym XF86AudioMute                   exec --no-startup-id amixer -D pulse sset Master toggle
+bindsym XF86AudioRaiseVolume            exec --no-startup-id amixer -D pulse sset Master 10%+
+bindsym Shift+XF86AudioRaiseVolume      exec --no-startup-id amixer -D pulse sset Master 5%+
+bindsym XF86AudioLowerVolume            exec --no-startup-id amixer -D pulse sset Master 10%-
+bindsym Shift+XF86AudioLowerVolume      exec --no-startup-id amixer -D pulse sset Master 5%-
+bindsym XF86AudioMicMute                exec --no-startup-id amixer -D pulse sset Capture toggle
 
 
 mode "mode_mic" {
diff --git a/i3status-rust.toml b/i3status-rust.toml
index 062e1e9..75e0728 100644
--- a/i3status-rust.toml
+++ b/i3status-rust.toml
@@ -12,10 +12,10 @@ block = "toggle"
 interval = 3
 text = "NO BLANK"
 command_state = "xset q | grep 'DPMS is Disabled'"
-#command_on = "xset s off -dpms; xset s 300 300"
-#command_off = "xset s on +dpms"
-command_on = "xset dpms force on"
-command_off = "xset reset"
+command_on = "xset s off -dpms"
+command_off = "xset s on +dpms"
+#command_on = "xset dpms force on"
+#command_off = "xset reset"
 
 [[block]]
 block = "toggle"
@@ -80,6 +80,12 @@ block = "bluetooth"
 mac = "2C:4D:79:47:42:9F"
 label = " BT"
 
+[[block]]
+block = "custom"
+command = "echo 'pair'"
+interval = 600
+on_click = "~/.config/i3/rofi-btooth"
+
 [[block]]
 block = "time"
 interval = 60
diff --git a/polybar.conf~ b/polybar.conf~
deleted file mode 100644
index 7705a08..0000000
--- a/polybar.conf~
+++ /dev/null
@@ -1,374 +0,0 @@
-;=====================================================
-;
-;   To learn more about how to configure Polybar
-;   go to https://github.com/jaagr/polybar
-;
-;   The README contains alot of information
-;
-;=====================================================
-
-[settings]
-screenchange-reload = true
-
-[colors]
-background = #222
-background-alt = #444
-foreground = #dfdfdf
-foreground-alt = #55
-primary = #ffb52a
-secondary = #e60053
-alert = #bd2c40
-
-[global/wm]
-margin-top = 5
-margin-bottom = 5
-
-[bar/example]
-bottom = true
-separator = ""
-
-;monitor = ${env:MONITOR:HDMI-1}
-width = 100%
-height = 27
-offset-x = 0
-offset-y = 0
-
-;background = ${xrdb:color9}
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-overline-size = 2
-overline-color = #f00
-underline-size = 2
-underline-color = #00f
-
-border-bottom-size = 2
-border-bottom-color = #333
-
-padding-left = 0
-padding-right = 2
-module-margin-left = 1
-module-margin-right = 2
-
-font-0 = System San Francisco Display:pixelsize=12
-font-1 = unifont:fontformat=truetype:size=6:heavy;-2
-font-2 = siji:pixelsize=10
-font-3 = FontAwesome:pixelsize=12;0
-font-4 = fixed:pixelsize=10
-font-5 = TakaoPGothic:pixelsize=12
-
-modules-left = bspwm i3 xwindow
-modules-center = 
-modules-right = xbacklight volume xkeyboard memory cpu wlan eth battery temperature date powermenu
-
-tray-position = right
-tray-padding = 2
-;tray-transparent = true
-;tray-background = #0063ff
-
-;wm-restack = bspwm
-;wm-restack = i3
-
-;override-redirect = true
-
-;scroll-up = bspwm-desknext
-;scroll-down = bspwm-deskprev
-
-;scroll-up = i3wm-wsnext
-;scroll-down = i3wm-wsprev
-
-
-[module/xwindow]
-type = internal/xwindow
-label = %title:0:30:...%
-
-[module/xkeyboard]
-type = internal/xkeyboard
-blacklist-0 = num lock
-label-layout = %{F#55}%{F-} %layout%
-label-layout-underline = ${colors.secondary}
-label-indicator-padding = 2
-label-indicator-margin = 1
-label-indicator-background = ${colors.secondary}
-label-indicator-underline = ${colors.secondary}
-
-[module/filesystem]
-type = internal/fs
-interval = 25
-
-mount-0 = /
-mount-1 = /home
-mount-2 = /invalid/mountpoint
-
-label-mounted = %mountpoint%: %percentage_free%%
-
-label-unmounted = %mountpoint%: not mounted
-label-unmounted-foreground = ${colors.foreground-alt}
-
-[module/bspwm]
-type = internal/bspwm
-
-label-focused = %index%
-label-focused-background = ${colors.background-alt}
-label-focused-underline= ${colors.primary}
-label-focused-padding = 2
-
-label-occupied = %index%
-label-occupied-padding = 2
-
-label-urgent = %index%!
-label-urgent-background = ${colors.alert}
-label-urgent-padding = 2
-
-label-empty = %index%
-label-empty-foreground = ${colors.foreground-alt}
-label-empty-padding = 2
-
-[module/i3]
-type = internal/i3
-;fuzzy-match = true
-format = <label-state> <label-mode>
-index-sort = true
-wrapping-scroll = false
-
-strip-wsnumbers = true
-
-label-mode-padding = 2
-label-mode-foreground = #000
-label-mode-background = ${colors.primary}
-
-label-focused = %name%
-label-focused-background = ${module/bspwm.label-focused-background}
-label-focused-underline = ${module/bspwm.label-focused-underline}
-label-focused-padding = ${module/bspwm.label-focused-padding}
-
-label-unfocused = %name%
-label-unfocused-padding = ${module/bspwm.label-occupied-padding}
-
-label-urgent = %name%!
-label-urgent-background = ${module/bspwm.label-urgent-background}
-label-urgent-padding = ${module/bspwm.label-urgent-padding}
-
-label-visible = %name%
-label-visible-background = ${self.label-focused-background}
-label-visible-underline = ${self.label-focused-underline}
-label-visible-padding = ${self.label-focused-padding}
-
-; ws-icon-0 = "1;a"
-; ws-icon-1 = "2;a"
-; ws-icon-2 = "3;a"
-; ws-icon-3 = "4;四"
-; ws-icon-default = k
-[module/mpd]
-type = internal/mpd
-
-format-online = <label-song>  <icon-prev> <icon-seekb> <icon-stop> <toggle> <icon-seekf> <icon-next>  <icon-repeat> <icon-random>
-
-label-song-maxlen = 25
-label-song-ellipsis = true
-
-icon-prev = 
-icon-seekb = 
-icon-stop = 
-icon-play = 
-icon-pause = 
-icon-next = 
-icon-seekf = 
-
-icon-random = 
-icon-repeat = 
-
-toggle-on-foreground = ${colors.primary}
-toggle-off-foreground = #66
-
-[module/xbacklight]
-type = internal/xbacklight
-
-format = <label> <bar>
-label = BL
-
-bar-width = 10
-bar-indicator = │
-bar-indicator-foreground = #ff
-bar-indicator-font = 2
-bar-fill = ─
-bar-fill-font = 2
-bar-fill-foreground = #9f78e1
-bar-empty = ─
-bar-empty-font = 2
-bar-empty-foreground = ${colors.foreground-alt}
-
-[module/backlight-acpi]
-inherit = module/xbacklight
-type = internal/backlight
-card = intel_backlight
-
-[module/cpu]
-type = internal/cpu
-interval = 2
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #f90000
-label = %percentage%%
-
-[module/memory]
-type = internal/memory
-interval = 2
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #4bffdc
-label = %percentage_used%%
-
-[module/wlan]
-type = internal/network
-interface = net1
-interval = 3.0
-
-format-connected = <ramp-signal> <label-connected>
-format-connected-underline = #9f78e1
-format-disconnected-underline = ${self.format-connected-underline}
-
-label-connected = %essid%
-label-disconnected = %ifname% disconnected
-label-disconnected-foreground = ${colors.foreground-alt}
-
-ramp-signal-0 = 
-ramp-signal-1 = 
-ramp-signal-2 = 
-ramp-signal-3 = 
-ramp-signal-4 = 
-ramp-signal-foreground = ${colors.foreground-alt}
-
-[module/eth]
-type = internal/network
-interface = eth0
-interval = 3.0
-
-format-connected-underline = #55aa55
-format-connected-prefix = " "
-format-connected-foreground-foreground = ${colors.foreground-alt}
-label-connected = %local_ip%
-
-format-disconnected-underline = ${self.format-connected-underline}
-label-disconnected = %ifname% disconnected
-label-disconnected-foreground = ${colors.foreground-alt}
-
-[module/date]
-type = internal/date
-interval = 5
-
-date =
-date-alt = " %Y-%m-%d"
-
-time = %H:%M
-time-alt = %H:%M:%S
-
-format-prefix = 
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #0a6cf5
-
-label = %date% %time%
-
-[module/volume]
-type = internal/volume
-
-format-volume = <label-volume> <bar-volume>
-label-volume = VOL
-label-volume-foreground = ${root.foreground}
-
-format-muted-prefix = " "
-format-muted-foreground = ${colors.foreground-alt}
-label-muted = sound muted
-
-bar-volume-width = 10
-bar-volume-foreground-0 = #55aa55
-bar-volume-foreground-1 = #55aa55
-bar-volume-foreground-2 = #55aa55
-bar-volume-foreground-3 = #55aa55
-bar-volume-foreground-4 = #55aa55
-bar-volume-foreground-5 = #f5a70a
-bar-volume-foreground-6 = #ff5555
-bar-volume-gradient = false
-bar-volume-indicator = │
-bar-volume-indicator-font = 2
-bar-volume-indicator-foreground = #ff
-bar-volume-fill = ─
-bar-volume-fill-font = 2
-bar-volume-empty = ─
-bar-volume-empty-font = 2
-bar-volume-empty-foreground = ${colors.foreground-alt}
-
-[module/battery]
-type = internal/battery
-battery = BAT0
-adapter = ADP1
-full-at = 98
-
-format-charging = <animation-charging> <label-charging>
-format-charging-underline = #ffb52a
-
-format-discharging = <ramp-capacity> <label-discharging>
-format-discharging-underline = ${self.format-charging-underline}
-
-format-full-prefix = " "
-format-full-prefix-foreground = ${colors.foreground-alt}
-format-full-underline = ${self.format-charging-underline}
-
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-foreground = ${colors.foreground-alt}
-
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-foreground = ${colors.foreground-alt}
-animation-charging-framerate = 750
-
-[module/temperature]
-type = internal/temperature
-thermal-zone = 0
-warn-temperature = 60
-
-format = <ramp> <label>
-format-underline = #f50a4d
-format-warn = <ramp> <label-warn>
-format-warn-underline = ${self.format-underline}
-
-label = %temperature%
-label-warn = %temperature%
-label-warn-foreground = ${colors.secondary}
-
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
-ramp-foreground = ${colors.foreground-alt}
-
-[module/powermenu]
-type = custom/menu
-
-format-spacing = 1
-
-label-open =  power
-label-open-foreground = ${colors.secondary}
-label-close =  cancel
-label-close-foreground = ${colors.secondary}
-label-separator = |
-label-separator-foreground = ${colors.foreground-alt}
-
-menu-0-0 = reboot
-menu-0-0-exec = menu-open-1
-menu-0-1 = power off
-menu-0-1-exec = menu-open-2
-
-menu-1-0 = cancel
-menu-1-0-exec = menu-open-0
-menu-1-1 = reboot
-menu-1-1-exec = sudo reboot
-
-menu-2-0 = power off
-menu-2-0-exec = sudo poweroff
-menu-2-1 = cancel
-menu-2-1-exec = menu-open-0
-
-; vim:ft=dosini
diff --git a/rofi-btooth b/rofi-btooth
new file mode 100755
index 0000000..4c3f2a0
--- /dev/null
+++ b/rofi-btooth
@@ -0,0 +1,289 @@
+#!/usr/bin/env bash
+#             __ _       _     _            _              _   _
+#  _ __ ___  / _(_)     | |__ | |_   _  ___| |_ ___   ___ | |_| |__
+# | '__/ _ \| |_| |_____| '_ \| | | | |/ _ \ __/ _ \ / _ \| __| '_ \
+# | | | (_) |  _| |_____| |_) | | |_| |  __/ || (_) | (_) | |_| | | |
+# |_|  \___/|_| |_|     |_.__/|_|\__,_|\___|\__\___/ \___/ \__|_| |_|
+#
+# Author: Nick Clyde (clydedroid)
+#
+# A script that generates a rofi menu that uses bluetoothctl to
+# connect to bluetooth devices and display status info.
+#
+# Inspired by networkmanager-dmenu (https://github.com/firecat53/networkmanager-dmenu)
+# Thanks to x70b1 (https://github.com/polybar/polybar-scripts/tree/master/polybar-scripts/system-bluetooth-bluetoothctl)
+#
+# Depends on:
+#   Arch repositories: rofi, bluez-utils (contains bluetoothctl)
+
+# Checks if bluetooth controller is powered on
+power_on() {
+    if bluetoothctl show | grep -q "Powered: yes"; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Toggles power state
+toggle_power() {
+    if power_on; then
+        bluetoothctl power off
+    else
+        bluetoothctl power on
+    fi
+}
+
+# Checks if controller is scanning for new devices
+scan_on() {
+    if bluetoothctl show | grep -q "Discovering: yes"; then
+        echo "Scan: on"
+        return 0
+    else
+        echo "Scan: off"
+        return 1
+    fi
+}
+
+# Toggles scanning state
+toggle_scan() {
+    if scan_on; then
+        kill $(pgrep -f "bluetoothctl scan on")
+        bluetoothctl scan off
+    else
+        bluetoothctl scan on &
+    fi
+}
+
+# Checks if controller is able to pair to devices
+pairable_on() {
+    if bluetoothctl show | grep -q "Pairable: yes"; then
+        echo "Pairable: on"
+        return 0
+    else
+        echo "Pairable: off"
+        return 1
+    fi
+}
+
+# Toggles pairable state
+toggle_pairable() {
+    if pairable_on; then
+        bluetoothctl pairable off
+    else
+        bluetoothctl pairable on
+    fi
+}
+
+# Checks if controller is discoverable by other devices
+discoverable_on() {
+    if bluetoothctl show | grep -q "Discoverable: yes"; then
+        echo "Discoverable: on"
+        return 0
+    else
+        echo "Discoverable: off"
+        return 1
+    fi
+}
+
+# Toggles discoverable state
+toggle_discoverable() {
+    if discoverable_on; then
+        bluetoothctl discoverable off
+    else
+        bluetoothctl discoverable on
+    fi
+}
+
+# Checks if a device is connected
+device_connected() {
+    device_info=$(bluetoothctl info "$1")
+    if echo "$device_info" | grep -q "Connected: yes"; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Toggles device connection
+toggle_connection() {
+    if device_connected $1; then
+        bluetoothctl disconnect $1
+    else
+        bluetoothctl connect $1
+    fi
+}
+
+# Checks if a device is paired
+device_paired() {
+    device_info=$(bluetoothctl info "$1")
+    if echo "$device_info" | grep -q "Paired: yes"; then
+        echo "Paired: yes"
+        return 0
+    else
+        echo "Paired: no"
+        return 1
+    fi
+}
+
+# Toggles device paired state
+toggle_paired() {
+    if device_paired $1; then
+        bluetoothctl remove $1
+    else
+        bluetoothctl pair $1
+    fi
+}
+
+# Checks if a device is trusted
+device_trusted() {
+    device_info=$(bluetoothctl info "$1")
+    if echo "$device_info" | grep -q "Trusted: yes"; then
+        echo "Trusted: yes"
+        return 0
+    else
+        echo "Trusted: no"
+        return 1
+    fi
+}
+
+# Toggles device connection
+toggle_trust() {
+    if device_trusted $1; then
+        bluetoothctl untrust $1
+    else
+        bluetoothctl trust $1
+    fi
+}
+
+# Prints a short string with the current bluetooth status
+# Useful for status bars like polybar, etc.
+print_status() {
+    if power_on; then
+        printf ''
+
+        mapfile -t paired_devices < <(bluetoothctl paired-devices | grep Device | cut -d ' ' -f 2)
+        counter=0
+
+        for device in "${paired_devices[@]}"; do
+            if device_connected $device; then
+                device_alias=$(bluetoothctl info $device | grep "Alias" | cut -d ' ' -f 2-)
+
+                if [ $counter -gt 0 ]; then
+                    printf ", %s" "$device_alias"
+                else
+                    printf " %s" "$device_alias"
+                fi
+
+                ((counter++))
+            fi
+        done
+
+       if [ $counter -eq 0 ]; then
+           printf " On"
+       fi
+    else
+        echo " Off"
+    fi
+}
+
+# A submenu for a specific device that allows connecting, pairing, and trusting
+device_menu() {
+    device=$1
+
+    # Get device name and mac address
+    device_name=$(echo $device | cut -d ' ' -f 3-)
+    mac=$(echo $device | cut -d ' ' -f 2)
+
+    # Build options
+    if device_connected $mac; then
+        connected="Connected: yes"
+    else
+        connected="Connected: no"
+    fi
+    paired=$(device_paired $mac)
+    trusted=$(device_trusted $mac)
+    options="$connected\n$paired\n$trusted"
+
+    # Open rofi menu, read chosen option
+    chosen="$(echo -e "$options" | $rofi_command "$device_name")"
+
+    # Match chosen option to command
+    case $chosen in
+        "")
+            echo "No option chosen."
+            ;;
+        $connected)
+            toggle_connection $mac
+            ;;
+        $paired)
+            toggle_paired $mac
+            ;;
+        $trusted)
+            toggle_trust $mac
+            ;;
+    esac
+}
+
+# Opens a rofi menu with current bluetooth status and options to connect
+show_menu() {
+    # Get menu options
+    if power_on; then
+        power="Power: on"
+
+        # Human-readable names of devices, one per line
+        # If scan is off, will only list paired devices
+        devices=$(bluetoothctl devices | grep Device | cut -d ' ' -f 3-)
+
+        # Get controller flags
+        scan=$(scan_on)
+        pairable=$(pairable_on)
+        discoverable=$(discoverable_on)
+        divider="---------"
+
+        # Options passed to rofi
+        options="$devices\n$divider\n$power\n$scan\n$pairable\n$discoverable"
+    else
+        power="Power: off"
+        options="$power"
+    fi
+
+    # Open rofi menu, read chosen option
+    chosen="$(echo -e "$options" | $rofi_command "Bluetooth")"
+
+    # Match chosen option to command
+    case $chosen in
+        "" | $divider)
+            echo "No option chosen."
+            ;;
+        $power)
+            toggle_power
+            ;;
+        $scan)
+            toggle_scan
+            ;;
+        $discoverable)
+            toggle_discoverable
+            ;;
+        $pairable)
+            toggle_pairable
+            ;;
+        *)
+            device=$(bluetoothctl devices | grep "$chosen")
+            # Open a submenu if a device is selected
+            if [[ $device ]]; then device_menu "$device"; fi
+            ;;
+    esac
+}
+
+# Rofi command to pipe into, can add any options here
+rofi_command="rofi -dmenu -no-fixed-num-lines -yoffset -100 -i -p"
+
+case "$1" in
+    --status)
+        print_status
+        ;;
+    *)
+        show_menu
+        ;;
+esac