diff --git a/config_schema.json b/config_schema.json
index bd7aa1df..bda38ba6 100644
--- a/config_schema.json
+++ b/config_schema.json
@@ -164,16 +164,6 @@
       "default_value": true,
       "field_type": "boolean"
     },
-    {
-      "name": "ateam.attack_commands",
-      "default_value": [
-        "zabij"
-      ],
-      "field_type": "list",
-      "macros_on_modify": [
-        "_ateam"
-      ]
-    },
     {
       "name": "ateam.all_numbering",
       "default_value": true,
@@ -1382,19 +1372,6 @@
         "_ux"
       ]
     },
-    {
-      "name": "scripts.ui.cfg.states_window_nav_elements",
-      "default_value": [
-        "bron",
-        "zaslona",
-        "rozkaz",
-        "ukryty"
-      ],
-      "field_type": "list",
-      "macros_on_modify": [
-        "_ux"
-      ]
-    },
     {
       "name": "scripts.ui.cfg.states_window_nav_printable_key_map",
       "default_value": {
@@ -1799,6 +1776,7 @@
       "name": "scripts.keybind.configuration.fight_support.key",
       "default_value": "W",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -1834,6 +1812,7 @@
       "name": "scripts.keybind.configuration.attack_target.key",
       "default_value": "1",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -1870,6 +1849,7 @@
       "name": "scripts.keybind.configuration.critical_hp.key",
       "default_value": "Equal",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -1903,6 +1883,7 @@
       "name": "scripts.keybind.configuration.functional_key.key",
       "default_value": "BracketRight",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -1936,6 +1917,7 @@
       "name": "scripts.keybind.configuration.attack_bind_objs.key",
       "default_value": "",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -1973,6 +1955,7 @@
       "name": "scripts.keybind.configuration.break_attack_target.key",
       "default_value": "F2",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2006,6 +1989,7 @@
       "name": "scripts.keybind.configuration.block_attack_target.key",
       "default_value": "F3",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2041,6 +2025,7 @@
       "name": "scripts.keybind.configuration.collect_from_body.key",
       "default_value": "3",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2076,6 +2061,7 @@
       "name": "scripts.keybind.configuration.filling_lamp.key",
       "default_value": "4",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2109,6 +2095,7 @@
       "name": "scripts.keybind.configuration.empty_bottle.key",
       "default_value": "Backslash",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2142,6 +2129,7 @@
       "name": "scripts.keybind.configuration.enter_ship.key",
       "default_value": "BracketLeft",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2177,6 +2165,7 @@
       "name": "scripts.keybind.configuration.temp1.key",
       "default_value": "Minus",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2212,6 +2201,7 @@
       "name": "scripts.keybind.configuration.temp2.key",
       "default_value": "Equal",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2247,6 +2237,7 @@
       "name": "scripts.keybind.configuration.temp3.key",
       "default_value": "Minus",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2282,6 +2273,7 @@
       "name": "scripts.keybind.configuration.temp4.key",
       "default_value": "Equal",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2315,6 +2307,7 @@
       "name": "scripts.keybind.configuration.temp5.key",
       "default_value": "",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2348,6 +2341,7 @@
       "name": "scripts.keybind.configuration.temp6.key",
       "default_value": "",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2381,6 +2375,7 @@
       "name": "scripts.keybind.configuration.temp7.key",
       "default_value": "",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2414,6 +2409,7 @@
       "name": "scripts.keybind.configuration.temp8.key",
       "default_value": "",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2447,6 +2443,7 @@
       "name": "scripts.keybind.configuration.temp9.key",
       "default_value": "",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2480,6 +2477,7 @@
       "name": "scripts.keybind.configuration.temp10.key",
       "default_value": "",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2515,6 +2513,7 @@
       "name": "scripts.keybind.configuration.multibind1.key",
       "default_value": "1",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2550,6 +2549,7 @@
       "name": "scripts.keybind.configuration.multibind2.key",
       "default_value": "2",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2585,6 +2585,7 @@
       "name": "scripts.keybind.configuration.multibind3.key",
       "default_value": "3",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2620,6 +2621,7 @@
       "name": "scripts.keybind.configuration.multibind4.key",
       "default_value": "4",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2655,6 +2657,7 @@
       "name": "scripts.keybind.configuration.opening_gate.key",
       "default_value": "2",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2690,6 +2693,7 @@
       "name": "scripts.keybind.configuration.drinking.key",
       "default_value": "N",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2725,6 +2729,7 @@
       "name": "scripts.keybind.configuration.special_exit.key",
       "default_value": "P",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]
@@ -2758,6 +2763,7 @@
       "name": "scripts.keybind.configuration.walk_mode.key",
       "default_value": "QuoteLeft",
       "field_type": "string",
+      "content_type": "keybind",
       "macros_on_modify": [
         "_keybind"
       ]