diff --git a/assets/controls/toggle switch/toggle_switch_base.svg b/assets/controls/toggle switch/base/toggle_switch_base.svg
similarity index 100%
rename from assets/controls/toggle switch/toggle_switch_base.svg
rename to assets/controls/toggle switch/base/toggle_switch_base.svg
diff --git a/assets/controls/toggle switch/toggle_switch_base.svg.import b/assets/controls/toggle switch/base/toggle_switch_base.svg.import
similarity index 75%
rename from assets/controls/toggle switch/toggle_switch_base.svg.import
rename to assets/controls/toggle switch/base/toggle_switch_base.svg.import
index 6bfa026..d1dab4b 100644
--- a/assets/controls/toggle switch/toggle_switch_base.svg.import	
+++ b/assets/controls/toggle switch/base/toggle_switch_base.svg.import	
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cgw5y2x8pewd2"
-path="res://.godot/imported/toggle_switch_base.svg-0f86a9a036ce8290a834ca5049b4fb5c.ctex"
+path="res://.godot/imported/toggle_switch_base.svg-137cb8d7fef345bd427136d77262c646.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/controls/toggle switch/toggle_switch_base.svg"
-dest_files=["res://.godot/imported/toggle_switch_base.svg-0f86a9a036ce8290a834ca5049b4fb5c.ctex"]
+source_file="res://assets/controls/toggle switch/base/toggle_switch_base.svg"
+dest_files=["res://.godot/imported/toggle_switch_base.svg-137cb8d7fef345bd427136d77262c646.ctex"]
 
 [params]
 
diff --git a/assets/controls/toggle switch/toggle_switch_cover.svg b/assets/controls/toggle switch/base/toggle_switch_cover.svg
similarity index 80%
rename from assets/controls/toggle switch/toggle_switch_cover.svg
rename to assets/controls/toggle switch/base/toggle_switch_cover.svg
index 09ea9f7..51c335e 100644
--- a/assets/controls/toggle switch/toggle_switch_cover.svg	
+++ b/assets/controls/toggle switch/base/toggle_switch_cover.svg	
@@ -3,13 +3,13 @@
 
 <svg
    width="150"
-   height="300"
-   viewBox="0 0 9.375 18.75"
+   height="250"
+   viewBox="0 0 9.375 15.625"
    version="1.1"
    id="svg1"
    inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
    sodipodi:docname="toggle_switch_cover.svg"
-   inkscape:export-filename="toggle_switch_cover_mount.svg"
+   inkscape:export-filename="../cover/hazard/toggle_switch_cover_hazard_down.svg"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -28,13 +28,13 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:document-units="mm"
      inkscape:zoom="0.73832446"
-     inkscape:cx="10.158136"
-     inkscape:cy="314.225"
-     inkscape:window-width="1920"
-     inkscape:window-height="1011"
-     inkscape:window-x="26"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0"
+     inkscape:cx="-44.695797"
+     inkscape:cy="88.714384"
+     inkscape:window-width="1918"
+     inkscape:window-height="1078"
+     inkscape:window-x="4480"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
      inkscape:current-layer="layer1" />
   <defs
      id="defs1">
@@ -42,19 +42,19 @@
        id="linearGradient32"
        inkscape:collect="always">
       <stop
-         style="stop-color:#911a00;stop-opacity:1;"
+         style="stop-color:#494949;stop-opacity:1;"
          offset="0"
          id="stop30" />
       <stop
-         style="stop-color:#ff2b00;stop-opacity:1;"
+         style="stop-color:#808080;stop-opacity:1;"
          offset="0.18496612"
          id="stop31" />
       <stop
-         style="stop-color:#ff2e01;stop-opacity:1;"
+         style="stop-color:#808080;stop-opacity:1;"
          offset="0.86726576"
          id="stop33" />
       <stop
-         style="stop-color:#aa1f00;stop-opacity:1;"
+         style="stop-color:#555555;stop-opacity:1;"
          offset="1"
          id="stop32" />
     </linearGradient>
@@ -62,15 +62,15 @@
        id="linearGradient25"
        inkscape:collect="always">
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="0"
          id="stop26" />
       <stop
-         style="stop-color:#f24b28;stop-opacity:1;"
-         offset="0.80123955"
+         style="stop-color:#8d8d8d;stop-opacity:1;"
+         offset="0.80000001"
          id="stop28" />
       <stop
-         style="stop-color:#9d1a00;stop-opacity:1;"
+         style="stop-color:#4f4f4f;stop-opacity:1;"
          offset="1"
          id="stop27" />
     </linearGradient>
@@ -78,11 +78,11 @@
        id="linearGradient24"
        inkscape:collect="always">
       <stop
-         style="stop-color:#ff6444;stop-opacity:1;"
+         style="stop-color:#a1a1a1;stop-opacity:1;"
          offset="0"
          id="stop24" />
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="1"
          id="stop25" />
     </linearGradient>
@@ -90,15 +90,15 @@
        id="linearGradient22"
        inkscape:collect="always">
       <stop
-         style="stop-color:#911a00;stop-opacity:1;"
+         style="stop-color:#494949;stop-opacity:1;"
          offset="0"
          id="stop22" />
       <stop
-         style="stop-color:#ed2a00;stop-opacity:1;"
+         style="stop-color:#777777;stop-opacity:1;"
          offset="0.5"
          id="stop29" />
       <stop
-         style="stop-color:#aa1f00;stop-opacity:1;"
+         style="stop-color:#555555;stop-opacity:1;"
          offset="1"
          id="stop23" />
     </linearGradient>
@@ -106,11 +106,11 @@
        id="linearGradient8"
        inkscape:collect="always">
       <stop
-         style="stop-color:#93260f;stop-opacity:1;"
+         style="stop-color:#515151;stop-opacity:1;"
          offset="0"
          id="stop8" />
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="1"
          id="stop9" />
     </linearGradient>
@@ -159,7 +159,7 @@
        x2="9.5657139"
        y2="2.7055383"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.3125001,4.3432094)" />
+       gradientTransform="translate(-3.3125001,1.6604354)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient10"
@@ -200,7 +200,7 @@
        x2="9.5710611"
        y2="3.3478367"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,-0.50796895,-3.3125003,16.968229)" />
+       gradientTransform="matrix(1,0,0,-0.50796895,-3.3125003,14.285455)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient8"
@@ -236,9 +236,9 @@
        xlink:href="#linearGradient25"
        id="linearGradient27"
        x1="4.6875"
-       y1="12.057774"
-       x2="4.6874995"
-       y2="18.010231"
+       y1="7.5712638"
+       x2="4.6875"
+       y2="15.132092"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
@@ -255,18 +255,18 @@
      inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="display:inline;fill:#4d4d4d;stroke:#303030;stroke-width:0.274666;stroke-dasharray:none"
+       style="display:inline;fill:#4d4d4d;stroke:#303030;stroke-width:0.251241;stroke-dasharray:none"
        id="rect4"
-       width="8.0901642"
-       height="13.651093"
-       x="0.64241737"
-       y="3.5427876"
-       rx="0.91834384"
-       ry="4.361512e-07"
+       width="8.1135883"
+       height="11.388937"
+       x="0.63070494"
+       y="3.531075"
+       rx="0.92100286"
+       ry="3.638755e-07"
        inkscape:label="Toggle Switch Base" />
     <path
        sodipodi:type="star"
-       style="display:none;fill:url(#radialGradient17);fill-opacity:1;stroke:#303030;stroke-width:0.255267;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;fill:url(#radialGradient17);fill-opacity:1;stroke:#303030;stroke-width:0.255267;stroke-dasharray:none;stroke-opacity:1"
        id="path1"
        inkscape:flatsided="true"
        sodipodi:sides="6"
@@ -279,12 +279,12 @@
        inkscape:rounded="0"
        inkscape:randomized="0"
        d="m 12.080368,7.8014271 0,4.0666959 -3.521862,2.033348 -3.5218618,-2.033348 0,-4.0666959 3.5218618,-2.0333478 z"
-       transform="matrix(1.0000078,0,0,0.85633276,-3.8710735,5.3090763)"
+       transform="matrix(1.0000078,0,0,0.85633276,-3.8710735,2.6263023)"
        inkscape:label="Hexagon Base" />
     <g
        id="g6"
-       transform="translate(-3.3125007,3.8894929)"
-       style="display:none;stroke-width:0;stroke-dasharray:none"
+       transform="translate(-3.3125007,1.2067189)"
+       style="display:inline;stroke-width:0;stroke-dasharray:none"
        inkscape:label="Raised Base">
       <path
          id="path3"
