diff --git a/.config/sway/cheatsheet b/.config/sway/cheatsheet
deleted file mode 100644
index 6693a70..0000000
--- a/.config/sway/cheatsheet
+++ /dev/null
@@ -1,179 +0,0 @@
-# EndeavourOS Sway Edition Cheatsheet
-
-- Hello and welcome to EndeavourOS Sway Edition! We'll admit this is not
- vanilla Sway and it isn't desinged to be. It's loosely themed around the
- ArcDark colorscheme chosen for stability and ease of implementation. The
- default bar is Waybar, not Swaybar -- once again chosen for ease of use,
- stability and the options it offers.
-
-- Sway is documented through man pages -- unlike i3. To get a overview of what
- to expect, read 'man 5 sway'. The pages are spilt into topics. Some of the
- important ones are listed at the bottom of the document. Waybar is also
- documented through man pages, see 'man 5 waybar'.
-
-- Our file structure is split for easier use. The names of the files (e.g.
- 'output') refer to the part they play.
-
-- If you experience issues with your cursor, edit '~/.profile' and comment out
- 'export WLR_NO_HARDWARE_CURSORS=1'
-
-- We hope you enjoy your time with it. Again, welcome to EndeavorOS Sway
- Edition and make sure you join the Forum or our Telegram. We'd love to hear
- from you!
-
-MOD key is set to the WINKEY/LINKEY
-
-# Launch the terminal
-MOD+Return
-
-# kill focused window
-MOD+q
-
-# Application menu - Fuzzel:
-MOD+d
-
-# Activities:
-MOD+p
-
-# Power-Menu:
-MOD+Shift+e
-
-# Lock the system
-MOD+f1
-
-# reload the configuration file
-MOD+Shift+c
-
-# change window focus,like vim
-MOD+h focus left
-MOD+j focus down
-MOD+k focus up
-MOD+l focus right
-
-# alternatively, you can use the cursor keys:
-MOD+Left focus left
-MOD+Down focus down
-MOD+Up focus up
-MOD+Right focus right
-
-# move a focused window
-MOD+Shift+h move left
-MOD+Shift+j move down
-MOD+Shift+k move up
-MOD+Shift+l move right
-
-# alternatively, you can use the cursor keys:
-MOD+Shift+Left move left
-MOD+Shift+Down move down
-MOD+Shift+Up move up
-MOD+Shift+Right move right
-
-# split in horizontal orientation (changes take place on next opened window):
-MOD+b
-
-# split in vertical orientation (changes take place on next opened window):
-MOD+v
-
-# enter fullscreen mode for the focused container:
-MOD+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split):
-MOD+s layout stacking
-MOD+w layout tabbed
-MOD+e layout toggle split
-
-# toggle tiling / floating:
-MOD+Shift+space floating toggle
-
-# change focus between tiling / floating windows:
-MOD+space focus mode_toggle
-
-# focus the parent container:
-MOD+a focus parent
-
-# resize floating window:
-MOD+right mouse button
-
-# move floating window:
-MOD+left mouse button
-
-# scratchpad:
-MOD+Shift+Minus move scratchpad
-MOD+minus scratchpad cycle
-
-# resize mode:
-MOD+r
-
-# resize,like vim:
-h focus left
-j focus down
-k focus up
-l focus right
-
-# alternatively, you can use the cursor keys:
-Left focus left
-Down focus down
-Up focus up
-Right focus right
-
-# Return to default mode:
-Return or Escape
-
-# Workspaces:
-#
- # Switch to workspace
- MOD+1 workspace number 1
- MOD+2 workspace number 2
- MOD+3 workspace number 3
- MOD+4 workspace number 4
- MOD+5 workspace number 5
- MOD+6 workspace number 6
- MOD+7 workspace number 7
- MOD+8 workspace number 8
- MOD+9 workspace number 9
- MOD+0 workspace number 10
- # Move focused container to workspace:
- MOD+Shift+1 move container to workspace number 1
- MOD+Shift+2 move container to workspace number 2
- MOD+Shift+3 move container to workspace number 3
- MOD+Shift+4 move container to workspace number 4
- MOD+Shift+5 move container to workspace number 5
- MOD+Shift+6 move container to workspace number 6
- MOD+Shift+7 move container to workspace number 7
- MOD+Shift+8 move container to workspace number 8
- MOD+Shift+9 move container to workspace number 9
- MOD+Shift+0 move container to workspace number 10
-
-
-# Multimedia Keys (be aware that these may not work for every keyboard):
-They are enabled - you may need to hold down the function key while doing so.
-
- # Screenshots:
- PrintSrc for full screenshot
- Shift+PrintSrc for screenshot options
-
-# App Shortcuts:
-MOD+n thunar
-MOD+o firefox
-
-
-# Other Things:
-
- # Input - ~/.config/sway/config.d/input
- # You can get the names of your inputs by running: swaymsg -t get_inputs
- # Put your touchpad's IDENFICATOR to replace "Touchpad-ID" (keep the quotation marks)
- # Read `man 5 sway-input` for more information about this section.
-
- # Output - ~/.config/sway/config.d/output
- # You can get the names of your outputs by running: swaymsg -t get_outputs
- # Read `man 5 sway-output` for more information about this section.
-
- # Wallpaper - ~/.config/sway/config.d/theme
- # exec swaybg -i /path/to/wallpaper
-
- # Waybar - ~/.config/waybar/config : ~/.config/waybar/style.css
- # It is an external bar we have chosen because of the option's it allows.
- # If you wish to use the default swaybar - ~/.config/sway/config.d/theme and change waybar to sway-bar
- # Read `man 5 sway-bar` for more information about this section
-
- # Autostart - ~/.config/sway/config.d/autostart_applications
diff --git a/.config/sway/config.d/default b/.config/sway/config.d/default
index e1f0e25..542055e 100644
--- a/.config/sway/config.d/default
+++ b/.config/sway/config.d/default
@@ -228,7 +228,3 @@ set $lock swaylock -C ~/.config/swaylock/config
bindsym Ctrl+Print exec ~/.config/sway/scripts/screenshot_window.sh
# Screenshot the current display and pipe to swappy
bindsym Shift+Print exec ~/.config/sway/scripts/screenshot_display.sh
-#
-# Keybindings List
-#
- bindsym $mod+t exec xed ~/.config/sway/cheatsheet
diff --git a/.config/waybar/scripts/keyhint.sh b/.config/waybar/scripts/keyhint.sh
index d167db7..a208664 100755
--- a/.config/waybar/scripts/keyhint.sh
+++ b/.config/waybar/scripts/keyhint.sh
@@ -1,2 +1,103 @@
-#!/bin/sh
-yad --title="EndeavourOS Sway-WM keybindings:" --no-buttons --geometry=400x345-15-400 --list --column=key: --column=description: --column=command: "ESC" "close this app" "" "=" "modkey" "(set mod Mod4)" "+enter" "Terminal" "(Foot)" "+d" "Application Menu" "(Fuzzel)" "+p" "Activities" "(Fuzzel)" "+o" "" "Open Broswer" "+n" "" "Open Files" "+q" "close focused app" "(kill)" "[Shift]+Print-key" "screenshot" "(grim)" "+Shift+e" "power-menu" "(Fuzzel)" "+t" "open keybinding helper" "full list"
+#!/bin/bash
+
+# Set the font
+font="JetBrainsMono"
+
+cheat=(
+ --title="EndeavourOS Sway keybindings:"
+ --no-buttons
+ --geometry=1200x680
+ --list
+ --no-click
+ --no-selection
+ --column="Function"
+ --column="Binding"
+ --column=""
+ --column="Function"
+ --column="Binding"
+ --column-align=ccccc
+ --header-align=ccccc
+ "GENERAL"
+ ""
+ ""
+ "LAUNCHERS AND MENUS"
+ ""
+ "Mod key (Super/Meta//)"
+ ""
+ ""
+ "Open the launcher"
+ " + "
+ "Change window focus"
+ " + "
+ ""
+ "Open the application menu"
+ " + Shift + "
+ "Vim keys are supported"
+ " + "
+ ""
+ "Open the power menu"
+ " + Shift + "
+ "Close a window"
+ " + "
+ ""
+ "Activities overview"
+ " + "
+ "Move a window"
+ " + Shift + "
+ ""
+ "SCREENSHOTS"
+ ""
+ "Move window with mouse"
+ " + "
+ ""
+ "Snip a screenshot"
+ "Print"
+ "Resize a window"
+ " + , , Esc"
+ ""
+ "Screenshot a window"
+ "Ctrl + Print"
+ "Resize with right click"
+ " + "
+ ""
+ "Screenshot the display"
+ "Shift + Print"
+ "Change workspace"
+ " + ..."
+ ""
+ "CLIPBOARD MANAGER"
+ ""
+ "Send window to workspace"
+ " + Shift + ..."
+ ""
+ "Launch cliphist"
+ "Ctrl + + "
+ "Toggle floating/tiling"
+ " + Shift + Space"
+ ""
+ "Delete an entry from cliphist"
+ "Ctrl + + "
+ "Toggle fullscreen"
+ " + "
+ ""
+ "APPLICATION SHORTCUTS"
+ ""
+ "SCRATCHPAD"
+ ""
+ ""
+ "Launch the terminal"
+ " + Enter"
+ "Move window to scratchpad"
+ " + Shift + "
+ ""
+ "Launch the file explorer"
+ " + "
+ "Show next scratchpad window"
+ " + "
+ ""
+ "Launch the web browser"
+ " + "
+ ""
+)
+
+yad "${cheat[@]}"