diff --git a/ansible_collections/scruffaluff/bootware/roles/caffeine/tasks/main.yaml b/ansible_collections/scruffaluff/bootware/roles/caffeine/tasks/main.yaml
index 910bd8c8..a5169a15 100644
--- a/ansible_collections/scruffaluff/bootware/roles/caffeine/tasks/main.yaml
+++ b/ansible_collections/scruffaluff/bootware/roles/caffeine/tasks/main.yaml
@@ -56,10 +56,10 @@
 
 - name: Configure Caffeine shell extension for GNOME desktops
   ansible.builtin.shell:
-    cmd: >-
-      gsettings --schemadir
-      "${HOME}/.local/share/gnome-shell/extensions/caffeine@patapon.info/schemas"
-      set org.gnome.shell.extensions.caffeine show-notifications false
+    cmd: |
+      gsettings --schemadir "${HOME}/.local/share/gnome-shell/extensions/caffeine@patapon.info/schemas" set org.gnome.shell.extensions.caffeine enable-fullscreen false
+      gsettings --schemadir "${HOME}/.local/share/gnome-shell/extensions/caffeine@patapon.info/schemas" set org.gnome.shell.extensions.caffeine screen-blank 'always'
+      gsettings --schemadir "${HOME}/.local/share/gnome-shell/extensions/caffeine@patapon.info/schemas" set org.gnome.shell.extensions.caffeine show-notifications false
     executable: "{{ bash_executable }}"
   become: true
   become_user: "{{ user_id }}"
diff --git a/ansible_collections/scruffaluff/bootware/roles/flatpak/defaults/main.yaml b/ansible_collections/scruffaluff/bootware/roles/flatpak/defaults/main.yaml
index 1463c9b6..a334026e 100644
--- a/ansible_collections/scruffaluff/bootware/roles/flatpak/defaults/main.yaml
+++ b/ansible_collections/scruffaluff/bootware/roles/flatpak/defaults/main.yaml
@@ -1,3 +1,7 @@
 ---
-flatpak_packages:
+flatpak_packages_:
   - com.github.tchx84.Flatseal
+flatpak_packages_gnome:
+  - com.mattjakeman.ExtensionManager
+flatpak_packages: >-
+  {{ flatpak_packages_ + flatpak_packages_gnome if gnome_desktop else [] }}
diff --git a/ansible_collections/scruffaluff/bootware/roles/vscode/templates/keybindings.json.j2 b/ansible_collections/scruffaluff/bootware/roles/vscode/templates/keybindings.json.j2
index 9acb85c2..87062802 100644
--- a/ansible_collections/scruffaluff/bootware/roles/vscode/templates/keybindings.json.j2
+++ b/ansible_collections/scruffaluff/bootware/roles/vscode/templates/keybindings.json.j2
@@ -73,17 +73,26 @@
   {
     "command": "actions.find",
     "key": "ctrl+f",
-    "when": "editorFocus || editorIsOpen"
+    "when": "editorFocus"
+  },
+  { 
+    "command": "bookmarks.list", 
+    "key": "{{ vscode_ctrl_key }}+k l",
+    "when": "editorTextFocus"
+  },
+  {
+    "command": "bookmarks.toggle",
+    "key": "{{ vscode_ctrl_key }}+k b",
+    "when": "editorTextFocus"
   },
-  { "command": "bookmarks.list", "key": "ctrl+shift+l" },
   {
     "command": "bookmarks.toggleLabeled",
-    "key": "ctrl+shift+k",
+    "key": "{{ vscode_ctrl_key }}+k m",
     "when": "editorTextFocus"
   },
-  { "command": "cursorLineEnd", "key": "ctrl+e", "when": "editorFocus" },
-  { "command": "cursorLineStart", "key": "ctrl+a", "when": "editorFocus" },
-  { "command": "deleteAllLeft", "key": "ctrl+u", "when": "editorFocus" },
+  { "command": "cursorLineEnd", "key": "ctrl+e", "when": "editorTextFocus" },
+  { "command": "cursorLineStart", "key": "ctrl+a", "when": "editorTextFocus" },
+  { "command": "deleteAllLeft", "key": "ctrl+u", "when": "editorTextFocus" },
   {
     "command": "editor.action.insertCursorAbove",
     "key": "ctrl+shift+up",
@@ -94,16 +103,31 @@
     "key": "ctrl+shift+down",
     "when": "editorTextFocus"
   },
+  {
+    "command": "editor.action.insertLineAfter",
+    "key": "shift+enter",
+    "when": "editorTextFocus"
+  },
+  {
+    "command": "editor.action.insertLineBefore",
+    "key": "ctrl+shift+enter",
+    "when": "editorTextFocus"
+  },
   {
     "command": "editor.action.revealDefinition",
     "key": "{{ vscode_ctrl_key }}+k d",
-    "when": "editorTextFocus"
+    "when": "editorTextFocus && editorHasDefinitionProvider"
   },
   {
     "command": "editor.action.startFindReplaceAction",
     "key": "ctrl+h",
     "when": "editorFocus || editorIsOpen"
   },
+  {
+    "command": "expandLineSelection",
+    "key": "ctrl+l",
+    "when": "textInputFocus"
+  },
   { 
     "command": "workbench.action.closeActiveEditor",
     "key": "ctrl+w",
diff --git a/ansible_collections/scruffaluff/bootware/roles/vscode/templates/settings.json.j2 b/ansible_collections/scruffaluff/bootware/roles/vscode/templates/settings.json.j2
index 9f768d56..cf746e82 100644
--- a/ansible_collections/scruffaluff/bootware/roles/vscode/templates/settings.json.j2
+++ b/ansible_collections/scruffaluff/bootware/roles/vscode/templates/settings.json.j2
@@ -154,6 +154,7 @@
   "git.enableStatusBarSync": false,
   "git.openRepositoryInParentFolders": "never",
   "git.terminalAuthentication": false,
+  "html.autoClosingTags": false,
   "javascript.suggest.autoImports": false,
   "javascript.updateImportsOnFileMove.enabled": "never",
   "latex-workshop.bind.enter.key": false,