@@ -301,15 +301,15 @@
     </g>
     <path
        id="rect3-0"
-       style="display:none;fill:url(#linearGradient11-2);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
+       style="display:inline;fill:url(#linearGradient11-2);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
        inkscape:label="Stick Down"
-       d="m 4.6875,16.827118 c 0.726099,0 1.485007,-0.556696 1.310647,-1.461831 L 5.485342,12.703215 C 5.442282,12.479677 5.129505,12.057774 4.6875,12.057774 c -0.442005,0 -0.7547819,0.421903 -0.7978429,0.645441 L 3.3768523,15.365287 C 3.2055491,16.254556 3.9614011,16.827118 4.6875,16.827118 Z"
+       d="m 4.6875,14.144344 c 0.726099,0 1.485007,-0.556696 1.310647,-1.461831 L 5.485342,10.020441 C 5.442282,9.796903 5.129505,9.375 4.6875,9.375 4.245495,9.375 3.9327181,9.796903 3.8896571,10.020441 L 3.3768523,12.682513 C 3.2055491,13.571782 3.9614011,14.144344 4.6875,14.144344 Z"
        sodipodi:nodetypes="sssssss" />
     <g
        id="g7"
        inkscape:label="Toggle Switch Mount"
        transform="translate(0,2.6827736)"
-       style="display:none">
+       style="display:inline">
       <rect
          style="fill:#999999;stroke:#303030;stroke-width:0.293527;stroke-dasharray:none"
          id="rect5"
@@ -368,12 +368,12 @@
        id="rect3"
        style="display:none;fill:url(#linearGradient11);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
        inkscape:label="Stick Up"
-       d="m 4.6875,6.2297401 c 0.7260987,0 1.3789119,0.5714295 1.3106474,1.2690602 L 5.4853426,12.739419 c -0.043061,0.440063 -0.3558377,0.797843 -0.7978426,0.797843 -0.4420049,0 -0.7547817,-0.35778 -0.7978427,-0.797843 L 3.3768525,7.4988003 C 3.308588,6.8011696 3.9614013,6.2297401 4.6875,6.2297401 Z"
+       d="m 4.6875,3.5469661 c 0.7260987,0 1.3789119,0.5714295 1.3106474,1.2690602 L 5.4853426,10.056645 c -0.043061,0.440063 -0.3558377,0.797843 -0.7978426,0.797843 -0.4420049,0 -0.7547817,-0.35778 -0.7978427,-0.797843 L 3.3768525,4.8160263 C 3.308588,4.1183956 3.9614013,3.5469661 4.6875,3.5469661 Z"
        sodipodi:nodetypes="sssssss" />
     <path
        id="rect2"
-       style="display:none;fill:url(#linearGradient27);fill-opacity:1;stroke:#303030;stroke-width:0.23622"
-       d="m 2.2849525,4.1844873 c 1.1631387,0 0.02612,2.5305718 2.402547,2.5305718 2.376427,0 1.2399661,-2.5665918 2.402547,-2.5305718 0.50428,0.015624 0.983568,0.4386709 0.983568,0.9835671 V 17.026663 c 0,0.544897 -0.438671,0.983568 -0.983568,0.983568 h -4.805094 c -0.544896,0 -0.983567,-0.438671 -0.983567,-0.983568 V 5.1680544 c 0,-0.5448962 0.438671,-0.9835671 0.983567,-0.9835671 z"
+       style="display:inline;fill:url(#linearGradient27);fill-opacity:1;stroke:#303030;stroke-width:0.23622"
+       d="m 2.2849525,4.1844873 c 1.1631387,0 0.02612,2.5305718 2.402547,2.5305718 2.376427,0 1.2399661,-2.5665918 2.402547,-2.5305718 0.50428,0.015624 0.983568,0.4386709 0.983568,0.9835671 v 9.0651216 c 0,0.544897 -0.438671,0.983568 -0.983568,0.983568 h -4.805094 c -0.544896,0 -0.983567,-0.438671 -0.983567,-0.983568 V 5.1680544 c 0,-0.5448962 0.438671,-0.9835671 0.983567,-0.9835671 z"
        sodipodi:nodetypes="szssssssss"
        inkscape:label="Toggle Switch Cover Down" />
   </g>
diff --git a/assets/controls/toggle switch/toggle_switch_cover.svg.import b/assets/controls/toggle switch/base/toggle_switch_cover.svg.import
similarity index 75%
rename from assets/controls/toggle switch/toggle_switch_cover.svg.import
rename to assets/controls/toggle switch/base/toggle_switch_cover.svg.import
index db8c173..f94bbe5 100644
--- a/assets/controls/toggle switch/toggle_switch_cover.svg.import	
+++ b/assets/controls/toggle switch/base/toggle_switch_cover.svg.import	
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c3wxtdroykt2s"
-path="res://.godot/imported/toggle_switch_cover.svg-90c107ce31b8aeb9c50b5801b25df15a.ctex"
+path="res://.godot/imported/toggle_switch_cover.svg-9ef55fdbda96732c76ec82b6764ad43a.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/controls/toggle switch/toggle_switch_cover.svg"
-dest_files=["res://.godot/imported/toggle_switch_cover.svg-90c107ce31b8aeb9c50b5801b25df15a.ctex"]
+source_file="res://assets/controls/toggle switch/base/toggle_switch_cover.svg"
+dest_files=["res://.godot/imported/toggle_switch_cover.svg-9ef55fdbda96732c76ec82b6764ad43a.ctex"]
 
 [params]
 
diff --git a/assets/controls/toggle switch/toggle_switch_cover_down.svg b/assets/controls/toggle switch/cover/toggle_switch_cover_down.svg
similarity index 64%
rename from assets/controls/toggle switch/toggle_switch_cover_down.svg
rename to assets/controls/toggle switch/cover/toggle_switch_cover_down.svg
index 3ae2b82..ebf5604 100644
--- a/assets/controls/toggle switch/toggle_switch_cover_down.svg	
+++ b/assets/controls/toggle switch/cover/toggle_switch_cover_down.svg	
@@ -3,88 +3,129 @@
 
 <svg
    width="150"
-   height="300"
-   viewBox="0 0 9.375 18.75"
+   height="250"
+   viewBox="0 0 9.375 15.625"
    version="1.1"
    id="svg1"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   sodipodi:docname="toggle_switch_cover.svg"
+   inkscape:export-filename="../cover/toggle_switch_cover_up.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.73832446"
+     inkscape:cx="-44.695797"
+     inkscape:cy="88.714384"
+     inkscape:window-width="1918"
+     inkscape:window-height="1078"
+     inkscape:window-x="4480"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:page
+       x="0"
+       y="0"
+       width="9.375"
+       height="15.625"
+       id="page2"
+       margin="0"
+       bleed="0" />
+  </sodipodi:namedview>
   <defs
      id="defs1">
     <linearGradient
-       id="linearGradient32">
+       id="linearGradient32"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#911a00;stop-opacity:1;"
+         style="stop-color:#494949;stop-opacity:1;"
          offset="0"
          id="stop30" />
       <stop
-         style="stop-color:#ff2b00;stop-opacity:1;"
+         style="stop-color:#808080;stop-opacity:1;"
          offset="0.18496612"
          id="stop31" />
       <stop
-         style="stop-color:#ff2e01;stop-opacity:1;"
+         style="stop-color:#808080;stop-opacity:1;"
          offset="0.86726576"
          id="stop33" />
       <stop
-         style="stop-color:#aa1f00;stop-opacity:1;"
+         style="stop-color:#555555;stop-opacity:1;"
          offset="1"
          id="stop32" />
     </linearGradient>
     <linearGradient
-       id="linearGradient25">
+       id="linearGradient25"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="0"
          id="stop26" />
       <stop
-         style="stop-color:#f24b28;stop-opacity:1;"
-         offset="0.80123955"
+         style="stop-color:#8d8d8d;stop-opacity:1;"
+         offset="0.80000001"
          id="stop28" />
       <stop
-         style="stop-color:#9d1a00;stop-opacity:1;"
+         style="stop-color:#4f4f4f;stop-opacity:1;"
          offset="1"
          id="stop27" />
     </linearGradient>
     <linearGradient
