diff --git a/public/css/select2-overrides.css b/public/css/select2-overrides.css
index 9598acb51..e55edce50 100644
--- a/public/css/select2-overrides.css
+++ b/public/css/select2-overrides.css
@@ -173,8 +173,9 @@
 }
 
 .select2-selection__choice__display {
-    /* Fix weird alignment on the left side */
-    margin-left: 1px;
+    /* Fix weird alignment of the inside block */
+    margin-left: 3px;
+    margin-right: 1px;
 }
 
 /* Styling for choice remove icon */
diff --git a/public/scripts/keyboard.js b/public/scripts/keyboard.js
index e62733ea0..374a2dc69 100644
--- a/public/scripts/keyboard.js
+++ b/public/scripts/keyboard.js
@@ -1,24 +1,25 @@
 /* All selectors that should act as interactables / keyboard buttons by default */
 const interactableSelectors = [
-    '.custom_interactable',
-    '.interactable',
-    '.menu_button',
-    '.right_menu_button',
-    '.drawer-icon',
-    '.inline-drawer-icon',
-    '.paginationjs-pages li a',
-    '.group_select',
-    '.character_select',
-    '.bogus_folder_select',
-    '.avatar-container',
-    '.tag .tag_remove',
-    '.bg_example',
-    '.bg_example .bg_button',
-    '#options a',
-    '#extensionsMenu div:has(.extensionsMenuExtensionButton)',
-    '.mes_buttons .mes_button',
-    '.extraMesButtons>div:not(.mes_button)',
-    '.stscript_btn'
+    '.interactable', // Main interactable class for ALL interactable controls (can also be manually added in code, so that's why its listed here)
+    '.custom_interactable', // Manually made interactable controls via code (see 'makeKeyboardInteractable()')
+    '.menu_button', // General menu button in ST
+    '.right_menu_button', // Button-likes in many menus
+    '.drawer-icon', // Main "menu bar" icons
+    '.inline-drawer-icon', // Buttons/icons inside the drawer menus
+    '.paginationjs-pages li a', // Pagination buttons
+    '.group_select, .character_select, .bogus_folder_select', // Cards to select char, group or folder in character list and other places
+    '.avatar-container', // Persona list blocks
+    '.tag .tag_remove', // Remove button in removable tags
+    '.bg_example', // Background elements in the background menu
+    '.bg_example .bg_button', // The inline buttons on the backgrounds
+    '#options a', // Option entries in the popup options menu
+    '#extensionsMenu div:has(.extensionsMenuExtensionButton)', // Option entries in the extension menu popup that are coming from extensions
+    '.mes_buttons .mes_button', // Small inline buttons on the chat messages
+    '.extraMesButtons>div:not(.mes_button)', // The extra/extension buttons inline on the chat messages
+    '.swipe_left, .swipe_right', // Swipe buttons on the last message
+    '.stscript_btn', // STscript buttons in the chat bar
+    '.select2_choice_clickable+span.select2-container .select2-selection__choice__display', // select2 control elements if they are meant to be clickable
+    '.avatar_load_preview' // Char display avatar selection
 ];
 
 export const INTERACTABLE_CONTROL_CLASS = 'interactable';
diff --git a/public/scripts/tags.js b/public/scripts/tags.js
index db23a05ba..2146af18b 100644
--- a/public/scripts/tags.js
+++ b/public/scripts/tags.js
@@ -23,7 +23,7 @@ import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '
 import { isMobile } from './RossAscends-mods.js';
 import { POPUP_RESULT, POPUP_TYPE, callGenericPopup } from './popup.js';
 import { debounce_timeout } from './constants.js';
-import { INTERACTABLE_CONTROL_CLASS, registerInteractableType } from './keyboard.js';
+import { INTERACTABLE_CONTROL_CLASS } from './keyboard.js';
 
 export {
     TAG_FOLDER_TYPES,