diff --git a/.schema/controller.json b/.schema/controller.json
index 2473c11..c6c7e0c 100644
--- a/.schema/controller.json
+++ b/.schema/controller.json
@@ -51,6 +51,11 @@
                     },
                     "uniqueItems": true
                 },
+                "scroll_wheel": {
+                    "type": "boolean",
+                    "title": "Scroll Wheel",
+                    "description": "Whether or not the controller has a scroll wheel"
+                },
                 "digital_sticks": {
                     "type": [
                         "array",
diff --git a/.utilities/generate_controller_tables.py b/.utilities/generate_controller_tables.py
index 7519b24..24d07cd 100644
--- a/.utilities/generate_controller_tables.py
+++ b/.utilities/generate_controller_tables.py
@@ -236,6 +236,7 @@ def process_functions(functions:dict, level=1):
 
 | Feature | Value |
 | :---: | :---: |
+| Scroll Wheel | {bool_to_emoji(functions.get('scroll_wheel', False))} |
 | Macro | {bool_to_emoji(functions['macro'])} |
 | Turbo | {bool_to_emoji(functions['turbo'])} |
 | Accelerometer | {bool_to_emoji(functions['accelerometer'])} |
diff --git a/accessibility/icon.png b/accessibility/icon.png
new file mode 100644
index 0000000..fde3809
Binary files /dev/null and b/accessibility/icon.png differ
diff --git a/accessibility/microsoft/adaptive/config.json b/accessibility/microsoft/adaptive/config.json
new file mode 100644
index 0000000..5931d3a
--- /dev/null
+++ b/accessibility/microsoft/adaptive/config.json
@@ -0,0 +1,51 @@
+{
+    "name": "Microsoft Xbox Adaptive Controller",
+    "functions": {
+        "analog_sticks": null,
+        "digital_sticks": null,
+        "action_buttons": [
+            {
+                "name": "A",
+                "analog": false
+            },
+            {
+                "name": "B",
+                "analog": false
+            }
+        ],
+        "menu_buttons": ["View", "Menu"],
+        "system_buttons": ["Guide"],
+        "other_buttons": ["Sync"],
+        "trackpads": null,
+        "touch_screens": null,
+        "directional_buttons": [
+            {
+                "set": ["Up", "Down", "Left", "Right"],
+                "socd_prevention": {
+                    "hardware": true,
+                    "software": null
+                }
+            }
+        ],
+        "gyroscope": false,
+        "accelerometer": false,
+        "ir_reciever": false,
+        "extension_ports": 1,
+        "headset_port": true,
+        "speaker": false,
+        "microphone": false,
+        "cable": {
+            "interface": "USB-C",
+            "removable": true
+        },
+        "bluetooth": true,
+        "2_4ghz": false,
+        "rumble": "standard",
+        "digital_to_analog_conversion": null,
+        "pc_xinput": true,
+        "pc_steaminput": true,
+        "native_consoles": ["xb1", "xbs"],
+        "macro": false,
+        "turbo": false
+    }
+}
\ No newline at end of file
diff --git a/accessibility/microsoft/adaptive/icon.png b/accessibility/microsoft/adaptive/icon.png
new file mode 100644
index 0000000..fde3809
Binary files /dev/null and b/accessibility/microsoft/adaptive/icon.png differ
diff --git a/accessibility/microsoft/adaptive/image.png b/accessibility/microsoft/adaptive/image.png
new file mode 100644
index 0000000..0c6b897
Binary files /dev/null and b/accessibility/microsoft/adaptive/image.png differ
diff --git a/accessibility/microsoft/config.json b/accessibility/microsoft/config.json
new file mode 100644
index 0000000..aa3e1a5
--- /dev/null
+++ b/accessibility/microsoft/config.json
@@ -0,0 +1,3 @@
+{
+    "name": "Microsoft"
+}
\ No newline at end of file
diff --git a/arcade_stick/generic/generic/icon.png b/arcade_stick/icon.png
similarity index 100%
rename from arcade_stick/generic/generic/icon.png
rename to arcade_stick/icon.png
diff --git a/keyboard/generic/config.json b/keyboard/generic/config.json
new file mode 100644
index 0000000..cdbc974
--- /dev/null
+++ b/keyboard/generic/config.json
@@ -0,0 +1,3 @@
+{
+    "name": "Generic brand"
+}
\ No newline at end of file
diff --git a/keyboard/generic/generic/config.json b/keyboard/generic/generic/config.json
new file mode 100644
index 0000000..9333f6d
--- /dev/null
+++ b/keyboard/generic/generic/config.json
@@ -0,0 +1,364 @@
+{
+    "name": "Generic keyboard",
+    "functions": {
+        "analog_sticks": null,
+        "digital_sticks": null,
+        "action_buttons": [
+            {
+                "name": "Escape",
+                "analog": false
+            },
+            {
+                "name": "F1",
+                "analog": false
+            },
+            {
+                "name": "F2",
+                "analog": false
+            },
+            {
+                "name": "F3",
+                "analog": false
+            },
+            {
+                "name": "F4",
+                "analog": false
+            },
+            {
+                "name": "F5",
+                "analog": false
+            },
+            {
+                "name": "F6",
+                "analog": false
+            },
+            {
+                "name": "F7",
+                "analog": false
+            },
+            {
+                "name": "F8",
+                "analog": false
+            },
+            {
+                "name": "F9",
+                "analog": false
+            },
+            {
+                "name": "F10",
+                "analog": false
+            },
+            {
+                "name": "F11",
+                "analog": false
+            },
+            {
+                "name": "F12",
+                "analog": false
+            },
+            {
+                "name": "1",
+                "analog": false
+            },
+            {
+                "name": "2",
+                "analog": false
+            },
+            {
+                "name": "3",
+                "analog": false
+            },
+            {
+                "name": "4",
+                "analog": false
+            },
+            {
+                "name": "5",
+                "analog": false
+            },
+            {
+                "name": "6",
+                "analog": false
+            },
+            {
+                "name": "7",
+                "analog": false
+            },
+            {
+                "name": "8",
+                "analog": false
+            },
+            {
+                "name": "9",
+                "analog": false
+            },
+            {
+                "name": "0",
+                "analog": false
+            },
+            {
+                "name": "`",
+                "analog": false
+            },
+            {
+                "name": "-",
+                "analog": false
+            },
+            {
+                "name": "=",
+                "analog": false
+            },
+            {
+                "name": "[",
+                "analog": false
+            },
+            {
+                "name": "]",
+                "analog": false
+            },
+            {
+                "name": "\\",
+                "analog": false
+            },
+            {
+                "name": ";",
+                "analog": false
+            },
+            {
+                "name": "'",
+                "analog": false
+            },
+            {
+                "name": ",",
+                "analog": false
+            },
+            {
+                "name": ".",
+                "analog": false
+            },
+            {
+                "name": "/",
+                "analog": false
+            },
+            {
+                "name": "Tab",
+                "analog": false
+            },
+            {
+                "name": "Caps Lock",
+                "analog": false
+            },
+            {
+                "name": "L-Shift",
+                "analog": false
+            },
+            {
+                "name": "L-Ctrl",
+                "analog": false
+            },
+            {
+                "name": "L-Win",
+                "analog": false
+            },
+            {
+                "name": "L-Alt",
+                "analog": false
+            },
+            {
+                "name": "R-Shift",
+                "analog": false
+            },
+            {
+                "name": "R-Ctrl",
+                "analog": false
+            },
+            {
+                "name": "R-Win",
+                "analog": false
+            },
+            {
+                "name": "R-Alt",
+                "analog": false
+            },
+            {
+                "name": "Menu",
+                "analog": false
+            },
+            {
+                "name": "Enter",
+                "analog": false
+            },
+            {
+                "name": "Space",
+                "analog": false
+            },
+            {
+                "name": "Backspace",
+                "analog": false
+            },
+            {
+                "name": "Delete",
+                "analog": false
+            },
+            {
+                "name": "Insert",
+                "analog": false
+            },
+            {
+                "name": "Home",
+                "analog": false
+            },
+            {
+                "name": "Page Up",
+                "analog": false
+            },
+            {
+                "name": "Page Down",
+                "analog": false
+            },
+            {
+                "name": "End",
+                "analog": false
+            },
+            {
+                "name": "A",
+                "analog": false
+            },
+            {
+                "name": "Z",
+                "analog": false
+            },
+            {
+                "name": "E",
+                "analog": false
+            },
+            {
+                "name": "R",
+                "analog": false
+            },
+            {
+                "name": "T",
+                "analog": false
+            },
+            {
+                "name": "Y",
+                "analog": false
+            },
+            {
+                "name": "U",
+                "analog": false
+            },
+            {
+                "name": "I",
+                "analog": false
+            },
+            {
+                "name": "O",
+                "analog": false
+            },
+            {
+                "name": "P",
+                "analog": false
+            },
+            {
+                "name": "Q",
+                "analog": false
+            },
+            {
+                "name": "S",
+                "analog": false
+            },
+            {
+                "name": "D",
+                "analog": false
+            },
+            {
+                "name": "F",
+                "analog": false
+            },
+            {
+                "name": "G",
+                "analog": false
+            },
+            {
+                "name": "H",
+                "analog": false
+            },
+            {
+                "name": "J",
+                "analog": false
+            },
+            {
+                "name": "K",
+                "analog": false
+            },
+            {
+                "name": "L",
+                "analog": false
+            },
+            {
+                "name": "M",
+                "analog": false
+            },
+            {
+                "name": "W",
+                "analog": false
+            },
+            {
+                "name": "X",
+                "analog": false
+            },
+            {
+                "name": "C",
+                "analog": false
+            },
+            {
+                "name": "V",
+                "analog": false
+            },
+            {
+                "name": "B",
+                "analog": false
+            },
+            {
+                "name": "N",
+                "analog": false
+            }
+        ],
+        "menu_buttons": null,
+        "other_buttons": null,
+        "trackpads": null,
+        "touch_screens": null,
+        "directional_buttons": [
+            {
+                "set": [
+                    "Up",
+                    "Down",
+                    "Left",
+                    "Right"
+                ],
+                "socd_prevention": {
+                    "hardware": false,
+                    "software": null
+                }
+            }
+        ],
+        "gyroscope": false,
+        "accelerometer": false,
+        "ir_reciever": false,
+        "extension_ports": 0,
+        "headset_port": false,
+        "speaker": false,
+        "microphone": false,
+        "cable": null,
+        "bluetooth": false,
+        "2_4ghz": false,
+        "rumble": null,
+        "digital_to_analog_conversion": null,
+        "pc_xinput": false,
+        "pc_steaminput": false,
+        "native_consoles": null,
+        "macro": false,
+        "turbo": false
+    }
+}
\ No newline at end of file
diff --git a/keyboard/generic/generic/icon.png b/keyboard/generic/generic/icon.png
new file mode 100644
index 0000000..a0c0d9e
Binary files /dev/null and b/keyboard/generic/generic/icon.png differ
diff --git a/keyboard/generic/generic/image.png b/keyboard/generic/generic/image.png
new file mode 100644
index 0000000..e01ffbd
Binary files /dev/null and b/keyboard/generic/generic/image.png differ
diff --git a/keyboard/icon.png b/keyboard/icon.png
new file mode 100644
index 0000000..a0c0d9e
Binary files /dev/null and b/keyboard/icon.png differ
diff --git a/leverless/generic/generic/icon.png b/leverless/icon.png
similarity index 100%
rename from leverless/generic/generic/icon.png
rename to leverless/icon.png
diff --git a/mouse/generic/config.json b/mouse/generic/config.json
new file mode 100644
index 0000000..cdbc974
--- /dev/null
+++ b/mouse/generic/config.json
@@ -0,0 +1,3 @@
+{
+    "name": "Generic brand"
+}
\ No newline at end of file
diff --git a/mouse/generic/generic/config.json b/mouse/generic/generic/config.json
new file mode 100644
index 0000000..80a80df
--- /dev/null
+++ b/mouse/generic/generic/config.json
@@ -0,0 +1,43 @@
+{
+    "name": "Generic mouse",
+    "functions": {
+        "analog_sticks": null,
+        "digital_sticks": null,
+        "action_buttons": [
+            {
+                "name": "Left Click",
+                "analog": false
+            },
+            {
+                "name": "Right Click",
+                "analog": false
+            },
+            {
+                "name": "Scroll Wheel Click",
+                "analog": false
+            }
+        ],
+        "menu_buttons": null,
+        "other_buttons": null,
+        "trackpads": null,
+        "touch_screens": null,
+        "directional_buttons": null,
+        "gyroscope": false,
+        "accelerometer": false,
+        "ir_reciever": false,
+        "extension_ports": 0,
+        "headset_port": false,
+        "speaker": false,
+        "microphone": false,
+        "cable": null,
+        "bluetooth": false,
+        "2_4ghz": false,
+        "rumble": null,
+        "digital_to_analog_conversion": null,
+        "pc_xinput": false,
+        "pc_steaminput": false,
+        "native_consoles": null,
+        "macro": false,
+        "turbo": false
+    }
+}
\ No newline at end of file
diff --git a/mouse/generic/generic/icon.png b/mouse/generic/generic/icon.png
new file mode 100644
index 0000000..6c60d7a
Binary files /dev/null and b/mouse/generic/generic/icon.png differ
diff --git a/mouse/generic/generic/image.png b/mouse/generic/generic/image.png
new file mode 100644
index 0000000..ce1f42d
Binary files /dev/null and b/mouse/generic/generic/image.png differ
diff --git a/mouse/icon.png b/mouse/icon.png
new file mode 100644
index 0000000..6c60d7a
Binary files /dev/null and b/mouse/icon.png differ
diff --git a/pad/icon.png b/pad/icon.png
new file mode 100644
index 0000000..f3dd3f6
Binary files /dev/null and b/pad/icon.png differ
diff --git a/pad/microsoft/360/icon.png b/pad/microsoft/360/icon.png
new file mode 100644
index 0000000..83d4fcb
Binary files /dev/null and b/pad/microsoft/360/icon.png differ
diff --git a/pad/microsoft/360_wireless/icon.png b/pad/microsoft/360_wireless/icon.png
new file mode 100644
index 0000000..83d4fcb
Binary files /dev/null and b/pad/microsoft/360_wireless/icon.png differ
diff --git a/pad/microsoft/one/icon.png b/pad/microsoft/one/icon.png
index f3dd3f6..e6f8194 100644
Binary files a/pad/microsoft/one/icon.png and b/pad/microsoft/one/icon.png differ
diff --git a/pad/microsoft/one_model2/icon.png b/pad/microsoft/one_model2/icon.png
index f3dd3f6..e6f8194 100644
Binary files a/pad/microsoft/one_model2/icon.png and b/pad/microsoft/one_model2/icon.png differ
diff --git a/pad/microsoft/one_s/icon.png b/pad/microsoft/one_s/icon.png
index f3dd3f6..e6f8194 100644
Binary files a/pad/microsoft/one_s/icon.png and b/pad/microsoft/one_s/icon.png differ
diff --git a/pad/microsoft/series/icon.png b/pad/microsoft/series/icon.png
new file mode 100644
index 0000000..6d7a315
Binary files /dev/null and b/pad/microsoft/series/icon.png differ
diff --git a/pad/nintendo/gcn/icon.png b/pad/nintendo/gcn/icon.png
new file mode 100644
index 0000000..65d58ab
Binary files /dev/null and b/pad/nintendo/gcn/icon.png differ
diff --git a/pad/nintendo/gcnnso/icon.png b/pad/nintendo/gcnnso/icon.png
new file mode 100644
index 0000000..65d58ab
Binary files /dev/null and b/pad/nintendo/gcnnso/icon.png differ
diff --git a/pad/nintendo/joycon/icon.png b/pad/nintendo/joycon/icon.png
new file mode 100644
index 0000000..5e4a6d7
Binary files /dev/null and b/pad/nintendo/joycon/icon.png differ
diff --git a/pad/nintendo/joycon2/icon.png b/pad/nintendo/joycon2/icon.png
new file mode 100644
index 0000000..5e4a6d7
Binary files /dev/null and b/pad/nintendo/joycon2/icon.png differ
diff --git a/pad/nintendo/procon/icon.png b/pad/nintendo/procon/icon.png
new file mode 100644
index 0000000..264cf80
Binary files /dev/null and b/pad/nintendo/procon/icon.png differ
diff --git a/pad/nintendo/procon2/icon.png b/pad/nintendo/procon2/icon.png
new file mode 100644
index 0000000..cdd6075
Binary files /dev/null and b/pad/nintendo/procon2/icon.png differ
diff --git a/pad/nintendo/wiimote/icon.png b/pad/nintendo/wiimote/icon.png
new file mode 100644
index 0000000..7535205
Binary files /dev/null and b/pad/nintendo/wiimote/icon.png differ
diff --git a/pad/nintendo/wiiugamepad/icon.png b/pad/nintendo/wiiugamepad/icon.png
new file mode 100644
index 0000000..d77ad54
Binary files /dev/null and b/pad/nintendo/wiiugamepad/icon.png differ
diff --git a/pad/nintendo/wiiupro/icon.png b/pad/nintendo/wiiupro/icon.png
new file mode 100644
index 0000000..04b1c8a
Binary files /dev/null and b/pad/nintendo/wiiupro/icon.png differ
diff --git a/pad/sony/dual4/icon.png b/pad/sony/dual4/icon.png
new file mode 100644
index 0000000..c71866f
Binary files /dev/null and b/pad/sony/dual4/icon.png differ
diff --git a/pad/sony/dualsense/icon.png b/pad/sony/dualsense/icon.png
index 81ea79d..f071b6f 100644
Binary files a/pad/sony/dualsense/icon.png and b/pad/sony/dualsense/icon.png differ
diff --git a/pad/valve/steam_controller/icon.png b/pad/valve/steam_controller/icon.png
new file mode 100644
index 0000000..01e8d05
Binary files /dev/null and b/pad/valve/steam_controller/icon.png differ