-       id="linearGradient24">
+       id="linearGradient24"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#ff6444;stop-opacity:1;"
+         style="stop-color:#a1a1a1;stop-opacity:1;"
          offset="0"
          id="stop24" />
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="1"
          id="stop25" />
     </linearGradient>
     <linearGradient
-       id="linearGradient22">
+       id="linearGradient22"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#911a00;stop-opacity:1;"
+         style="stop-color:#494949;stop-opacity:1;"
          offset="0"
          id="stop22" />
       <stop
-         style="stop-color:#ed2a00;stop-opacity:1;"
+         style="stop-color:#777777;stop-opacity:1;"
          offset="0.5"
          id="stop29" />
       <stop
-         style="stop-color:#aa1f00;stop-opacity:1;"
+         style="stop-color:#555555;stop-opacity:1;"
          offset="1"
          id="stop23" />
     </linearGradient>
     <linearGradient
-       id="linearGradient8">
+       id="linearGradient8"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#93260f;stop-opacity:1;"
+         style="stop-color:#515151;stop-opacity:1;"
          offset="0"
          id="stop8" />
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="1"
          id="stop9" />
     </linearGradient>
     <linearGradient
-       id="linearGradient19">
+       id="linearGradient19"
+       inkscape:collect="always">
       <stop
          style="stop-color:#161616;stop-opacity:1;"
          offset="0"
@@ -95,7 +136,8 @@
          id="stop19" />
     </linearGradient>
     <linearGradient
-       id="linearGradient16">
+       id="linearGradient16"
+       inkscape:collect="always">
       <stop
          style="stop-color:#666666;stop-opacity:1;"
          offset="0"
@@ -106,7 +148,8 @@
          id="stop17" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10">
+       id="linearGradient10"
+       inkscape:collect="always">
       <stop
          style="stop-color:#777777;stop-opacity:1;"
          offset="0"
@@ -117,6 +160,7 @@
          id="stop11" />
     </linearGradient>
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="linearGradient11"
        x1="6.945755"
@@ -124,8 +168,9 @@
        x2="9.5657139"
        y2="2.7055383"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.3125001,4.3432094)" />
+       gradientTransform="translate(-3.3125001,1.6604354)" />
     <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="radialGradient13"
        cx="8.1425495"
@@ -136,6 +181,7 @@
        gradientTransform="matrix(0.87788433,0.23470897,-0.22570986,0.84422504,2.8612566,-0.50783958)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient16"
        id="linearGradient17"
        x1="8"
@@ -144,6 +190,7 @@
        y2="6.3589787"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient19"
        id="radialGradient17"
        cx="8.5585051"
@@ -154,6 +201,7 @@
        gradientTransform="matrix(0.9999999,-0.31889464,0.26048159,1.1139141,-2.5013056,1.5994727)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="linearGradient11-2"
        x1="6.5916977"
@@ -161,8 +209,9 @@
        x2="9.5710611"
        y2="3.3478367"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,-0.50796895,-3.3125003,16.968229)" />
+       gradientTransform="matrix(1,0,0,-0.50796895,-3.3125003,14.285455)" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient8"
        id="linearGradient9"
        x1="4.5989637"
@@ -172,6 +221,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,1.0644978,0,-0.14246815)" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient22"
        id="linearGradient23"
        x1="1.723527"
@@ -180,6 +230,7 @@
        y2="4.7891064"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient24"
        id="radialGradient25"
        cx="4.7974725"
@@ -190,14 +241,16 @@
        gradientTransform="matrix(5.1660079,1.1051165e-4,0,0.19967949,-19.98632,1.1646772)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient25"
        id="linearGradient27"
        x1="4.6875"
-       y1="12.057774"
-       x2="4.6874995"
-       y2="18.010231"
+       y1="7.5712638"
+       x2="4.6875"
+       y2="15.132092"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient32"
        id="linearGradient29"
        gradientUnits="userSpaceOnUse"
@@ -207,29 +260,46 @@
        y2="8.0086946" />
   </defs>
   <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="display:none;fill:#4d4d4d;stroke:#303030;stroke-width:0.274666;stroke-dasharray:none"
+       style="display:none;fill:#4d4d4d;stroke:#303030;stroke-width:0.251241;stroke-dasharray:none"
        id="rect4"
-       width="8.0901642"
-       height="13.651093"
-       x="0.64241737"
-       y="3.5427876"
-       rx="0.91834384"
-       ry="4.361512e-07" />
+       width="8.1135883"
+       height="11.388937"
+       x="0.63070494"
+       y="3.531075"
+       rx="0.92100286"
+       ry="3.638755e-07"
+       inkscape:label="Toggle Switch Base" />
     <path
+       sodipodi:type="star"
        style="display:none;fill:url(#radialGradient17);fill-opacity:1;stroke:#303030;stroke-width:0.255267;stroke-dasharray:none;stroke-opacity:1"
        id="path1"
+       inkscape:flatsided="true"
+       sodipodi:sides="6"
+       sodipodi:cx="8.558506"
+       sodipodi:cy="9.834775"
+       sodipodi:r1="4.0666957"
+       sodipodi:r2="3.5218618"
+       sodipodi:arg1="-0.52359878"
+       sodipodi:arg2="0"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
        d="m 12.080368,7.8014271 0,4.0666959 -3.521862,2.033348 -3.5218618,-2.033348 0,-4.0666959 3.5218618,-2.0333478 z"
-       transform="matrix(1.0000078,0,0,0.85633276,-3.8710735,5.3090763)" />
+       transform="matrix(1.0000078,0,0,0.85633276,-3.8710735,2.6263023)"
+       inkscape:label="Hexagon Base" />
     <g
        id="g6"
-       transform="translate(-3.3125007,3.8894929)"
-       style="display:none;stroke-width:0;stroke-dasharray:none">
+       transform="translate(-3.3125007,1.2067189)"
+       style="display:none;stroke-width:0;stroke-dasharray:none"
+       inkscape:label="Raised Base">
       <path
          id="path3"
          style="display:inline;fill:url(#linearGradient17);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
-         d="m 10.702686,8.8983261 c 0,1.2782069 -1.2100338,2.3143989 -2.702686,2.3143989 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.3143989 0,-1.2782073 1.2100338,-2.314399 2.7026861,-2.314399 1.4926523,0 2.702686,1.0361918 2.702686,2.314399 z m 0,0 V 9.694743 c 0,1.278207 -1.210034,2.314399 -2.702686,2.314399 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.314399 V 8.8983261" />
+         d="m 10.702686,8.8983261 c 0,1.2782069 -1.2100338,2.3143989 -2.702686,2.3143989 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.3143989 0,-1.2782073 1.2100338,-2.314399 2.7026861,-2.314399 1.4926523,0 2.702686,1.0361918 2.702686,2.314399 z m 0,0 V 9.694743 c 0,1.278207 -1.210034,2.314399 -2.702686,2.314399 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.314399 V 8.8983261"
+         sodipodi:nodetypes="ssssscsc" />
       <ellipse
          style="fill:url(#radialGradient13);fill-opacity:1;stroke:#303030;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
          id="path3-3"
@@ -241,10 +311,14 @@
     <path
        id="rect3-0"
        style="display:none;fill:url(#linearGradient11-2);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
-       d="m 4.6875,16.827118 c 0.726099,0 1.485007,-0.556696 1.310647,-1.461831 L 5.485342,12.703215 C 5.442282,12.479677 5.129505,12.057774 4.6875,12.057774 c -0.442005,0 -0.7547819,0.421903 -0.7978429,0.645441 L 3.3768523,15.365287 C 3.2055491,16.254556 3.9614011,16.827118 4.6875,16.827118 Z" />
+       inkscape:label="Stick Down"
+       d="m 4.6875,14.144344 c 0.726099,0 1.485007,-0.556696 1.310647,-1.461831 L 5.485342,10.020441 C 5.442282,9.796903 5.129505,9.375 4.6875,9.375 4.245495,9.375 3.9327181,9.796903 3.8896571,10.020441 L 3.3768523,12.682513 C 3.2055491,13.571782 3.9614011,14.144344 4.6875,14.144344 Z"
+       sodipodi:nodetypes="sssssss" />
     <g
        id="g7"
-       transform="translate(0,2.6827736)">
+       inkscape:label="Toggle Switch Mount"
+       transform="translate(0,2.6827736)"
+       style="display:inline">
       <rect
          style="fill:#999999;stroke:#303030;stroke-width:0.293527;stroke-dasharray:none"
          id="rect5"
@@ -275,6 +349,7 @@
     </g>
     <g
        id="g25"
