diff --git a/local.yml b/local.yml
index 55701b9..e49e7e2 100644
--- a/local.yml
+++ b/local.yml
@@ -91,6 +91,8 @@
       # Gather again in case missing programs have now been installed.
       - include_tasks: facts/general/gather.yml
 
+      - include_tasks: tasks/general/settings/keyboard.yml
+
       - include_tasks: tasks/general/acct_mgmt/groups.yml
       - include_tasks: tasks/general/acct_mgmt/users.yml
       - include_tasks: tasks/general/acct_mgmt/sudo.yml
@@ -120,7 +122,8 @@
 
       - include_tasks: facts/workstation/package.yml
 
-      # Set Up Desktop Environments #
+      ## Desktop Environments ##
+
       - include_tasks: tasks/workstation/freebsd/software/gpu.yml
         when: ansible_system == "FreeBSD" and bsd_gpu == true
 
@@ -140,7 +143,8 @@
 
       - include_tasks: tasks/workstation/linux/software/lxqt.yml
 
-      # Software Tasks #
+      ## Software Tasks ##
+
       - include_tasks: tasks/workstation/linux/software/packages.yml
         when: ansible_system == "Linux"
 
@@ -162,7 +166,8 @@
       - include_tasks: tasks/workstation/mac-os/software/brew.yml
         when: ansible_system == "Darwin"
 
-      # Configuration Tasks #
+      ## Configuration Tasks ##
+
       - include_tasks: tasks/workstation/shared/settings/gnome.yml
         when: not mobile
 
@@ -183,7 +188,8 @@
 
       - include_tasks: tasks/workstation/shared/settings/templates.yml
 
-      # Final Tasks (SLOW) #
+      ## Final Tasks (SLOW) ##
+
       - include_tasks: tasks/workstation/linux/software/flutter.yml
         when: ansible_system == "Linux"
 
diff --git a/tasks/general/settings/keyboard.yml b/tasks/general/settings/keyboard.yml
index 1996488..00224d7 100644
--- a/tasks/general/settings/keyboard.yml
+++ b/tasks/general/settings/keyboard.yml
@@ -2,17 +2,15 @@
 # 20260716 - Hyperling
 # Ensure the correct International AltGr keyboard setting is always chosen.
 
-# Is this really needed, or is it an `st` issue with the NovaCustom keyboard?
-
-#- name: General | Settings | Keyboard | Default Config
-#  lineinfile:
-#    path: "/etc/default/keyboard"
-#    regexp: '{{ item.key }}'
-#    line: '{{ item.value }}'
-#    state: present
-#    create: yes
-#    backup: yes
-#  loop:
-#    - { "key": '^[\#]?XKBMODEL',   "value": 'XKBMODEL="pc105"'}
-#    - { "key": '^[\#]?XKBLAYOUT',  "value": 'XKBLAYOUT="us"'}
-#    - { "key": '^[\#]?XKBVARIANT', "value": 'XKBVARIANT="altgr-intl"'}
+- name: General | Settings | Keyboard | Default Config
+  lineinfile:
+    path: "/etc/default/keyboard"
+    regexp: '{{ item.key }}'
+    line: '{{ item.value }}'
+    state: present
+    create: yes
+    backup: yes
+  loop:
+    #- { "key": '^[\#]?XKBMODEL',   "value": 'XKBMODEL="pc105"'}
+    - { "key": '^[\#]?XKBLAYOUT',  "value": 'XKBLAYOUT="us"'}
+    - { "key": '^[\#]?XKBVARIANT', "value": 'XKBVARIANT="altgr-intl"'}