diff --git a/playbooks/Linux.yaml b/playbooks/Linux.yaml
index f5e4b8c..00c6d58 100644
--- a/playbooks/Linux.yaml
+++ b/playbooks/Linux.yaml
@@ -10,7 +10,7 @@
     - role: firefox
     - role: kitty
     - role: cider
-    - role: gnome-tweaks
+    - role: gnome-shell
       when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
     - role: xremap
       when: >
diff --git a/roles/gnome-shell/tasks/main.yaml b/roles/gnome-shell/tasks/main.yaml
new file mode 100644
index 0000000..134e259
--- /dev/null
+++ b/roles/gnome-shell/tasks/main.yaml
@@ -0,0 +1,30 @@
+---
+- assert:
+    that: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
+
+- name: install gnome-tweaks
+  become: true
+  package:
+    name: gnome-tweaks
+    state: latest
+
+# NOTE: Use this command to see default keybindings
+# gsettings list-recursively | grep -i -E 'media-keys|keybindings'
+# NOTE: Use this command to inspect the current state of the custom keybindings
+# dconf dump / | sed -n '/\[org.gnome.settings-daemon.plugins.media-keys/,/^$/p'
+
+# TODO: List of custom-keybindings
+# [org/gnome/settings-daemon/plugins/media-keys]
+# custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/']
+
+# TODO: 1Password Quick Access
+# [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
+# binding='<Shift><Alt>space'
+# command='1password --quick-access'
+# name='1Password Quick Access'
+
+# TODO: Guake toggle - this requires removing a default binding
+# [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1]
+# binding='<Super>space'
+# command='guake --toggle'
+# name='Guake'
diff --git a/roles/gnome-tweaks/tasks/main.yaml b/roles/gnome-tweaks/tasks/main.yaml
deleted file mode 100644
index f98f8e6..0000000
--- a/roles/gnome-tweaks/tasks/main.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- assert:
-    that: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
-
-- name: install gnome-tweaks
-  become: true
-  package:
-    name: gnome-tweaks
-    state: latest