+       inkscape:label="Toggle Switch Cover Up"
        style="display:none">
       <rect
          style="fill:url(#linearGradient9);fill-opacity:1;stroke:#303030;stroke-width:0.24372;stroke-dasharray:none"
@@ -301,10 +376,14 @@
     <path
        id="rect3"
        style="display:none;fill:url(#linearGradient11);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
-       d="m 4.6875,6.2297401 c 0.7260987,0 1.3789119,0.5714295 1.3106474,1.2690602 L 5.4853426,12.739419 c -0.043061,0.440063 -0.3558377,0.797843 -0.7978426,0.797843 -0.4420049,0 -0.7547817,-0.35778 -0.7978427,-0.797843 L 3.3768525,7.4988003 C 3.308588,6.8011696 3.9614013,6.2297401 4.6875,6.2297401 Z" />
+       inkscape:label="Stick Up"
+       d="m 4.6875,3.5469661 c 0.7260987,0 1.3789119,0.5714295 1.3106474,1.2690602 L 5.4853426,10.056645 c -0.043061,0.440063 -0.3558377,0.797843 -0.7978426,0.797843 -0.4420049,0 -0.7547817,-0.35778 -0.7978427,-0.797843 L 3.3768525,4.8160263 C 3.308588,4.1183956 3.9614013,3.5469661 4.6875,3.5469661 Z"
+       sodipodi:nodetypes="sssssss" />
     <path
        id="rect2"
        style="display:inline;fill:url(#linearGradient27);fill-opacity:1;stroke:#303030;stroke-width:0.23622"
-       d="m 2.2849525,4.1844873 c 1.1631387,0 0.02612,2.5305718 2.402547,2.5305718 2.376427,0 1.2399661,-2.5665918 2.402547,-2.5305718 0.50428,0.015624 0.983568,0.4386709 0.983568,0.9835671 V 17.026663 c 0,0.544897 -0.438671,0.983568 -0.983568,0.983568 h -4.805094 c -0.544896,0 -0.983567,-0.438671 -0.983567,-0.983568 V 5.1680544 c 0,-0.5448962 0.438671,-0.9835671 0.983567,-0.9835671 z" />
+       d="m 2.2849525,4.1844873 c 1.1631387,0 0.02612,2.5305718 2.402547,2.5305718 2.376427,0 1.2399661,-2.5665918 2.402547,-2.5305718 0.50428,0.015624 0.983568,0.4386709 0.983568,0.9835671 v 9.0651216 c 0,0.544897 -0.438671,0.983568 -0.983568,0.983568 h -4.805094 c -0.544896,0 -0.983567,-0.438671 -0.983567,-0.983568 V 5.1680544 c 0,-0.5448962 0.438671,-0.9835671 0.983567,-0.9835671 z"
+       sodipodi:nodetypes="szssssssss"
+       inkscape:label="Toggle Switch Cover Down" />
   </g>
 </svg>
diff --git a/assets/controls/toggle switch/toggle_switch_cover_down.svg.import b/assets/controls/toggle switch/cover/toggle_switch_cover_down.svg.import
similarity index 80%
rename from assets/controls/toggle switch/toggle_switch_cover_down.svg.import
rename to assets/controls/toggle switch/cover/toggle_switch_cover_down.svg.import
index e378414..72b7d1e 100644
--- a/assets/controls/toggle switch/toggle_switch_cover_down.svg.import	
+++ b/assets/controls/toggle switch/cover/toggle_switch_cover_down.svg.import	
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dvhjbvsdji6yx"
-path="res://.godot/imported/toggle_switch_cover_down.svg-5c44c208107e19170d8afb8ba41c3c8a.ctex"
+path="res://.godot/imported/toggle_switch_cover_down.svg-d6ea2fbc0db1d738e8307e693883821f.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/controls/toggle switch/toggle_switch_cover_down.svg"
-dest_files=["res://.godot/imported/toggle_switch_cover_down.svg-5c44c208107e19170d8afb8ba41c3c8a.ctex"]
+source_file="res://assets/controls/toggle switch/cover/toggle_switch_cover_down.svg"
+dest_files=["res://.godot/imported/toggle_switch_cover_down.svg-d6ea2fbc0db1d738e8307e693883821f.ctex"]
 
 [params]
 
diff --git a/assets/controls/toggle switch/toggle_switch_cover_mount.svg b/assets/controls/toggle switch/cover/toggle_switch_cover_mount.svg
similarity index 65%
rename from assets/controls/toggle switch/toggle_switch_cover_mount.svg
rename to assets/controls/toggle switch/cover/toggle_switch_cover_mount.svg
index 61469da..1b64547 100644
--- a/assets/controls/toggle switch/toggle_switch_cover_mount.svg	
+++ b/assets/controls/toggle switch/cover/toggle_switch_cover_mount.svg	
@@ -3,88 +3,129 @@
 
 <svg
    width="150"
-   height="300"
-   viewBox="0 0 9.375 18.75"
+   height="250"
+   viewBox="0 0 9.375 15.625"
    version="1.1"
    id="svg1"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   sodipodi:docname="toggle_switch_cover.svg"
+   inkscape:export-filename="../cover/toggle_switch_cover_mount.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.73832446"
+     inkscape:cx="-44.695797"
+     inkscape:cy="88.714384"
+     inkscape:window-width="1918"
+     inkscape:window-height="1078"
+     inkscape:window-x="4480"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:page
+       x="0"
+       y="0"
+       width="9.375"
+       height="15.625"
+       id="page2"
+       margin="0"
+       bleed="0" />
+  </sodipodi:namedview>
   <defs
      id="defs1">
     <linearGradient
-       id="linearGradient32">
+       id="linearGradient32"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#911a00;stop-opacity:1;"
+         style="stop-color:#494949;stop-opacity:1;"
          offset="0"
          id="stop30" />
       <stop
-         style="stop-color:#ff2b00;stop-opacity:1;"
+         style="stop-color:#808080;stop-opacity:1;"
          offset="0.18496612"
          id="stop31" />
       <stop
-         style="stop-color:#ff2e01;stop-opacity:1;"
+         style="stop-color:#808080;stop-opacity:1;"
          offset="0.86726576"
          id="stop33" />
       <stop
-         style="stop-color:#aa1f00;stop-opacity:1;"
+         style="stop-color:#555555;stop-opacity:1;"
          offset="1"
          id="stop32" />
     </linearGradient>
     <linearGradient
-       id="linearGradient25">
+       id="linearGradient25"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="0"
          id="stop26" />
       <stop
-         style="stop-color:#f24b28;stop-opacity:1;"
-         offset="0.80123955"
+         style="stop-color:#8d8d8d;stop-opacity:1;"
+         offset="0.80000001"
          id="stop28" />
       <stop
-         style="stop-color:#9d1a00;stop-opacity:1;"
+         style="stop-color:#4f4f4f;stop-opacity:1;"
          offset="1"
          id="stop27" />
     </linearGradient>
     <linearGradient
-       id="linearGradient24">
+       id="linearGradient24"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#ff6444;stop-opacity:1;"
+         style="stop-color:#a1a1a1;stop-opacity:1;"
          offset="0"
          id="stop24" />
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="1"
          id="stop25" />
     </linearGradient>
     <linearGradient
-       id="linearGradient22">
+       id="linearGradient22"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#911a00;stop-opacity:1;"
+         style="stop-color:#494949;stop-opacity:1;"
          offset="0"
          id="stop22" />
       <stop
-         style="stop-color:#ed2a00;stop-opacity:1;"
+         style="stop-color:#777777;stop-opacity:1;"
          offset="0.5"
          id="stop29" />
       <stop
-         style="stop-color:#aa1f00;stop-opacity:1;"
+         style="stop-color:#555555;stop-opacity:1;"
          offset="1"
          id="stop23" />
     </linearGradient>
     <linearGradient
-       id="linearGradient8">
+       id="linearGradient8"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#93260f;stop-opacity:1;"
+         style="stop-color:#515151;stop-opacity:1;"
          offset="0"
          id="stop8" />
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="1"
          id="stop9" />
     </linearGradient>
     <linearGradient
-       id="linearGradient19">
+       id="linearGradient19"
+       inkscape:collect="always">
       <stop
          style="stop-color:#161616;stop-opacity:1;"
          offset="0"
@@ -95,7 +136,8 @@
          id="stop19" />
     </linearGradient>
     <linearGradient
-       id="linearGradient16">
+       id="linearGradient16"
+       inkscape:collect="always">
       <stop
          style="stop-color:#666666;stop-opacity:1;"
          offset="0"
@@ -106,7 +148,8 @@
          id="stop17" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10">
+       id="linearGradient10"
+       inkscape:collect="always">
       <stop
          style="stop-color:#777777;stop-opacity:1;"
          offset="0"
@@ -117,6 +160,7 @@
          id="stop11" />
     </linearGradient>
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="linearGradient11"
        x1="6.945755"
@@ -124,8 +168,9 @@
        x2="9.5657139"
        y2="2.7055383"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.3125001,4.3432094)" />
+       gradientTransform="translate(-3.3125001,1.6604354)" />
     <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="radialGradient13"
        cx="8.1425495"
@@ -136,6 +181,7 @@
        gradientTransform="matrix(0.87788433,0.23470897,-0.22570986,0.84422504,2.8612566,-0.50783958)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient16"
        id="linearGradient17"
        x1="8"
@@ -144,6 +190,7 @@
        y2="6.3589787"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient19"
        id="radialGradient17"
        cx="8.5585051"
@@ -154,6 +201,7 @@
        gradientTransform="matrix(0.9999999,-0.31889464,0.26048159,1.1139141,-2.5013056,1.5994727)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="linearGradient11-2"
        x1="6.5916977"
@@ -161,8 +209,9 @@
        x2="9.5710611"
        y2="3.3478367"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,-0.50796895,-3.3125003,16.968229)" />
+       gradientTransform="matrix(1,0,0,-0.50796895,-3.3125003,14.285455)" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient8"
        id="linearGradient9"
        x1="4.5989637"
@@ -172,6 +221,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,1.0644978,0,-0.14246815)" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient22"
        id="linearGradient23"
        x1="1.723527"
@@ -180,6 +230,7 @@
        y2="4.7891064"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient24"
        id="radialGradient25"
        cx="4.7974725"
@@ -190,14 +241,16 @@
        gradientTransform="matrix(5.1660079,1.1051165e-4,0,0.19967949,-19.98632,1.1646772)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient25"
        id="linearGradient27"
        x1="4.6875"
-       y1="12.057774"
-       x2="4.6874995"
-       y2="18.010231"
+       y1="7.5712638"
+       x2="4.6875"
+       y2="15.132092"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient32"
        id="linearGradient29"
        gradientUnits="userSpaceOnUse"
@@ -207,29 +260,46 @@
        y2="8.0086946" />
   </defs>
   <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="display:inline;fill:#4d4d4d;stroke:#303030;stroke-width:0.274666;stroke-dasharray:none"
+       style="display:inline;fill:#4d4d4d;stroke:#303030;stroke-width:0.251241;stroke-dasharray:none"
        id="rect4"
-       width="8.0901642"
-       height="13.651093"
-       x="0.64241737"
-       y="3.5427876"
-       rx="0.91834384"
-       ry="4.361512e-07" />
+       width="8.1135883"
+       height="11.388937"
+       x="0.63070494"
+       y="3.531075"
+       rx="0.92100286"
+       ry="3.638755e-07"
+       inkscape:label="Toggle Switch Base" />
     <path
+       sodipodi:type="star"
        style="display:none;fill:url(#radialGradient17);fill-opacity:1;stroke:#303030;stroke-width:0.255267;stroke-dasharray:none;stroke-opacity:1"
        id="path1"
+       inkscape:flatsided="true"
+       sodipodi:sides="6"
+       sodipodi:cx="8.558506"
+       sodipodi:cy="9.834775"
+       sodipodi:r1="4.0666957"
+       sodipodi:r2="3.5218618"
+       sodipodi:arg1="-0.52359878"
+       sodipodi:arg2="0"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
        d="m 12.080368,7.8014271 0,4.0666959 -3.521862,2.033348 -3.5218618,-2.033348 0,-4.0666959 3.5218618,-2.0333478 z"
-       transform="matrix(1.0000078,0,0,0.85633276,-3.8710735,5.3090763)" />
+       transform="matrix(1.0000078,0,0,0.85633276,-3.8710735,2.6263023)"
+       inkscape:label="Hexagon Base" />
     <g
        id="g6"
-       transform="translate(-3.3125007,3.8894929)"
-       style="display:none;stroke-width:0;stroke-dasharray:none">
+       transform="translate(-3.3125007,1.2067189)"
+       style="display:none;stroke-width:0;stroke-dasharray:none"
+       inkscape:label="Raised Base">
       <path
          id="path3"
          style="display:inline;fill:url(#linearGradient17);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
-         d="m 10.702686,8.8983261 c 0,1.2782069 -1.2100338,2.3143989 -2.702686,2.3143989 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.3143989 0,-1.2782073 1.2100338,-2.314399 2.7026861,-2.314399 1.4926523,0 2.702686,1.0361918 2.702686,2.314399 z m 0,0 V 9.694743 c 0,1.278207 -1.210034,2.314399 -2.702686,2.314399 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.314399 V 8.8983261" />
+         d="m 10.702686,8.8983261 c 0,1.2782069 -1.2100338,2.3143989 -2.702686,2.3143989 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.3143989 0,-1.2782073 1.2100338,-2.314399 2.7026861,-2.314399 1.4926523,0 2.702686,1.0361918 2.702686,2.314399 z m 0,0 V 9.694743 c 0,1.278207 -1.210034,2.314399 -2.702686,2.314399 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.314399 V 8.8983261"
+         sodipodi:nodetypes="ssssscsc" />
       <ellipse
          style="fill:url(#radialGradient13);fill-opacity:1;stroke:#303030;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
          id="path3-3"
@@ -241,9 +311,12 @@
     <path
        id="rect3-0"
        style="display:none;fill:url(#linearGradient11-2);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
-       d="m 4.6875,16.827118 c 0.726099,0 1.485007,-0.556696 1.310647,-1.461831 L 5.485342,12.703215 C 5.442282,12.479677 5.129505,12.057774 4.6875,12.057774 c -0.442005,0 -0.7547819,0.421903 -0.7978429,0.645441 L 3.3768523,15.365287 C 3.2055491,16.254556 3.9614011,16.827118 4.6875,16.827118 Z" />
+       inkscape:label="Stick Down"
+       d="m 4.6875,14.144344 c 0.726099,0 1.485007,-0.556696 1.310647,-1.461831 L 5.485342,10.020441 C 5.442282,9.796903 5.129505,9.375 4.6875,9.375 4.245495,9.375 3.9327181,9.796903 3.8896571,10.020441 L 3.3768523,12.682513 C 3.2055491,13.571782 3.9614011,14.144344 4.6875,14.144344 Z"
+       sodipodi:nodetypes="sssssss" />
     <g
        id="g7"
+       inkscape:label="Toggle Switch Mount"
        transform="translate(0,2.6827736)"
        style="display:none">
       <rect
@@ -276,6 +349,7 @@
     </g>
     <g
        id="g25"
+       inkscape:label="Toggle Switch Cover Up"
        style="display:none">
       <rect
          style="fill:url(#linearGradient9);fill-opacity:1;stroke:#303030;stroke-width:0.24372;stroke-dasharray:none"
@@ -302,10 +376,14 @@
     <path
        id="rect3"
        style="display:none;fill:url(#linearGradient11);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
-       d="m 4.6875,6.2297401 c 0.7260987,0 1.3789119,0.5714295 1.3106474,1.2690602 L 5.4853426,12.739419 c -0.043061,0.440063 -0.3558377,0.797843 -0.7978426,0.797843 -0.4420049,0 -0.7547817,-0.35778 -0.7978427,-0.797843 L 3.3768525,7.4988003 C 3.308588,6.8011696 3.9614013,6.2297401 4.6875,6.2297401 Z" />
+       inkscape:label="Stick Up"
+       d="m 4.6875,3.5469661 c 0.7260987,0 1.3789119,0.5714295 1.3106474,1.2690602 L 5.4853426,10.056645 c -0.043061,0.440063 -0.3558377,0.797843 -0.7978426,0.797843 -0.4420049,0 -0.7547817,-0.35778 -0.7978427,-0.797843 L 3.3768525,4.8160263 C 3.308588,4.1183956 3.9614013,3.5469661 4.6875,3.5469661 Z"
+       sodipodi:nodetypes="sssssss" />
     <path
        id="rect2"
        style="display:none;fill:url(#linearGradient27);fill-opacity:1;stroke:#303030;stroke-width:0.23622"
-       d="m 2.2849525,4.1844873 c 1.1631387,0 0.02612,2.5305718 2.402547,2.5305718 2.376427,0 1.2399661,-2.5665918 2.402547,-2.5305718 0.50428,0.015624 0.983568,0.4386709 0.983568,0.9835671 V 17.026663 c 0,0.544897 -0.438671,0.983568 -0.983568,0.983568 h -4.805094 c -0.544896,0 -0.983567,-0.438671 -0.983567,-0.983568 V 5.1680544 c 0,-0.5448962 0.438671,-0.9835671 0.983567,-0.9835671 z" />
+       d="m 2.2849525,4.1844873 c 1.1631387,0 0.02612,2.5305718 2.402547,2.5305718 2.376427,0 1.2399661,-2.5665918 2.402547,-2.5305718 0.50428,0.015624 0.983568,0.4386709 0.983568,0.9835671 v 9.0651216 c 0,0.544897 -0.438671,0.983568 -0.983568,0.983568 h -4.805094 c -0.544896,0 -0.983567,-0.438671 -0.983567,-0.983568 V 5.1680544 c 0,-0.5448962 0.438671,-0.9835671 0.983567,-0.9835671 z"
+       sodipodi:nodetypes="szssssssss"
+       inkscape:label="Toggle Switch Cover Down" />
   </g>
 </svg>
diff --git a/assets/controls/toggle switch/toggle_switch_cover_mount.svg.import b/assets/controls/toggle switch/cover/toggle_switch_cover_mount.svg.import
similarity index 79%
rename from assets/controls/toggle switch/toggle_switch_cover_mount.svg.import
rename to assets/controls/toggle switch/cover/toggle_switch_cover_mount.svg.import
index 44f8d78..d7fbc3c 100644
--- a/assets/controls/toggle switch/toggle_switch_cover_mount.svg.import	
+++ b/assets/controls/toggle switch/cover/toggle_switch_cover_mount.svg.import	
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://beuv78r3u5kmw"
-path="res://.godot/imported/toggle_switch_cover_mount.svg-04694c609f08845a3af95e43e0fb482e.ctex"
+path="res://.godot/imported/toggle_switch_cover_mount.svg-be7668136f613c40160b832ae24f87e8.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/controls/toggle switch/toggle_switch_cover_mount.svg"
-dest_files=["res://.godot/imported/toggle_switch_cover_mount.svg-04694c609f08845a3af95e43e0fb482e.ctex"]
+source_file="res://assets/controls/toggle switch/cover/toggle_switch_cover_mount.svg"
+dest_files=["res://.godot/imported/toggle_switch_cover_mount.svg-be7668136f613c40160b832ae24f87e8.ctex"]
 
 [params]
 
diff --git a/assets/controls/toggle switch/toggle_switch_cover_up.svg b/assets/controls/toggle switch/cover/toggle_switch_cover_up.svg
similarity index 64%
rename from assets/controls/toggle switch/toggle_switch_cover_up.svg
rename to assets/controls/toggle switch/cover/toggle_switch_cover_up.svg
index e74c824..db10cc1 100644
--- a/assets/controls/toggle switch/toggle_switch_cover_up.svg	
+++ b/assets/controls/toggle switch/cover/toggle_switch_cover_up.svg	
@@ -3,88 +3,129 @@
 
 <svg
    width="150"
-   height="300"
-   viewBox="0 0 9.375 18.75"
+   height="250"
+   viewBox="0 0 9.375 15.625"
    version="1.1"
    id="svg1"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   sodipodi:docname="toggle_switch_cover.svg"
+   inkscape:export-filename="../cover/toggle_switch_cover_down.svg"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.73832446"
+     inkscape:cx="-44.695797"
+     inkscape:cy="88.714384"
+     inkscape:window-width="1918"
+     inkscape:window-height="1078"
+     inkscape:window-x="4480"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:page
+       x="0"
+       y="0"
+       width="9.375"
+       height="15.625"
+       id="page2"
+       margin="0"
+       bleed="0" />
+  </sodipodi:namedview>
   <defs
      id="defs1">
     <linearGradient
-       id="linearGradient32">
+       id="linearGradient32"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#911a00;stop-opacity:1;"
+         style="stop-color:#494949;stop-opacity:1;"
          offset="0"
          id="stop30" />
       <stop
-         style="stop-color:#ff2b00;stop-opacity:1;"
+         style="stop-color:#808080;stop-opacity:1;"
          offset="0.18496612"
          id="stop31" />
       <stop
-         style="stop-color:#ff2e01;stop-opacity:1;"
+         style="stop-color:#808080;stop-opacity:1;"
          offset="0.86726576"
          id="stop33" />
       <stop
-         style="stop-color:#aa1f00;stop-opacity:1;"
+         style="stop-color:#555555;stop-opacity:1;"
          offset="1"
          id="stop32" />
     </linearGradient>
     <linearGradient
-       id="linearGradient25">
+       id="linearGradient25"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="0"
          id="stop26" />
       <stop
-         style="stop-color:#f24b28;stop-opacity:1;"
-         offset="0.80123955"
+         style="stop-color:#8d8d8d;stop-opacity:1;"
+         offset="0.80000001"
          id="stop28" />
       <stop
-         style="stop-color:#9d1a00;stop-opacity:1;"
+         style="stop-color:#4f4f4f;stop-opacity:1;"
          offset="1"
          id="stop27" />
     </linearGradient>
     <linearGradient
-       id="linearGradient24">
+       id="linearGradient24"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#ff6444;stop-opacity:1;"
+         style="stop-color:#a1a1a1;stop-opacity:1;"
          offset="0"
          id="stop24" />
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="1"
          id="stop25" />
     </linearGradient>
     <linearGradient
-       id="linearGradient22">
+       id="linearGradient22"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#911a00;stop-opacity:1;"
+         style="stop-color:#494949;stop-opacity:1;"
          offset="0"
          id="stop22" />
       <stop
-         style="stop-color:#ed2a00;stop-opacity:1;"
+         style="stop-color:#777777;stop-opacity:1;"
          offset="0.5"
          id="stop29" />
       <stop
-         style="stop-color:#aa1f00;stop-opacity:1;"
+         style="stop-color:#555555;stop-opacity:1;"
          offset="1"
          id="stop23" />
     </linearGradient>
     <linearGradient
-       id="linearGradient8">
+       id="linearGradient8"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#93260f;stop-opacity:1;"
+         style="stop-color:#515151;stop-opacity:1;"
          offset="0"
          id="stop8" />
       <stop
-         style="stop-color:#e52900;stop-opacity:1;"
+         style="stop-color:#737373;stop-opacity:1;"
          offset="1"
          id="stop9" />
     </linearGradient>
     <linearGradient
-       id="linearGradient19">
+       id="linearGradient19"
+       inkscape:collect="always">
       <stop
          style="stop-color:#161616;stop-opacity:1;"
          offset="0"
@@ -95,7 +136,8 @@
          id="stop19" />
     </linearGradient>
     <linearGradient
-       id="linearGradient16">
+       id="linearGradient16"
+       inkscape:collect="always">
       <stop
          style="stop-color:#666666;stop-opacity:1;"
          offset="0"
@@ -106,7 +148,8 @@
          id="stop17" />
     </linearGradient>
     <linearGradient
-       id="linearGradient10">
+       id="linearGradient10"
+       inkscape:collect="always">
       <stop
          style="stop-color:#777777;stop-opacity:1;"
          offset="0"
@@ -117,6 +160,7 @@
          id="stop11" />
     </linearGradient>
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="linearGradient11"
        x1="6.945755"
@@ -124,8 +168,9 @@
        x2="9.5657139"
        y2="2.7055383"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-3.3125001,4.3432094)" />
+       gradientTransform="translate(-3.3125001,1.6604354)" />
     <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="radialGradient13"
        cx="8.1425495"
@@ -136,6 +181,7 @@
        gradientTransform="matrix(0.87788433,0.23470897,-0.22570986,0.84422504,2.8612566,-0.50783958)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient16"
        id="linearGradient17"
        x1="8"
@@ -144,6 +190,7 @@
        y2="6.3589787"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient19"
        id="radialGradient17"
        cx="8.5585051"
@@ -154,6 +201,7 @@
        gradientTransform="matrix(0.9999999,-0.31889464,0.26048159,1.1139141,-2.5013056,1.5994727)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient10"
        id="linearGradient11-2"
        x1="6.5916977"
@@ -161,8 +209,9 @@
        x2="9.5710611"
        y2="3.3478367"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,-0.50796895,-3.3125003,16.968229)" />
+       gradientTransform="matrix(1,0,0,-0.50796895,-3.3125003,14.285455)" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient8"
        id="linearGradient9"
        x1="4.5989637"
@@ -172,6 +221,7 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,1.0644978,0,-0.14246815)" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient22"
        id="linearGradient23"
        x1="1.723527"
@@ -180,6 +230,7 @@
        y2="4.7891064"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient24"
        id="radialGradient25"
        cx="4.7974725"
@@ -190,14 +241,16 @@
        gradientTransform="matrix(5.1660079,1.1051165e-4,0,0.19967949,-19.98632,1.1646772)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient25"
        id="linearGradient27"
        x1="4.6875"
-       y1="12.057774"
-       x2="4.6874995"
-       y2="18.010231"
+       y1="7.5712638"
+       x2="4.6875"
+       y2="15.132092"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient32"
        id="linearGradient29"
        gradientUnits="userSpaceOnUse"
@@ -207,29 +260,46 @@
        y2="8.0086946" />
   </defs>
   <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="display:none;fill:#4d4d4d;stroke:#303030;stroke-width:0.274666;stroke-dasharray:none"
+       style="display:none;fill:#4d4d4d;stroke:#303030;stroke-width:0.251241;stroke-dasharray:none"
        id="rect4"
-       width="8.0901642"
-       height="13.651093"
-       x="0.64241737"
-       y="3.5427876"
-       rx="0.91834384"
-       ry="4.361512e-07" />
+       width="8.1135883"
+       height="11.388937"
+       x="0.63070494"
+       y="3.531075"
+       rx="0.92100286"
+       ry="3.638755e-07"
+       inkscape:label="Toggle Switch Base" />
     <path
+       sodipodi:type="star"
        style="display:none;fill:url(#radialGradient17);fill-opacity:1;stroke:#303030;stroke-width:0.255267;stroke-dasharray:none;stroke-opacity:1"
        id="path1"
+       inkscape:flatsided="true"
+       sodipodi:sides="6"
+       sodipodi:cx="8.558506"
+       sodipodi:cy="9.834775"
+       sodipodi:r1="4.0666957"
+       sodipodi:r2="3.5218618"
+       sodipodi:arg1="-0.52359878"
+       sodipodi:arg2="0"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
        d="m 12.080368,7.8014271 0,4.0666959 -3.521862,2.033348 -3.5218618,-2.033348 0,-4.0666959 3.5218618,-2.0333478 z"
-       transform="matrix(1.0000078,0,0,0.85633276,-3.8710735,5.3090763)" />
+       transform="matrix(1.0000078,0,0,0.85633276,-3.8710735,2.6263023)"
+       inkscape:label="Hexagon Base" />
     <g
        id="g6"
-       transform="translate(-3.3125007,3.8894929)"
-       style="display:none;stroke-width:0;stroke-dasharray:none">
+       transform="translate(-3.3125007,1.2067189)"
+       style="display:none;stroke-width:0;stroke-dasharray:none"
+       inkscape:label="Raised Base">
       <path
          id="path3"
          style="display:inline;fill:url(#linearGradient17);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
-         d="m 10.702686,8.8983261 c 0,1.2782069 -1.2100338,2.3143989 -2.702686,2.3143989 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.3143989 0,-1.2782073 1.2100338,-2.314399 2.7026861,-2.314399 1.4926523,0 2.702686,1.0361918 2.702686,2.314399 z m 0,0 V 9.694743 c 0,1.278207 -1.210034,2.314399 -2.702686,2.314399 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.314399 V 8.8983261" />
+         d="m 10.702686,8.8983261 c 0,1.2782069 -1.2100338,2.3143989 -2.702686,2.3143989 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.3143989 0,-1.2782073 1.2100338,-2.314399 2.7026861,-2.314399 1.4926523,0 2.702686,1.0361918 2.702686,2.314399 z m 0,0 V 9.694743 c 0,1.278207 -1.210034,2.314399 -2.702686,2.314399 -1.4926523,0 -2.702686,-1.036192 -2.7026861,-2.314399 V 8.8983261"
+         sodipodi:nodetypes="ssssscsc" />
       <ellipse
          style="fill:url(#radialGradient13);fill-opacity:1;stroke:#303030;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
          id="path3-3"
@@ -241,10 +311,14 @@
     <path
        id="rect3-0"
        style="display:none;fill:url(#linearGradient11-2);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
-       d="m 4.6875,16.827118 c 0.726099,0 1.485007,-0.556696 1.310647,-1.461831 L 5.485342,12.703215 C 5.442282,12.479677 5.129505,12.057774 4.6875,12.057774 c -0.442005,0 -0.7547819,0.421903 -0.7978429,0.645441 L 3.3768523,15.365287 C 3.2055491,16.254556 3.9614011,16.827118 4.6875,16.827118 Z" />
+       inkscape:label="Stick Down"
+       d="m 4.6875,14.144344 c 0.726099,0 1.485007,-0.556696 1.310647,-1.461831 L 5.485342,10.020441 C 5.442282,9.796903 5.129505,9.375 4.6875,9.375 4.245495,9.375 3.9327181,9.796903 3.8896571,10.020441 L 3.3768523,12.682513 C 3.2055491,13.571782 3.9614011,14.144344 4.6875,14.144344 Z"
+       sodipodi:nodetypes="sssssss" />
     <g
        id="g7"
-       transform="translate(0,2.6827736)">
+       inkscape:label="Toggle Switch Mount"
+       transform="translate(0,2.6827736)"
+       style="display:inline">
       <rect
          style="fill:#999999;stroke:#303030;stroke-width:0.293527;stroke-dasharray:none"
          id="rect5"
@@ -275,6 +349,7 @@
     </g>
     <g
        id="g25"
+       inkscape:label="Toggle Switch Cover Up"
        style="display:inline">
       <rect
          style="fill:url(#linearGradient9);fill-opacity:1;stroke:#303030;stroke-width:0.24372;stroke-dasharray:none"
@@ -301,10 +376,14 @@
     <path
        id="rect3"
        style="display:none;fill:url(#linearGradient11);fill-opacity:1;stroke:#303030;stroke-width:0.23622;stroke-dasharray:none"
-       d="m 4.6875,6.2297401 c 0.7260987,0 1.3789119,0.5714295 1.3106474,1.2690602 L 5.4853426,12.739419 c -0.043061,0.440063 -0.3558377,0.797843 -0.7978426,0.797843 -0.4420049,0 -0.7547817,-0.35778 -0.7978427,-0.797843 L 3.3768525,7.4988003 C 3.308588,6.8011696 3.9614013,6.2297401 4.6875,6.2297401 Z" />
+       inkscape:label="Stick Up"
+       d="m 4.6875,3.5469661 c 0.7260987,0 1.3789119,0.5714295 1.3106474,1.2690602 L 5.4853426,10.056645 c -0.043061,0.440063 -0.3558377,0.797843 -0.7978426,0.797843 -0.4420049,0 -0.7547817,-0.35778 -0.7978427,-0.797843 L 3.3768525,4.8160263 C 3.308588,4.1183956 3.9614013,3.5469661 4.6875,3.5469661 Z"
+       sodipodi:nodetypes="sssssss" />
     <path
        id="rect2"
        style="display:none;fill:url(#linearGradient27);fill-opacity:1;stroke:#303030;stroke-width:0.23622"
-       d="m 2.2849525,4.1844873 c 1.1631387,0 0.02612,2.5305718 2.402547,2.5305718 2.376427,0 1.2399661,-2.5665918 2.402547,-2.5305718 0.50428,0.015624 0.983568,0.4386709 0.983568,0.9835671 V 17.026663 c 0,0.544897 -0.438671,0.983568 -0.983568,0.983568 h -4.805094 c -0.544896,0 -0.983567,-0.438671 -0.983567,-0.983568 V 5.1680544 c 0,-0.5448962 0.438671,-0.9835671 0.983567,-0.9835671 z" />
+       d="m 2.2849525,4.1844873 c 1.1631387,0 0.02612,2.5305718 2.402547,2.5305718 2.376427,0 1.2399661,-2.5665918 2.402547,-2.5305718 0.50428,0.015624 0.983568,0.4386709 0.983568,0.9835671 v 9.0651216 c 0,0.544897 -0.438671,0.983568 -0.983568,0.983568 h -4.805094 c -0.544896,0 -0.983567,-0.438671 -0.983567,-0.983568 V 5.1680544 c 0,-0.5448962 0.438671,-0.9835671 0.983567,-0.9835671 z"
+       sodipodi:nodetypes="szssssssss"
+       inkscape:label="Toggle Switch Cover Down" />
   </g>
 </svg>
diff --git a/assets/controls/toggle switch/toggle_switch_cover_up.svg.import b/assets/controls/toggle switch/cover/toggle_switch_cover_up.svg.import
similarity index 74%
rename from assets/controls/toggle switch/toggle_switch_cover_up.svg.import
rename to assets/controls/toggle switch/cover/toggle_switch_cover_up.svg.import
index c05b277..7254815 100644
--- a/assets/controls/toggle switch/toggle_switch_cover_up.svg.import	
+++ b/assets/controls/toggle switch/cover/toggle_switch_cover_up.svg.import	
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bgh8f7d1ccxau"
-path="res://.godot/imported/toggle_switch_cover_up.svg-286cfafabb52b6974bc0242b946b3789.ctex"
+path="res://.godot/imported/toggle_switch_cover_up.svg-caa5d415296529999d64f70e7bc44e2c.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/controls/toggle switch/toggle_switch_cover_up.svg"
-dest_files=["res://.godot/imported/toggle_switch_cover_up.svg-286cfafabb52b6974bc0242b946b3789.ctex"]
+source_file="res://assets/controls/toggle switch/cover/toggle_switch_cover_up.svg"
+dest_files=["res://.godot/imported/toggle_switch_cover_up.svg-caa5d415296529999d64f70e7bc44e2c.ctex"]
 
 [params]
 
diff --git a/base/controls/toggle switch/toggle_switch.gd b/base/controls/toggle switch/toggle_switch.gd
index af7df99..1d60f10 100644
--- a/base/controls/toggle switch/toggle_switch.gd	
+++ b/base/controls/toggle switch/toggle_switch.gd	
@@ -1,25 +1,38 @@
+@tool
 extends Control
 
 class_name ToggleSwitch
 
-enum SwitchTypes {Standard, Covered}
-@export var type : SwitchTypes = SwitchTypes.Standard
-
 @onready var cover = $Cover
 @onready var switch = $Switch
 @onready var mount = $Mount
 
+enum SwitchTypes {Standard, Covered}
+@export var type : SwitchTypes = SwitchTypes.Standard:
+	set(new_type):
+		type = new_type
+		if Engine.is_editor_hint():
+			update_type()
+
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	if type != SwitchTypes.Covered:
-		cover.hide()
-		mount.hide()
-		switch.position = Vector2(0,0)
-		custom_minimum_size = switch.size
+	update_type()
 
-	if type == SwitchTypes.Covered:
-		switch.reparent(cover)
+func update_type():
+	match type:
+		SwitchTypes.Standard:
+			cover.hide()
+			#mount.hide()
+			switch.position = Vector2(0,0)
+			custom_minimum_size = switch.size
 
+		SwitchTypes.Covered:
+			cover.show()
+			#mount.show()
+			switch.position = Vector2(0,35)
+			custom_minimum_size = mount.size
+			if not Engine.is_editor_hint():
+				switch.reparent(cover)
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta: float) -> void:
diff --git a/base/controls/toggle switch/toggle_switch.tscn b/base/controls/toggle switch/toggle_switch.tscn
index 9719fc0..6f15674 100644
--- a/base/controls/toggle switch/toggle_switch.tscn	
+++ b/base/controls/toggle switch/toggle_switch.tscn	
@@ -1,30 +1,33 @@
 [gd_scene format=3 uid="uid://cwtlsloppn32j"]
 
-[ext_resource type="Texture2D" uid="uid://beuv78r3u5kmw" path="res://assets/controls/toggle switch/toggle_switch_cover_mount.svg" id="1_8v6he"]
-[ext_resource type="Texture2D" uid="uid://bgh8f7d1ccxau" path="res://assets/controls/toggle switch/toggle_switch_cover_up.svg" id="1_15guj"]
+[ext_resource type="Texture2D" uid="uid://beuv78r3u5kmw" path="res://assets/controls/toggle switch/cover/toggle_switch_cover_mount.svg" id="1_8v6he"]
+[ext_resource type="Texture2D" uid="uid://bgh8f7d1ccxau" path="res://assets/controls/toggle switch/cover/toggle_switch_cover_up.svg" id="1_15guj"]
 [ext_resource type="Texture2D" uid="uid://cgreenixf8e4l" path="res://assets/controls/toggle switch/toggle_switch_off.svg" id="1_juatt"]
 [ext_resource type="Script" uid="uid://171lgou78rgg" path="res://base/controls/toggle switch/toggle_switch.gd" id="1_n4f2b"]
-[ext_resource type="Texture2D" uid="uid://dvhjbvsdji6yx" path="res://assets/controls/toggle switch/toggle_switch_cover_down.svg" id="2_8v6he"]
+[ext_resource type="Texture2D" uid="uid://dvhjbvsdji6yx" path="res://assets/controls/toggle switch/cover/toggle_switch_cover_down.svg" id="2_8v6he"]
 [ext_resource type="Texture2D" uid="uid://f1b2iwaedol6" path="res://assets/controls/toggle switch/toggle_switch_on.svg" id="2_p5fqu"]
 
 [node name="Toggle Switch" type="Control" unique_id=1882478056]
-custom_minimum_size = Vector2(150, 287)
+custom_minimum_size = Vector2(150, 200)
 layout_mode = 3
 anchors_preset = 0
 offset_right = 150.0
 offset_bottom = 287.0
+size_flags_horizontal = 4
+size_flags_vertical = 4
 script = ExtResource("1_n4f2b")
 
 [node name="Mount" type="TextureRect" parent="." unique_id=398456309]
+visible = false
 layout_mode = 0
 offset_right = 150.0
-offset_bottom = 300.0
+offset_bottom = 250.0
 texture = ExtResource("1_8v6he")
 
 [node name="Cover" type="TextureButton" parent="." unique_id=531410332]
 layout_mode = 0
 offset_right = 150.0
-offset_bottom = 300.0
+offset_bottom = 250.0
 focus_mode = 0
 toggle_mode = true
 action_mode = 0
@@ -34,9 +37,9 @@ texture_pressed = ExtResource("2_8v6he")
 
 [node name="Switch" type="TextureButton" parent="." unique_id=596357217]
 layout_mode = 0
-offset_top = 60.0
+offset_top = 43.0
 offset_right = 150.0
-offset_bottom = 260.0
+offset_bottom = 243.0
 tooltip_text = "test
 "
 focus_mode = 0
diff --git a/data/control panels/developer/test_control_panel.tscn b/data/control panels/developer/test_control_panel.tscn
index 2e51cbf..f0092bb 100644
--- a/data/control panels/developer/test_control_panel.tscn	
+++ b/data/control panels/developer/test_control_panel.tscn	
@@ -13,17 +13,24 @@ layout_mode = 2
 columns = 4
 
 [node name="Toggle Switch" parent="GridContainer" unique_id=596357217 instance=ExtResource("1_4r0tw")]
+custom_minimum_size = Vector2(150, 250)
 layout_mode = 2
 type = 1
 
 [node name="Toggle Switch2" parent="GridContainer" unique_id=1224040337 instance=ExtResource("1_4r0tw")]
+custom_minimum_size = Vector2(150, 250)
 layout_mode = 2
+type = 1
 
 [node name="Toggle Switch3" parent="GridContainer" unique_id=936272514 instance=ExtResource("1_4r0tw")]
+custom_minimum_size = Vector2(150, 250)
 layout_mode = 2
+type = 1
 
 [node name="Toggle Switch4" parent="GridContainer" unique_id=140758531 instance=ExtResource("1_4r0tw")]
+custom_minimum_size = Vector2(150, 250)
 layout_mode = 2
+type = 1
 
 [node name="Toggle Switch5" parent="GridContainer" unique_id=2113640046 instance=ExtResource("1_4r0tw")]
 layout_mode = 2
diff --git a/project.godot b/project.godot
index acd55c4..7c7f750 100644
--- a/project.godot
+++ b/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Space Ship"
 run/main_scene="uid://cipulg0k5jtnf"
-config/features=PackedStringArray("4.6", "GL Compatibility")
+config/features=PackedStringArray("4.7", "GL Compatibility")
 config/icon="res://icon.svg"
 
 [display]