diff --git a/FlightStreamDeck.AddOn/FlightStreamDeck.AddOn.csproj b/FlightStreamDeck.AddOn/FlightStreamDeck.AddOn.csproj
index f9f1aee..a8f7ba9 100644
--- a/FlightStreamDeck.AddOn/FlightStreamDeck.AddOn.csproj
+++ b/FlightStreamDeck.AddOn/FlightStreamDeck.AddOn.csproj
@@ -145,6 +145,27 @@
     <None Update="PropertyInspector\common.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="PropertyInspector\css\caret.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PropertyInspector\css\check.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PropertyInspector\css\check.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PropertyInspector\css\elg_calendar.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PropertyInspector\css\elg_calendar_inv.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PropertyInspector\css\rcheck.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PropertyInspector\css\sdpi.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="PropertyInspector\embedimages.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/GenericGauge.html b/FlightStreamDeck.AddOn/PropertyInspector/GenericGauge.html
index fb53d88..33ca825 100644
--- a/FlightStreamDeck.AddOn/PropertyInspector/GenericGauge.html
+++ b/FlightStreamDeck.AddOn/PropertyInspector/GenericGauge.html
@@ -3,91 +3,103 @@
 <head>
     <meta charset="utf-8" />
     <title>Property Inspector</title>
-    <link rel="stylesheet" href="sdpi.css">
+    <link rel="stylesheet" href="css/sdpi.css">
 </head>
 <body>
     <div class="sdpi-wrapper">
         <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Header</div>
-            <input class="sdpi-item-value" id="Header" value="" placeholder="Throttle" onchange="updateData()">
+            <div class="sdpi-item-label">Toggle value</div>
+            <input class="sdpi-item-value" id="ToggleValue" value="" placeholder="e.g. YAW_DAMPER_TOGGLE" onchange="updateData()" pattern="[A-Z_]">
         </div>
         <div class="sdpi-item" type="field">
-            <div id="HideTopHeader" class="sdpi-item-label">Header Top Hide If Outside Min/Max</div>
-            <div id="HideHeader" class="sdpi-item-label">Header Hide If Outside Min/Max</div>
-            <input class="sdpi-item-value" id="HideLabelOutsideMinMaxTop" type="checkbox" onchange="updateData()">
-            <label for="HideLabelOutsideMinMaxTop"><span></span></label>
+            <div class="sdpi-item-label">Type</div>
+            <select class="sdpi-item-value select" id="Type" onchange="updateData()">
+                <option value="Generic">Simple</option>
+                <option value="Custom">Custom</option>
+            </select>
         </div>
         <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Toggle value</div>
-            <input class="sdpi-item-value" id="ToggleValue" value="" placeholder="YAW_DAMPER_TOGGLE" onchange="updateData()" pattern="[A-Z_]">
+            <div class="sdpi-item-label">Header</div>
+            <input class="sdpi-item-value" id="Header" value="" placeholder="e.g. Throttle" onchange="updateData()">
         </div>
-        <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Display value</div>
-            <input class="sdpi-item-value" id="DisplayValue" value="" placeholder="INDICATED_ALTITUDE" onchange="updateData()" pattern="[A-Z_]">
+        <div id="WrapperHideLabelOutsideMinMaxTop">
+            <div class="sdpi-item" type="field">
+                <div style="width: 94px; padding: 4px;"></div>
+                <input class="sdpi-item-value" id="HideLabelOutsideMinMaxTop" type="checkbox" onchange="updateData()">
+                <label for="HideLabelOutsideMinMaxTop"><span></span>Hide if outside Min/Max</label>
+            </div>
         </div>
         <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Sub Display value</div>
-            <input class="sdpi-item-value" id="SubDisplayValue" value="" placeholder="KOHLSMAN_SETTING_HG" onchange="updateData()" pattern="[A-Z_]">
+            <div id="LabelDisplayValue" class="sdpi-item-label">Display value</div>
+            <input class="sdpi-item-value" id="DisplayValue" value="" placeholder="e.g. INDICATED_ALTITUDE" onchange="updateData()" pattern="[A-Z_]">
+        </div>
+        <div id="WrapperHeaderBottom">
+            <div class="sdpi-item" type="field">
+                <div class="sdpi-item-label">Bottom Header</div>
+                <input class="sdpi-item-value" id="HeaderBottom" placeholder="R" onchange="updateData()">
+            </div>
+        </div>
+        <div id="WrapperHideLabelOutsideMinMaxBottom">
+            <div class="sdpi-item" type="field">
+                <div style="width: 94px; padding: 4px;"></div>
+                <input class="sdpi-item-value" id="HideLabelOutsideMinMaxBottom" type="checkbox" onchange="updateData()">
+                <label for="HideLabelOutsideMinMaxBottom"><span></span>Hide If Outside Min/Max</label>
+            </div>
+        </div>
+        <div id="WrapperDisplayValueBottom">
+            <div class="sdpi-item" type="field">
+                <div class="sdpi-item-label">Bottom Display value</div>
+                <input class="sdpi-item-value" id="DisplayValueBottom" placeholder="FUEL_RIGHT_QUANTITY" onchange="updateData()" pattern="[A-Z_]">
+            </div>
         </div>
         <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Minimal value</div>
+            <div class="sdpi-item-label">Minimum</div>
             <input class="sdpi-item-value" id="MinValue" value="" placeholder="0" onchange="updateData()" pattern="[0-9.-]">
         </div>
         <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Maximum value</div>
-            <input class="sdpi-item-value" id="MaxValue" value="" placeholder="100" onchange="updateData()" pattern="[0-9.-]">
+            <div class="sdpi-item-label">Maximum</div>
+            <input class="sdpi-item-value" id="MaxValue" value="" placeholder="30" onchange="updateData()" pattern="[0-9.-]">
         </div>
         <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Value Units</div>
-            <input class="sdpi-item-value" id="ValueUnit" value="" placeholder="empty for default units" onchange="updateData()" pattern="[A-Z0-9: ]*">
+            <div class="sdpi-item-label">Unit & Decimals</div>
+            <input class="sdpi-item-value" id="ValueUnit" value="" placeholder="Empty for default unit" onchange="updateData()" pattern="[A-Z0-9: ]*" style="margin-right: 0">
+            <input class="sdpi-item-value" id="ValuePrecision" value="" placeholder="Default decimals" onchange="updateData()" pattern="[0-9: ]*" style="max-width: 90px">
         </div>
-        <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Value Precision</div>
-            <input class="sdpi-item-value" id="ValuePrecision" value="" placeholder="2" onchange="updateData()" pattern="[0-9]">
+        <div class="sdpi-item">
+            <details class="message caution">
+                <summary>Setting invalid unit affects the whole page.</summary>
+            </details>
         </div>
-        <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Type</div>
-            <select class="sdpi-item-value select" id="Type" onchange="updateData()">
-                <option value="Generic">Generic</option>
-                <option value="Custom">Custom</option>
-            </select>
+        <div id="simpleFields">
+            <div class="sdpi-heading">More Settings</div>
+            <div class="sdpi-item" type="field">
+                <div class="sdpi-item-label">Sub value</div>
+                <input class="sdpi-item-value" id="SubDisplayValue" value="" placeholder="e.g. KOHLSMAN_SETTING_HG" onchange="updateData()" pattern="[A-Z_]">
+            </div>
         </div>
         <div id="customFields">
-            <div class="sdpi-heading">Custom Gauge Settings</div>
+            <div class="sdpi-heading">More Settings</div>
             <div class="sdpi-item" type="field">
-                <div class="sdpi-item-label">Chart Split by Percentage</div>
+                <div class="sdpi-item-label">Color Split by Percentage</div>
                 <input class="sdpi-item-value" id="ChartSplitValue" placeholder="12:red,24:yellow,64:green" onchange="updateData()" pattern="[0-9,]*">
             </div>
             <div class="sdpi-item" type="field">
-                <div class="sdpi-item-label">Chart Thickness</div>
+                <div class="sdpi-item-label">Thickness</div>
                 <input class="sdpi-item-value" id="ChartThicknessValue" placeholder="13" onchange="updateData()" pattern="[0-9]*">
             </div>
             <div class="sdpi-item" type="field">
-                <div class="sdpi-item-label">Chart Chevron Size</div>
+                <div class="sdpi-item-label">Chevron Size</div>
                 <input class="sdpi-item-value" id="ChartChevronSizeValue" placeholder="3" onchange="updateData()" pattern="[0-9]*">
             </div>
             <div class="sdpi-item" type="field">
-                <div class="sdpi-item-label">Header Bottom Hide If Outside Min/Max</div>
-                <input class="sdpi-item-value" id="HideLabelOutsideMinMaxBottom" type="checkbox" onchange="updateData()">
-                <label for="HideLabelOutsideMinMaxBottom"><span></span></label>
-            </div>
-            <div class="sdpi-item" type="field">
-                <div class="sdpi-item-label">Header Bottom</div>
-                <input class="sdpi-item-value" id="HeaderBottom" placeholder="R" onchange="updateData()">
-            </div>
-            <div class="sdpi-item" type="field">
-                <div class="sdpi-item-label">Display value Bottom</div>
-                <input class="sdpi-item-value" id="DisplayValueBottom" placeholder="FUEL_RIGHT_QUANTITY" onchange="updateData()" pattern="[A-Z_]">
-            </div>
-            <div class="sdpi-item" type="field">
-                <div class="sdpi-item-label">Vertical Or Horizontal?</div>
+                <div class="sdpi-item-label">Orientation</div>
                 <select class="sdpi-item-value select" id="DisplayHorizontalValue" onchange="updateData()">
                     <option value="false">Vertical</option>
                     <option value="true">Horizontal</option>
                 </select>
             </div>
             <div class="sdpi-item" type="field">
-                <div class="sdpi-item-label">Use Absolute Value for Value Text</div>
+                <div class="sdpi-item-label">Display absolute value</div>
                 <select class="sdpi-item-value select" id="AbsValText" onchange="updateData()">
                     <option value="false">No</option>
                     <option value="true">Yes</option>
@@ -95,7 +107,7 @@
             </div>
         </div>
     </div>
-    
+
     <script src="common.js"></script>
     <script language="JavaScript" type="text/javascript">
         function loadSettings(settings) {
@@ -147,9 +159,21 @@
         }
 
         function CustomShow() {
-            document.getElementById("customFields").hidden = (Type.value != "Custom");
-            document.getElementById("HideTopHeader").hidden = (Type.value != "Custom");
-            document.getElementById("HideHeader").hidden = (Type.value == "Custom");
+            simpleFields.hidden = Type.value != "Generic";
+
+            customFields.hidden = Type.value != "Custom";
+            WrapperHideLabelOutsideMinMaxTop.hidden =
+                WrapperHeaderBottom.hidden =
+                WrapperHideLabelOutsideMinMaxBottom.hidden =
+                WrapperDisplayValueBottom.hidden =
+                Type.value != "Custom";
+            switch (Type.value) {
+                case "Generic":
+                    break;
+                case "Custom":
+
+                    break;
+            }
         }
     </script>
     <script src="init.js"></script>
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/GenericToggle.html b/FlightStreamDeck.AddOn/PropertyInspector/GenericToggle.html
index 18783c8..7d9f4df 100644
--- a/FlightStreamDeck.AddOn/PropertyInspector/GenericToggle.html
+++ b/FlightStreamDeck.AddOn/PropertyInspector/GenericToggle.html
@@ -3,13 +3,13 @@
 <head>
     <meta charset="utf-8" />
     <title>Property Inspector</title>
-    <link rel="stylesheet" href="sdpi.css">
+    <link rel="stylesheet" href="css/sdpi.css">
 </head>
 <body>
     <div class="sdpi-wrapper">
         <div class="sdpi-item" type="field">
             <div class="sdpi-item-label">Header</div>
-            <input class="sdpi-item-value" id="Header" value="" placeholder="YD">
+            <input class="sdpi-item-value" id="e.g. Header" value="" placeholder="YD">
         </div>
         <div class="sdpi-item" type="field">
             <div class="sdpi-item-label">Toggle event</div>
@@ -25,15 +25,17 @@
         </div>
         <div class="sdpi-item" type="field">
             <div class="sdpi-item-label">Display value</div>
-            <input class="sdpi-item-value" id="DisplayValue" value="" placeholder="Empty for toggle button" pattern="[A-Z0-9: ]*">
+            <input class="sdpi-item-value" id="DisplayValue" value="" placeholder="Empty to show no number" pattern="[A-Z0-9: ]*">
         </div>
         <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Display Value Units</div>
-            <input class="sdpi-item-value" id="DisplayValueUnit" value="" placeholder="empty for default units" pattern="[A-Z0-9: ]*">
+            <div class="sdpi-item-label">Unit & Decimals</div>
+            <input class="sdpi-item-value" id="DisplayValueUnit" value="" placeholder="Empty for default unit" pattern="[A-Z0-9: ]*" style="margin-right: 0">
+            <input class="sdpi-item-value" id="DisplayValuePrecision" value="" placeholder="Default decimals" pattern="[0-9: ]*" style="max-width: 90px">
         </div>
-        <div class="sdpi-item" type="field">
-            <div class="sdpi-item-label">Display Value Precision</div>
-            <input class="sdpi-item-value" id="DisplayValuePrecision" value="" placeholder="Empty for default precision" pattern="[A-Z0-9: ]*">
+        <div class="sdpi-item">
+            <details class="message caution">
+                <summary>Setting invalid unit affects the whole page.</summary>
+            </details>
         </div>
         <div type="group" class="sdpi-item" id="messagegroup">
             <div class="sdpi-item-label">Custom ON/OFF images</div>
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/NavCom.html b/FlightStreamDeck.AddOn/PropertyInspector/NavCom.html
index afe80cb..3757e59 100644
--- a/FlightStreamDeck.AddOn/PropertyInspector/NavCom.html
+++ b/FlightStreamDeck.AddOn/PropertyInspector/NavCom.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <title>Property Inspector</title>
-    <link rel="stylesheet" href="sdpi.css">
+    <link rel="stylesheet" href="css/sdpi.css">
 </head>
 <body>
     <div class="sdpi-wrapper">
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/PresetChange.html b/FlightStreamDeck.AddOn/PropertyInspector/PresetChange.html
index 2d0cf48..dbf08f4 100644
--- a/FlightStreamDeck.AddOn/PropertyInspector/PresetChange.html
+++ b/FlightStreamDeck.AddOn/PropertyInspector/PresetChange.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <title>Property Inspector</title>
-    <link rel="stylesheet" href="sdpi.css">
+    <link rel="stylesheet" href="css/sdpi.css">
 </head>
 <body>
     <div class="sdpi-wrapper">
@@ -27,7 +27,7 @@
     <script language="JavaScript" type="text/javascript">
         function loadSettings(settings) {
             if (settings['Type']) {
-                Type.value = settings['Type']; 
+                Type.value = settings['Type'];
             };
         }
 
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/PresetToggle.html b/FlightStreamDeck.AddOn/PropertyInspector/PresetToggle.html
index d45e2bd..1a15921 100644
--- a/FlightStreamDeck.AddOn/PropertyInspector/PresetToggle.html
+++ b/FlightStreamDeck.AddOn/PropertyInspector/PresetToggle.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <title>Property Inspector</title>
-    <link rel="stylesheet" href="sdpi.css">
+    <link rel="stylesheet" href="css/sdpi.css">
 </head>
 <body>
     <div class="sdpi-wrapper">
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/css/caret.svg b/FlightStreamDeck.AddOn/PropertyInspector/css/caret.svg
new file mode 100644
index 0000000..b69162a
--- /dev/null
+++ b/FlightStreamDeck.AddOn/PropertyInspector/css/caret.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="6" viewBox="0 0 12 6">
+  <polygon fill="#8E8E92" fill-rule="evenodd" points="5 4 9 0 10 1 5 6 0 1 1 0"/>
+</svg>
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/css/check.png b/FlightStreamDeck.AddOn/PropertyInspector/css/check.png
new file mode 100644
index 0000000..b5e9e62
Binary files /dev/null and b/FlightStreamDeck.AddOn/PropertyInspector/css/check.png differ
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/css/check.svg b/FlightStreamDeck.AddOn/PropertyInspector/css/check.svg
new file mode 100644
index 0000000..5b96af0
--- /dev/null
+++ b/FlightStreamDeck.AddOn/PropertyInspector/css/check.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="10" viewBox="0 0 12 10">
+  <polygon fill="#FFF" points="7.2 7.5 7.2 -1.3 8.7 -1.3 8.6 9.1 2.7 8.7 2.7 7.2" transform="rotate(37 5.718 3.896)"/>
+</svg>
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/css/elg_calendar.svg b/FlightStreamDeck.AddOn/PropertyInspector/css/elg_calendar.svg
new file mode 100644
index 0000000..157e01b
--- /dev/null
+++ b/FlightStreamDeck.AddOn/PropertyInspector/css/elg_calendar.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#9C9C9C" fill-rule="nonzero" d="M1,5 L1,14 L14,14 L14,5 L1,5 Z M0,1 L15,1 L15,15 L0,15 L0,1 Z M14,4 L14,2 L1,2 L1,4 L14,4 Z"/>
+    <rect width="1" height="1" x="2" fill="#9C9C9C" fill-rule="nonzero"/>
+    <rect width="1" height="1" x="12" fill="#9C9C9C" fill-rule="nonzero"/>
+    <g transform="translate(3 7)">
+      <rect width="1" height="1" x="2" fill="#9C9C9C"/>
+      <rect width="1" height="1" fill="#666"/>
+      <rect width="1" height="1" x="4" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="6" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="8" fill="#9C9C9C"/>
+      <rect width="1" height="1" y="2" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="2" y="2" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="4" y="2" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="6" y="2" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="8" y="2" fill="#9C9C9C"/>
+      <rect width="1" height="1" y="4" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="2" y="4" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="4" y="4" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="6" y="4" fill="#9C9C9C"/>
+      <rect width="1" height="1" x="8" y="4" fill="#666"/>
+    </g>
+  </g>
+</svg>
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/css/elg_calendar_inv.svg b/FlightStreamDeck.AddOn/PropertyInspector/css/elg_calendar_inv.svg
new file mode 100644
index 0000000..4f8af68
--- /dev/null
+++ b/FlightStreamDeck.AddOn/PropertyInspector/css/elg_calendar_inv.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#9C9C9C">
+    <path d="M15,15 L1.77635684e-15,15 L1.77635684e-15,1 L15,1 L15,15 Z M5,7 L5,8 L6,8 L6,7 L5,7 Z M3,7 L3,8 L4,8 L4,7 L3,7 Z M7,7 L7,8 L8,8 L8,7 L7,7 Z M9,7 L9,8 L10,8 L10,7 L9,7 Z M11,7 L11,8 L12,8 L12,7 L11,7 Z M3,9 L3,10 L4,10 L4,9 L3,9 Z M5,9 L5,10 L6,10 L6,9 L5,9 Z M7,9 L7,10 L8,10 L8,9 L7,9 Z M9,9 L9,10 L10,10 L10,9 L9,9 Z M11,9 L11,10 L12,10 L12,9 L11,9 Z M3,11 L3,12 L4,12 L4,11 L3,11 Z M5,11 L5,12 L6,12 L6,11 L5,11 Z M7,11 L7,12 L8,12 L8,11 L7,11 Z M9,11 L9,12 L10,12 L10,11 L9,11 Z M11,11 L11,12 L12,12 L12,11 L11,11 Z M14,4 L14,2 L1,2 L1,4 L14,4 Z"/>
+    <rect width="1" height="1" x="2"/>
+    <rect width="1" height="1" x="12"/>
+  </g>
+</svg>
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/css/rcheck.svg b/FlightStreamDeck.AddOn/PropertyInspector/css/rcheck.svg
new file mode 100644
index 0000000..af478ee
--- /dev/null
+++ b/FlightStreamDeck.AddOn/PropertyInspector/css/rcheck.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="6" viewBox="0 0 6 6">
+  <circle cx="3" cy="3" r="3" fill="#FFF"/>
+</svg>
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/sdpi.css b/FlightStreamDeck.AddOn/PropertyInspector/css/sdpi.css
similarity index 99%
rename from FlightStreamDeck.AddOn/PropertyInspector/sdpi.css
rename to FlightStreamDeck.AddOn/PropertyInspector/css/sdpi.css
index 8093100..038d99a 100644
--- a/FlightStreamDeck.AddOn/PropertyInspector/sdpi.css
+++ b/FlightStreamDeck.AddOn/PropertyInspector/css/sdpi.css
@@ -694,7 +694,7 @@ textarea {
     border: none;
     margin-top: 2px;
     margin-bottom: 2px;
-    min-width: 219px;
+    min-width: 80px;
 }
 
     textarea + label {
@@ -1136,7 +1136,7 @@ input::-webkit-datetime-edit-fields-wrapper {
 }
 */
 
-/* 
+/*
 input[type="date"] {
   background-color: red;
   outline: none;
@@ -1222,7 +1222,7 @@ input:required:valid {
   left: 8px;
   display: none;
   color: #fff;
-  border: 8px solid transparent;	
+  border: 8px solid transparent;
   border-bottom: 8px solid #000;
 }
 
@@ -1240,7 +1240,7 @@ input:required:valid {
     opacity: 1;
     position: absolute;
     height: auto;
-  
+
     text-align: center;
     bottom: 2px;
     z-index: 100;
@@ -1307,7 +1307,7 @@ input[type=range] {
     overflow: visible;
 }
 
-/* 
+/*
 input[type="range"]::-webkit-slider-thumb {
   -webkit-appearance: none;
   background-color: var(--sdpi-color);
diff --git a/FlightStreamDeck.AddOn/PropertyInspector/init.js b/FlightStreamDeck.AddOn/PropertyInspector/init.js
index c5bdbff..48d028f 100644
--- a/FlightStreamDeck.AddOn/PropertyInspector/init.js
+++ b/FlightStreamDeck.AddOn/PropertyInspector/init.js
@@ -124,7 +124,7 @@ function prepareDOMElements(baseElement) {
                     };
                 }
             );
-            /** Just in case the found HTML element already has an input or change - event attached, 
+            /** Just in case the found HTML element already has an input or change - event attached,
              * we clone it, and call it in the callback, right before the freshly attached event
             */
             const cloneEvt = el[evt];
@@ -175,7 +175,7 @@ function prepareDOMElements(baseElement) {
 }
 
 function handleSdpiItemChange(e, idx) {
-    
+
     /** Following items are containers, so we won't handle clicks on them */
 
     if (['OL', 'UL', 'TABLE'].includes(e.tagName)) {
@@ -277,5 +277,5 @@ function handleSdpiItemChange(e, idx) {
         setFileLabel(sdpiItem, returnValue.value, IsEmbedding.value === "true");
     }
 
-    if (handleItemChanged) handleItemChanged(e, returnValue);
+    if (window["handleItemChanged"]) handleItemChanged(e, returnValue);
 }
\ No newline at end of file
diff --git a/FlightStreamDeck.SimConnectFSX/EventValueLibrary.cs b/FlightStreamDeck.Core/EventValueLibrary.cs
similarity index 94%
rename from FlightStreamDeck.SimConnectFSX/EventValueLibrary.cs
rename to FlightStreamDeck.Core/EventValueLibrary.cs
index 9913c5c..fdd3f07 100644
--- a/FlightStreamDeck.SimConnectFSX/EventValueLibrary.cs
+++ b/FlightStreamDeck.Core/EventValueLibrary.cs
@@ -1,14 +1,25 @@
-﻿using FlightStreamDeck.Core;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 
-namespace FlightStreamDeck.SimConnectFSX
+namespace FlightStreamDeck.Core
 {
-    static class EventValueLibrary
+    public static class EventValueLibrary
     {
-        internal const string DEFAULT_UNIT = "number";
-        internal const int DEFAULT_DECIMALS = 0;
+        struct ValueEntry
+        {
+            public ValueEntry(string unit, short decimals)
+            {
+                Unit = unit;
+                Decimals = decimals;
+            }
 
-        internal static Dictionary<TOGGLE_VALUE, ValueEntry> availableValues = new Dictionary<TOGGLE_VALUE, ValueEntry>()
+            public string Unit;
+            public int Decimals;
+        }
+
+        const string DEFAULT_UNIT = "number";
+        const int DEFAULT_DECIMALS = 0;
+
+        static Dictionary<TOGGLE_VALUE, ValueEntry> availableValues = new Dictionary<TOGGLE_VALUE, ValueEntry>()
         {
             { TOGGLE_VALUE.THROTTLE_LOWER_LIMIT, new ValueEntry("Percent", 2) },
             { TOGGLE_VALUE.GENERAL_ENG_RPM__1, new ValueEntry("Rpm", 1) },
@@ -346,44 +357,33 @@ static class EventValueLibrary
             { TOGGLE_VALUE.PROP_THRUST__3, new ValueEntry("Pounds", 2) },
             { TOGGLE_VALUE.PROP_THRUST__4, new ValueEntry("Pounds", 2) },
         };
-    }
 
-    public static class EventValueLibraryExtensions
-    {
-        public static string GetUnit(this TOGGLE_VALUE value, Dictionary<TOGGLE_VALUE, ValueEntry> specifiedValuesWithUnitAndDecimals)
+        public static string GetUnit(this TOGGLE_VALUE value, string unit)
         {
-            string output = EventValueLibrary.DEFAULT_UNIT;
-
-            if (specifiedValuesWithUnitAndDecimals.ContainsKey(value))
+            if (!string.IsNullOrEmpty(unit))
             {
-                output = specifiedValuesWithUnitAndDecimals[value].Unit;
+                // TODO: add some validation
+                return unit;
             }
-            else if (EventValueLibrary.availableValues.ContainsKey(value))
+            else if (availableValues.ContainsKey(value))
             {
-                output = EventValueLibrary.availableValues[value].Unit;
+                return availableValues[value].Unit;
             }
-
-            output = output == null ? EventValueLibrary.DEFAULT_UNIT : output;
-
-            return output;
+            return DEFAULT_UNIT;
         }
 
-        public static int GetDecimals(this TOGGLE_VALUE value, Dictionary<TOGGLE_VALUE, ValueEntry> specifiedValuesWithUnitAndDecimals)
+        public static int GetDecimals(this TOGGLE_VALUE value, int? decimals = null)
         {
-            int output = EventValueLibrary.DEFAULT_DECIMALS;
-
-            if (specifiedValuesWithUnitAndDecimals.ContainsKey(value))
+            if (decimals.HasValue)
             {
-                output = specifiedValuesWithUnitAndDecimals[value].Decimals;
+                return decimals.Value;
             }
-            else if (EventValueLibrary.availableValues.ContainsKey(value))
+            else if (availableValues.ContainsKey(value))
             {
-                output = EventValueLibrary.availableValues[value].Decimals;
+                return availableValues[value].Decimals;
             }
 
-            output = output == int.MinValue ? EventValueLibrary.DEFAULT_DECIMALS : output;
-
-            return output;
+            return DEFAULT_DECIMALS;
         }
     }
 }
diff --git a/FlightStreamDeck.Core/Structs.cs b/FlightStreamDeck.Core/Structs.cs
index d829cc6..3dd33e0 100644
--- a/FlightStreamDeck.Core/Structs.cs
+++ b/FlightStreamDeck.Core/Structs.cs
@@ -1653,16 +1653,4 @@ public static string EventToSimConnectEvent(this TOGGLE_EVENT input)
             return input.ToString().Replace("MOBIFLIGHT_", "MobiFlight.");
         }
     }
-
-    public struct ValueEntry
-    {
-        public ValueEntry(string unit, short decimals)
-        {
-            Unit = unit;
-            Decimals = decimals;
-        }
-
-        public string Unit;
-        public short Decimals;
-    }
 }
diff --git a/FlightStreamDeck.Logics/Actions/GenericGaugeAction.cs b/FlightStreamDeck.Logics/Actions/GenericGaugeAction.cs
index 39d73ac..026ac3c 100644
--- a/FlightStreamDeck.Logics/Actions/GenericGaugeAction.cs
+++ b/FlightStreamDeck.Logics/Actions/GenericGaugeAction.cs
@@ -5,6 +5,7 @@
 using SharpDeck.Events.Received;
 using SharpDeck.Manifest;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Threading.Tasks;
 using EnumConverter = FlightStreamDeck.Core.EnumConverter;
@@ -50,7 +51,7 @@ internal bool EmptyPayload
                 string.IsNullOrEmpty(MinValue) &&
                 string.IsNullOrEmpty(MaxValue) &&
                 string.IsNullOrEmpty(ChartThicknessValue) &&
-                string.IsNullOrEmpty(ChartChevronSizeValue) && 
+                string.IsNullOrEmpty(ChartChevronSizeValue) &&
                 !DisplayHorizontalValue;
         }
     }
@@ -69,13 +70,17 @@ public class GenericGaugeAction : StreamDeckAction<GenericGaugeSettings>
         private TOGGLE_VALUE? displayValueBottom = null;
         private TOGGLE_VALUE? minValue = null;
         private TOGGLE_VALUE? maxValue = null;
-        private ValueEntry displayValueEntry = new ValueEntry();
+        private string customUnit = null;
+        private int? customDecimals = null;
 
-        private float currentValue = 0;
-        private float currentValueBottom = 0;
-        private float currentSubValue = float.MinValue;
+        private double currentValue = 0;
+        private double currentValueBottom = 0;
+        private double currentSubValue = float.MinValue;
 
-        private GenericGaugeSettings defaultSettings => new GenericGaugeSettings()
+        private double? currentMinValue = null;
+        private double? currentMaxValue = null;
+
+        private static readonly GenericGaugeSettings DefaultSettings = new GenericGaugeSettings()
         {
             Type = "Generic",
             DisplayHorizontalValue = true,
@@ -83,7 +88,7 @@ public class GenericGaugeAction : StreamDeckAction<GenericGaugeSettings>
             ChartThicknessValue = "13",
             ChartChevronSizeValue = "3",
             Header = "L",
-            DisplayValue = Core.TOGGLE_VALUE.FUEL_LEFT_QUANTITY.ToString(),
+            DisplayValue = TOGGLE_VALUE.FUEL_LEFT_QUANTITY.ToString(),
             HeaderBottom = string.Empty,
             DisplayValueBottom = string.Empty,
             MinValue = "0",
@@ -100,7 +105,7 @@ public class GenericGaugeAction : StreamDeckAction<GenericGaugeSettings>
         public GenericGaugeAction(ILogger<GenericGaugeAction> logger, IFlightConnector flightConnector, IImageLogic imageLogic,
             EnumConverter enumConverter)
         {
-            this.settings = this.defaultSettings;
+            this.settings = DefaultSettings;
             this.logger = logger;
             this.flightConnector = flightConnector;
             this.imageLogic = imageLogic;
@@ -161,24 +166,40 @@ private async Task InitializeSettings(GenericGaugeSettings settings)
             TOGGLE_VALUE? newDisplayValue = enumConverter.GetVariableEnum(this.settings.DisplayValue);
             TOGGLE_VALUE? newSubDisplayValue = enumConverter.GetVariableEnum(this.settings.SubDisplayValue);
             TOGGLE_VALUE? newDisplayValueBottom = enumConverter.GetVariableEnum(this.settings.DisplayValueBottom);
+
             TOGGLE_VALUE? newMinValue = enumConverter.GetVariableEnum(this.settings.MinValue);
             TOGGLE_VALUE? newMaxValue = enumConverter.GetVariableEnum(this.settings.MaxValue);
 
-            short.TryParse(settings.ValuePrecision, out short result);
-            ValueEntry newDisplayValueEntry = new ValueEntry()
+            if (double.TryParse(string.IsNullOrWhiteSpace(settings.MinValue) ? DefaultSettings.MinValue : settings.MinValue, out var min))
+            {
+                currentMinValue = min;
+            }
+            if (double.TryParse(string.IsNullOrWhiteSpace(settings.MaxValue) ? DefaultSettings.MaxValue : settings.MaxValue, out var max))
+            {
+                currentMaxValue = max;
+            }
+
+            if (int.TryParse(settings.ValuePrecision, out int decimals))
+            {
+                customDecimals = decimals;
+            }
+            else
             {
-                Unit = settings.ValueUnit,
-                Decimals = result
-            };
+                customDecimals = null;
+            }
+
+            var newUnit = settings.ValueUnit?.Trim();
+            if (string.IsNullOrWhiteSpace(newUnit)) newUnit = null;
 
-            if (newDisplayValue != displayValue || newDisplayValueBottom != displayValueBottom || newSubDisplayValue != subDisplayValue || newMinValue != minValue || newMaxValue != maxValue || Newtonsoft.Json.JsonConvert.SerializeObject(newDisplayValueEntry) != Newtonsoft.Json.JsonConvert.SerializeObject(displayValueEntry))
+            if (newDisplayValue != displayValue || newDisplayValueBottom != displayValueBottom || newSubDisplayValue != subDisplayValue ||
+                newMinValue != minValue || newMaxValue != maxValue || newUnit != customUnit)
             {
                 DeRegisterValues();
             }
 
             toggleEvent = newToggleEvent;
             displayValue = newDisplayValue;
-            displayValueEntry = newDisplayValueEntry;
+            customUnit = newUnit;
             subDisplayValue = newSubDisplayValue;
             displayValueBottom = newDisplayValueBottom;
             minValue = newMinValue;
@@ -192,41 +213,42 @@ private async Task UpdatePropertyInspector()
             await this.SendToPropertyInspectorAsync(this.settings);
         }
 
+        private bool SetFromGenericValueStatus(Dictionary<(TOGGLE_VALUE variable, string unit), double> genericValueStatus, TOGGLE_VALUE? variable, string unit, ref double currentValue)
+        {
+            bool isUpdated = false;
+            if (variable.HasValue)
+            {
+                var tuple = (variable.Value, unit);
+                if (genericValueStatus.ContainsKey(tuple))
+                {
+                    var newValue = genericValueStatus[tuple];
+                    isUpdated = currentValue != newValue;
+                    currentValue = newValue;
+                }
+            }
+            return isUpdated;
+        }
+
         private async void FlightConnector_GenericValuesUpdated(object sender, ToggleValueUpdatedEventArgs e)
         {
             if (StreamDeck == null) return;
 
             bool isUpdated = false;
 
-            if (displayValue.HasValue && e.GenericValueStatus.ContainsKey(displayValue.Value))
+            isUpdated |= SetFromGenericValueStatus(e.GenericValueStatus, displayValue, customUnit, ref currentValue);
+            isUpdated |= SetFromGenericValueStatus(e.GenericValueStatus, displayValueBottom, customUnit, ref currentValueBottom);
+            isUpdated |= SetFromGenericValueStatus(e.GenericValueStatus, subDisplayValue, null, ref currentSubValue);
+            double min = 0;
+            if (SetFromGenericValueStatus(e.GenericValueStatus, minValue, null, ref min))
             {
-                float.TryParse(e.GenericValueStatus[displayValue.Value], out float newValue);
-                isUpdated = currentValue != newValue;
-                currentValue = newValue;
+                currentMinValue = min;
+                isUpdated = true;
             }
-            if (displayValueBottom.HasValue && e.GenericValueStatus.ContainsKey(displayValueBottom.Value))
+            double max = 0;
+            if (SetFromGenericValueStatus(e.GenericValueStatus, maxValue, null, ref max))
             {
-                float.TryParse(e.GenericValueStatus[displayValueBottom.Value], out float newValue);
-                isUpdated |= currentValueBottom != newValue;
-                currentValueBottom = newValue;
-            }
-            if (subDisplayValue.HasValue && e.GenericValueStatus.ContainsKey(subDisplayValue.Value))
-            {
-                float.TryParse(e.GenericValueStatus[subDisplayValue.Value], out float newValue);
-                isUpdated |= currentSubValue != newValue;
-                currentSubValue = newValue;
-            }
-            if (minValue.HasValue && e.GenericValueStatus.ContainsKey(minValue.Value))
-            {
-                float.TryParse(e.GenericValueStatus[minValue.Value], out float newValue);
-                isUpdated |= settings.MinValue != newValue.ToString(this.precision);
-                settings.MinValue = newValue.ToString(this.precision);
-            }
-            if (maxValue.HasValue && e.GenericValueStatus.ContainsKey(maxValue.Value))
-            {
-                float.TryParse(e.GenericValueStatus[maxValue.Value], out float newValue);
-                isUpdated |= settings.MaxValue != newValue.ToString(this.precision);
-                settings.MaxValue = newValue.ToString(this.precision);
+                currentMaxValue = max;
+                isUpdated = true;
             }
 
             if (isUpdated)
@@ -238,20 +260,34 @@ private async void FlightConnector_GenericValuesUpdated(object sender, ToggleVal
         private void RegisterValues()
         {
             if (toggleEvent.HasValue) flightConnector.RegisterToggleEvent(toggleEvent.Value);
-            if (displayValue.HasValue) flightConnector.RegisterSimValue(displayValue.Value, displayValueEntry);
-            if (subDisplayValue.HasValue) flightConnector.RegisterSimValue(subDisplayValue.Value, displayValueEntry);
-            if (displayValueBottom.HasValue) flightConnector.RegisterSimValue(displayValueBottom.Value);
-            if (minValue.HasValue) flightConnector.RegisterSimValue(minValue.Value);
-            if (maxValue.HasValue) flightConnector.RegisterSimValue(maxValue.Value);
+
+            var values = new List<(TOGGLE_VALUE variables, string unit)>();
+            if (displayValue.HasValue) values.Add((displayValue.Value, customUnit));
+            if (subDisplayValue.HasValue) values.Add((subDisplayValue.Value, customUnit));
+            if (displayValueBottom.HasValue) values.Add((displayValueBottom.Value, customUnit));
+            if (minValue.HasValue) values.Add((minValue.Value, null));
+            if (maxValue.HasValue) values.Add((maxValue.Value, null));
+
+            if (values.Count > 0)
+            {
+                flightConnector.RegisterSimValues(values.ToArray());
+            }
         }
 
         private void DeRegisterValues()
         {
-            if (displayValue.HasValue) flightConnector.DeRegisterSimValue(displayValue.Value, displayValueEntry);
-            if (subDisplayValue.HasValue) flightConnector.DeRegisterSimValue(subDisplayValue.Value, displayValueEntry);
-            if (displayValueBottom.HasValue) flightConnector.DeRegisterSimValue(displayValueBottom.Value);
-            if (minValue.HasValue) flightConnector.DeRegisterSimValue(minValue.Value);
-            if (maxValue.HasValue) flightConnector.DeRegisterSimValue(maxValue.Value);
+            var values = new List<(TOGGLE_VALUE variables, string unit)>();
+            if (displayValue.HasValue) values.Add((displayValue.Value, customUnit));
+            if (subDisplayValue.HasValue) values.Add((subDisplayValue.Value, customUnit));
+            if (displayValueBottom.HasValue) values.Add((displayValueBottom.Value, customUnit));
+            if (minValue.HasValue) values.Add((minValue.Value, null));
+            if (maxValue.HasValue) values.Add((maxValue.Value, null));
+
+            if (values.Count > 0)
+            {
+                flightConnector.DeRegisterSimValues(values.ToArray());
+            }
+
             currentValue = 0;
             currentValueBottom = 0;
             currentSubValue = float.MinValue;
@@ -259,60 +295,63 @@ private void DeRegisterValues()
 
         private async Task UpdateImage()
         {
-            if (settings != null)
+            if (settings != null &&
+                currentMinValue.HasValue && currentMaxValue.HasValue)
             {
-                float MinValue = settings.MinValue.ConvertTo<float>(this.defaultSettings.MinValue);
-                float MaxValue = settings.MaxValue.ConvertTo<float>(this.defaultSettings.MaxValue);
-                string chartSplit = string.IsNullOrEmpty(settings.ChartSplitValue) ? defaultSettings.ChartSplitValue : settings.ChartSplitValue;
-                if (settings.Type?.Equals("Custom", StringComparison.OrdinalIgnoreCase) ?? false)
-                {
-                    bool.TryParse(settings.AbsValText, out bool absValueText);
-
-                    int chartThickness = settings.ChartThicknessValue.ConvertTo<int>(this.defaultSettings.ChartThicknessValue);
-                    float chartChevronSize = settings.ChartChevronSizeValue.ConvertTo<int>(this.defaultSettings.ChartChevronSizeValue);
-                    int modifier = MinValue > MaxValue ? -1 : 1;
-                    await SetImageAsync(
-                        imageLogic.GetCustomGaugeImage(
-                            settings.Header,
-                            settings.HeaderBottom,
-                            (currentValue * modifier).ToString(this.precision),
-                            (currentValueBottom * modifier).ToString(this.precision),
-                            MinValue,
-                            MaxValue,
-                            settings.DisplayHorizontalValue,
-                            chartSplit?.Split(','),
-                            chartThickness,
-                            chartChevronSize,
-                            absValueText,
-                            precision,
-                            settings.HideLabelOutsideMinMaxTop,
-                            settings.HideLabelOutsideMinMaxBottom
-                        )
-                    );
-                }
-                else
+                switch (settings.Type)
                 {
-                    await SetImageAsync(
-                        imageLogic.GetGenericGaugeImage(
-                            settings.Header,
-                            currentValue,
-                            MinValue,
-                            MaxValue,
-                            precision,
-                            currentSubValue
-                        )
-                    );
+                    case "Custom":
+                        if (displayValue.HasValue || displayValueBottom.HasValue)
+                        {
+                            var chartSplit = string.IsNullOrEmpty(settings.ChartSplitValue) ? DefaultSettings.ChartSplitValue : settings.ChartSplitValue;
+                            var numberFormat = $"F{EventValueLibrary.GetDecimals(displayValue ?? displayValueBottom.Value, customDecimals)}";
+
+                            bool.TryParse(settings.AbsValText, out bool absValueText);
+
+                            int chartThickness = settings.ChartThicknessValue.ConvertTo<int>(DefaultSettings.ChartThicknessValue);
+                            float chartChevronSize = settings.ChartChevronSizeValue.ConvertTo<int>(DefaultSettings.ChartChevronSizeValue);
+                            int modifier = currentMinValue.Value > currentMaxValue.Value ? -1 : 1;
+                            await SetImageAsync(
+                                imageLogic.GetCustomGaugeImage(
+                                    settings.Header,
+                                    settings.HeaderBottom,
+                                    currentValue * modifier,
+                                    currentValueBottom * modifier,
+                                    currentMinValue.Value,
+                                    currentMaxValue.Value,
+                                    numberFormat,
+                                    settings.DisplayHorizontalValue,
+                                    chartSplit?.Split(','),
+                                    chartThickness,
+                                    chartChevronSize,
+                                    absValueText,
+                                    settings.HideLabelOutsideMinMaxTop,
+                                    settings.HideLabelOutsideMinMaxBottom
+                                )
+                            );
+                        }
+                        break;
+                    default:
+                        if (displayValue.HasValue || displayValueBottom.HasValue)
+                        {
+                            var numberFormat = "F" + (displayValue.HasValue ? EventValueLibrary.GetDecimals(displayValue.Value, customDecimals) : 2);
+                            var subValueText = subDisplayValue.HasValue ? currentSubValue.ToString("F" + EventValueLibrary.GetDecimals(subDisplayValue.Value)) : null;
+                            await SetImageAsync(
+                                imageLogic.GetGenericGaugeImage(
+                                    settings.Header,
+                                    currentValue,
+                                    currentMinValue.Value,
+                                    currentMaxValue.Value,
+                                    numberFormat,
+                                    subValueText
+                                )
+                            );
+                        }
+
+                        break;
                 }
             }
         }
-
-        private string precision
-        {
-            get
-            {
-                return $"F{((settings.ValuePrecision?.Length ?? 0) > 0 ? settings.ValuePrecision : this.defaultSettings.ValuePrecision)}";
-            }
-        }
     }
 
     public static class GenericGaugeActionExtensions
diff --git a/FlightStreamDeck.Logics/Actions/GenericToggleAction.cs b/FlightStreamDeck.Logics/Actions/GenericToggleAction.cs
index 61f79d3..e1f5210 100644
--- a/FlightStreamDeck.Logics/Actions/GenericToggleAction.cs
+++ b/FlightStreamDeck.Logics/Actions/GenericToggleAction.cs
@@ -57,14 +57,16 @@ public class GenericToggleAction : StreamDeckAction<GenericToggleSettings>
         private TOGGLE_EVENT? toggleEvent = null;
         private uint? toggleEventDataUInt = null;
         private TOGGLE_VALUE? toggleEventDataVariable = null;
-        private string toggleEventDataVariableValue = null;
+        private double? toggleEventDataVariableValue = null;
 
         private IEnumerable<TOGGLE_VALUE> feedbackVariables = new List<TOGGLE_VALUE>();
         private IExpression expression;
         private TOGGLE_VALUE? displayValue = null;
-        private ValueEntry displayValueEntry;
 
-        private string currentValue = "";
+        private string customUnit = null;
+        private int? customDecimals = null;
+
+        private double? currentValue = null;
         private bool currentStatus = false;
 
         public GenericToggleAction(ILogger<GenericToggleAction> logger, IFlightConnector flightConnector, IImageLogic imageLogic,
@@ -99,15 +101,15 @@ private void InitializeSettings(GenericToggleSettings settings)
             (var newFeedbackVariables, var newExpression) = evaluator.Parse(settings.FeedbackValue);
             TOGGLE_VALUE? newDisplayValue = enumConverter.GetVariableEnum(settings.DisplayValue);
 
-            short.TryParse(settings.DisplayValuePrecision, out short result);
-            ValueEntry newDisplayValueEntry = new ValueEntry()
+            if (int.TryParse(settings.DisplayValuePrecision, out int decimals))
             {
-                Unit = settings.DisplayValueUnit,
-                Decimals = result
-            };
+                customDecimals = decimals;
+            }
+            var newUnit = settings.DisplayValueUnit?.Trim();
+            if (string.IsNullOrWhiteSpace(newUnit)) newUnit = null;
 
             if (!newFeedbackVariables.SequenceEqual(feedbackVariables) || newDisplayValue != displayValue
-                || JsonConvert.SerializeObject(newDisplayValueEntry) != JsonConvert.SerializeObject(displayValueEntry)
+                || newUnit != customUnit
                 || newToggleEventDataVariable != toggleEventDataVariable
                 )
             {
@@ -118,7 +120,7 @@ private void InitializeSettings(GenericToggleSettings settings)
             feedbackVariables = newFeedbackVariables;
             expression = newExpression;
             displayValue = newDisplayValue;
-            displayValueEntry = newDisplayValueEntry;
+            customUnit = newUnit;
             toggleEventDataUInt = newToggleEventDataUInt;
             toggleEventDataVariable = newToggleEventDataVariable;
 
@@ -129,20 +131,21 @@ private async void FlightConnector_GenericValuesUpdated(object sender, ToggleVal
         {
             if (StreamDeck == null) return;
 
-            var newStatus = expression != null && evaluator.Evaluate(e.GenericValueStatus, expression);
+            var valuesWithDefaultUnits = e.GenericValueStatus.Where(o => o.Key.unit == null).ToDictionary(o => o.Key.variable, o => o.Value);
+            var newStatus = expression != null && evaluator.Evaluate(valuesWithDefaultUnits, expression);
             var isUpdated = newStatus != currentStatus;
             currentStatus = newStatus;
 
-            if (displayValue.HasValue && e.GenericValueStatus.ContainsKey(displayValue.Value))
+            if (displayValue.HasValue && e.GenericValueStatus.ContainsKey((displayValue.Value, customUnit)))
             {
-                string newValue = e.GenericValueStatus[displayValue.Value];
+                var newValue = e.GenericValueStatus[(displayValue.Value, customUnit)];
                 isUpdated |= newValue != currentValue;
                 currentValue = newValue;
             }
 
-            if (toggleEventDataVariable.HasValue && e.GenericValueStatus.ContainsKey(toggleEventDataVariable.Value))
+            if (toggleEventDataVariable.HasValue && e.GenericValueStatus.ContainsKey((toggleEventDataVariable.Value, null)))
             {
-                toggleEventDataVariableValue = e.GenericValueStatus[toggleEventDataVariable.Value];
+                toggleEventDataVariableValue = e.GenericValueStatus[(toggleEventDataVariable.Value, null)];
             }
 
             if (isUpdated)
@@ -248,16 +251,30 @@ await SendToPropertyInspectorAsync(new
         private void RegisterValues()
         {
             if (toggleEvent.HasValue) flightConnector.RegisterToggleEvent(toggleEvent.Value);
-            foreach (var feedbackVariable in feedbackVariables) flightConnector.RegisterSimValue(feedbackVariable);
-            if (displayValue.HasValue) flightConnector.RegisterSimValue(displayValue.Value, displayValueEntry);
-            if (toggleEventDataVariable.HasValue) flightConnector.RegisterSimValue(toggleEventDataVariable.Value);
+
+            var values = new List<(TOGGLE_VALUE variables, string unit)>();
+            foreach (var feedbackVariable in feedbackVariables) values.Add((feedbackVariable, null));
+            if (displayValue.HasValue) values.Add((displayValue.Value, customUnit));
+            if (toggleEventDataVariable.HasValue) values.Add((toggleEventDataVariable.Value, null));
+
+            if (values.Count > 0)
+            {
+                flightConnector.RegisterSimValues(values.ToArray());
+            }
         }
 
         private void DeRegisterValues()
         {
-            foreach (var feedbackVariable in feedbackVariables) flightConnector.DeRegisterSimValue(feedbackVariable);
-            if (displayValue.HasValue) flightConnector.DeRegisterSimValue(displayValue.Value, displayValueEntry);
-            if (toggleEventDataVariable.HasValue) flightConnector.DeRegisterSimValue(toggleEventDataVariable.Value);
+            var values = new List<(TOGGLE_VALUE variables, string unit)>();
+            foreach (var feedbackVariable in feedbackVariables) values.Add((feedbackVariable, null));
+            if (displayValue.HasValue) values.Add((displayValue.Value, customUnit));
+            if (toggleEventDataVariable.HasValue) values.Add((toggleEventDataVariable.Value, null));
+
+            if (values.Count > 0)
+            {
+                flightConnector.DeRegisterSimValues(values.ToArray());
+            }
+
             currentValue = null;
             toggleEventDataVariableValue = null;
         }
@@ -266,9 +283,9 @@ protected override Task OnKeyDown(ActionEventArgs<KeyPayload> args)
         {
             if (toggleEvent.HasValue)
             {
-                if (!(toggleEventDataVariable is null) && double.TryParse(toggleEventDataVariableValue, out double parameterValue))
+                if (!(toggleEventDataVariable is null) && toggleEventDataVariableValue.HasValue)
                 {
-                    uint parameterForSimConnect = Convert.ToUInt32(Math.Round(parameterValue));
+                    uint parameterForSimConnect = Convert.ToUInt32(Math.Round(toggleEventDataVariableValue.Value));
                     flightConnector.Trigger(toggleEvent.Value, parameterForSimConnect);
                 }
                 else
@@ -297,7 +314,8 @@ private async Task UpdateImage()
                     s = s.Replace('-', '+').Replace('_', '/').PadRight(4 * ((s.Length + 3) / 4), '=');
                     imageOffBytes = Convert.FromBase64String(s);
                 }
-                await SetImageAsync(imageLogic.GetImage(settings.Header, currentStatus, currentValue,
+                await SetImageAsync(imageLogic.GetImage(settings.Header, currentStatus,
+                    value: (displayValue.HasValue && currentValue.HasValue) ? currentValue.Value.ToString("F" + EventValueLibrary.GetDecimals(displayValue.Value, customDecimals)) : "",
                     imageOnFilePath: settings.ImageOn, imageOnBytes: imageOnBytes,
                     imageOffFilePath: settings.ImageOff, imageOffBytes: imageOffBytes));
             }
diff --git a/FlightStreamDeck.Logics/Actions/HorizonAction.cs b/FlightStreamDeck.Logics/Actions/HorizonAction.cs
index 546fb65..3ca61fa 100644
--- a/FlightStreamDeck.Logics/Actions/HorizonAction.cs
+++ b/FlightStreamDeck.Logics/Actions/HorizonAction.cs
@@ -18,13 +18,9 @@ public class HorizonAction : StreamDeckAction
         private TOGGLE_VALUE pitchValue = TOGGLE_VALUE.PLANE_PITCH_DEGREES;
         private TOGGLE_VALUE headingValue = TOGGLE_VALUE.PLANE_HEADING_DEGREES_MAGNETIC;
 
-        private string lastRawHeading = "";
-        private string lastRawBank = "";
-        private string lastRawPitch = "";
-
-        private float currentHeadingValue = 0.0f;
-        private float currentBankValue = 0.0f;
-        private float currentPitchValue = 0.0f;
+        private double currentHeadingValue = 0;
+        private double currentBankValue = 0;
+        private double currentPitchValue = 0;
 
         public HorizonAction(ILogger<HorizonAction> logger, IFlightConnector flightConnector, IImageLogic imageLogic)
         {
@@ -46,22 +42,19 @@ private async void FlightConnector_GenericValuesUpdated(object sender, ToggleVal
         {
             bool isUpdated = false;
 
-            if (e.GenericValueStatus.ContainsKey(bankValue) && lastRawBank != e.GenericValueStatus[bankValue])
+            if (e.GenericValueStatus.ContainsKey((bankValue, null)) && currentBankValue != e.GenericValueStatus[(bankValue, null)])
             {
-                lastRawBank = e.GenericValueStatus[bankValue];
-                float.TryParse(lastRawBank, out currentBankValue);
+                currentBankValue = e.GenericValueStatus[(bankValue, null)];
                 isUpdated = true;
             }
-            if (e.GenericValueStatus.ContainsKey(headingValue) && lastRawHeading != e.GenericValueStatus[headingValue])
+            if (e.GenericValueStatus.ContainsKey((headingValue, null)) && currentHeadingValue != e.GenericValueStatus[(headingValue, null)])
             {
-                lastRawHeading = e.GenericValueStatus[headingValue];
-                float.TryParse(lastRawHeading, out currentHeadingValue);
+                currentHeadingValue = e.GenericValueStatus[(headingValue, null)];
                 isUpdated = true;
             }
-            if (e.GenericValueStatus.ContainsKey(pitchValue) && lastRawPitch != e.GenericValueStatus[pitchValue])
+            if (e.GenericValueStatus.ContainsKey((pitchValue, null)) && currentPitchValue != e.GenericValueStatus[(pitchValue, null)])
             {
-                lastRawPitch = e.GenericValueStatus[pitchValue];
-                float.TryParse(lastRawPitch, out currentPitchValue);
+                currentPitchValue = e.GenericValueStatus[(pitchValue, null)];
                 isUpdated = true;
             }
 
@@ -80,12 +73,12 @@ protected override Task OnWillDisappear(ActionEventArgs<AppearancePayload> args)
 
         private void RegisterValues()
         {
-            flightConnector.RegisterSimValues(bankValue, pitchValue);
+            flightConnector.RegisterSimValues((bankValue, null), (pitchValue, null));
         }
 
         private void DeRegisterValues()
         {
-            flightConnector.DeRegisterSimValues(bankValue, pitchValue);
+            flightConnector.DeRegisterSimValues((bankValue, null), (pitchValue, null));
         }
 
         protected override Task OnKeyDown(ActionEventArgs<KeyPayload> args)
diff --git a/FlightStreamDeck.Logics/Actions/NavComAction.cs b/FlightStreamDeck.Logics/Actions/NavComAction.cs
index 6690889..7801208 100644
--- a/FlightStreamDeck.Logics/Actions/NavComAction.cs
+++ b/FlightStreamDeck.Logics/Actions/NavComAction.cs
@@ -178,24 +178,24 @@ private async void FlightConnector_GenericValuesUpdated(object sender, ToggleVal
                 bool dependant = true;
                 bool showMainOnly = false;
 
-                if (dependantOnBatt != null && e.GenericValueStatus.ContainsKey(dependantOnBatt.Value))
+                if (dependantOnBatt != null && e.GenericValueStatus.ContainsKey((dependantOnBatt.Value, null)))
                 {
-                    dependant = e.GenericValueStatus[dependantOnBatt.Value] != "0";
+                    dependant = e.GenericValueStatus[(dependantOnBatt.Value, null)] != 0;
                 }
-                if (dependantOnAvionics != null && e.GenericValueStatus.ContainsKey(dependantOnAvionics.Value))
+                if (dependantOnAvionics != null && e.GenericValueStatus.ContainsKey((dependantOnAvionics.Value, null)))
                 {
-                    dependant = dependant && e.GenericValueStatus[dependantOnAvionics.Value] != "0";
+                    dependant = dependant && e.GenericValueStatus[(dependantOnAvionics.Value, null)] != 0;
                 }
 
-                if (active != null && e.GenericValueStatus.ContainsKey(active.Value))
+                if (active != null && e.GenericValueStatus.ContainsKey((active.Value, null)))
                 {
                     showMainOnly = true;
-                    value1 = dependant ? e.GenericValueStatus[active.Value] : string.Empty;
+                    value1 = dependant ? e.GenericValueStatus[(active.Value, null)].ToString("F" + EventValueLibrary.GetDecimals(active.Value)) : string.Empty;
                     if (settings.Type == "XPDR" && value1 != string.Empty) value1 = value1.PadLeft(4, '0');
                 }
-                if (standby != null && e.GenericValueStatus.ContainsKey(standby.Value))
+                if (standby != null && e.GenericValueStatus.ContainsKey((standby.Value, null)))
                 {
-                    value2 = dependant ? e.GenericValueStatus[standby.Value] : string.Empty;
+                    value2 = dependant ? e.GenericValueStatus[(standby.Value, null)].ToString("F" + EventValueLibrary.GetDecimals(active.Value)) : string.Empty;
                     showMainOnly = active != null && active.Value == standby.Value;
                 }
 
@@ -211,14 +211,14 @@ private async void FlightConnector_GenericValuesUpdated(object sender, ToggleVal
 
         private void SwitchTo(string type)
         {
-            var existing = new List<TOGGLE_VALUE>();
+            var existing = new List<(TOGGLE_VALUE variables, string unit)>();
             if (active != null)
             {
-                existing.Add(active.Value);
+                existing.Add((active.Value, null));
             }
             if (standby != null)
             {
-                existing.Add(standby.Value);
+                existing.Add((standby.Value, null));
             }
             if (existing.Count > 0)
             {
@@ -270,9 +270,11 @@ private void SwitchTo(string type)
                     lastValue2 = null;
                     break;
             }
+            var values = new List<(TOGGLE_VALUE variable, string unit)>();
             if (type != null)
             {
-                flightConnector.RegisterSimValues(active.Value, standby.Value);
+                values.Add((active.Value, null));
+                values.Add((standby.Value, null));
             }
             if (toggle != null)
             {
@@ -284,11 +286,15 @@ private void SwitchTo(string type)
             }
             if (dependantOnAvionics != null)
             {
-                flightConnector.RegisterSimValues(dependantOnAvionics.Value);
+                values.Add((dependantOnAvionics.Value, null));
             }
             if (dependantOnBatt != null)
             {
-                flightConnector.RegisterSimValues(dependantOnBatt.Value);
+                values.Add((dependantOnBatt.Value, null));
+            }
+            if (values.Count > 0)
+            {
+                flightConnector.RegisterSimValues(values.ToArray());
             }
         }
 
diff --git a/FlightStreamDeck.Logics/Evaluators/ComparisonEvaluator.cs b/FlightStreamDeck.Logics/Evaluators/ComparisonEvaluator.cs
index a199acb..c7757a3 100644
--- a/FlightStreamDeck.Logics/Evaluators/ComparisonEvaluator.cs
+++ b/FlightStreamDeck.Logics/Evaluators/ComparisonEvaluator.cs
@@ -22,8 +22,8 @@ public Expression(TOGGLE_VALUE? feedbackVariable, TOGGLE_VALUE? feedbackComparis
             public string FeedbackComparisonStringValue { get; }
             public string FeedbackComparisonOperator { get; }
 
-            public string PreviousFeedbackValue { get; set; }
-            public string PreviousFeedbackComparisonValue { get; set; }
+            public double? PreviousFeedbackValue { get; set; }
+            public double? PreviousFeedbackComparisonValue { get; set; }
             public bool PreviousResult { get; set; }
         }
 
@@ -45,12 +45,12 @@ public ComparisonEvaluator(EnumConverter enumConverter)
             return (list, new Expression(feedbackVariable, feedbackComparisonVariable, feedbackComparisonStringValue, feedbackComparisonOperator));
         }
 
-        public bool Evaluate(Dictionary<TOGGLE_VALUE, string> values, IExpression expression)
+        public bool Evaluate(Dictionary<TOGGLE_VALUE, double> values, IExpression expression)
         {
             if (expression is Expression compareExpression)
             {
-                string feedbackValue = string.Empty;
-                string comparisonFeedbackValue = string.Empty;
+                double? feedbackValue = null;
+                double? comparisonFeedbackValue = null;
 
                 if (compareExpression.FeedbackVariable.HasValue && values.ContainsKey(compareExpression.FeedbackVariable.Value))
                 {
@@ -59,8 +59,17 @@ public bool Evaluate(Dictionary<TOGGLE_VALUE, string> values, IExpression expres
 
                 if (compareExpression.FeedbackComparisonVariable.HasValue && values.ContainsKey(compareExpression.FeedbackComparisonVariable.Value))
                 {
+                    // Compare to a variable
                     comparisonFeedbackValue = values[compareExpression.FeedbackComparisonVariable.Value];
                 }
+                else
+                {
+                    // Compare to a number
+                    if (double.TryParse(compareExpression.FeedbackComparisonStringValue, out var number))
+                    {
+                        comparisonFeedbackValue = number;
+                    }
+                }
 
                 if (feedbackValue == compareExpression.PreviousFeedbackValue
                     && comparisonFeedbackValue == compareExpression.PreviousFeedbackComparisonValue)
@@ -71,11 +80,9 @@ public bool Evaluate(Dictionary<TOGGLE_VALUE, string> values, IExpression expres
                 compareExpression.PreviousFeedbackValue = feedbackValue;
                 compareExpression.PreviousFeedbackComparisonValue = comparisonFeedbackValue;
 
-                if (!string.IsNullOrEmpty(feedbackValue) &&
-                    (!string.IsNullOrEmpty(comparisonFeedbackValue) || !string.IsNullOrEmpty(compareExpression.FeedbackComparisonStringValue)))
+                if (feedbackValue.HasValue && comparisonFeedbackValue.HasValue)
                 {
-                    compareExpression.PreviousResult = CompareValues(feedbackValue,
-                        !string.IsNullOrEmpty(comparisonFeedbackValue) ? comparisonFeedbackValue : compareExpression.FeedbackComparisonStringValue, compareExpression.FeedbackComparisonOperator);
+                    compareExpression.PreviousResult = CompareValues(feedbackValue.Value, comparisonFeedbackValue.Value, compareExpression.FeedbackComparisonOperator);
                     return compareExpression.PreviousResult;
                 }
                 return false;
@@ -111,7 +118,7 @@ public bool Evaluate(Dictionary<TOGGLE_VALUE, string> values, IExpression expres
                 return new Tuple<TOGGLE_VALUE?, TOGGLE_VALUE?, string, string>(result, null, "0", "!=");
             }
             else
-            { 
+            {
                 IEnumerable<string> comparisonAttempt = AllowedComparisons.Where((string allowedComp) => value.Contains(allowedComp));
 
                 if (comparisonAttempt.Count() >= 1)
@@ -135,48 +142,33 @@ public bool Evaluate(Dictionary<TOGGLE_VALUE, string> values, IExpression expres
                     }
                 }
 
-               return new Tuple<TOGGLE_VALUE?, TOGGLE_VALUE?, string, string>(null, null, string.Empty, string.Empty);
+                return new Tuple<TOGGLE_VALUE?, TOGGLE_VALUE?, string, string>(null, null, string.Empty, string.Empty);
             }
         }
 
-        public bool CompareValues(string currentValue, string comparisonValue, string operatorValue)
+        public bool CompareValues(double currentValue, double comparisonValue, string operatorValue)
         {
             bool output = false;
 
-            bool successCurrent = int.TryParse(currentValue, out int currentValueInt);
-            bool successComparison = int.TryParse(comparisonValue, out int comparisonValueInt);
-
             switch (operatorValue)
             {
                 case OperatorEquals:
-                    output = successCurrent && successComparison ?
-                        currentValueInt == comparisonValueInt :
-                        currentValue == comparisonValue;
+                    output = currentValue == comparisonValue;
                     break;
                 case OperatorNotEquals:
-                    output = successCurrent && successComparison ?
-                        currentValueInt != comparisonValueInt :
-                        currentValue != comparisonValue;
+                    output = currentValue != comparisonValue;
                     break;
                 case OperatorGreater:
-                    output = successCurrent && successComparison ?
-                        currentValueInt > comparisonValueInt :
-                        string.Compare(currentValue, comparisonValue) > 0;
+                    output = currentValue > comparisonValue;
                     break;
                 case OperatorLess:
-                    output = successCurrent && successComparison ?
-                        currentValueInt < comparisonValueInt :
-                        string.Compare(currentValue, comparisonValue) < 0;
+                    output = currentValue < comparisonValue;
                     break;
                 case OperatorGreaterOrEquals:
-                    output = successCurrent && successComparison ?
-                        currentValueInt >= comparisonValueInt :
-                        string.Compare(currentValue, comparisonValue) >= 0;
+                    output = currentValue >= comparisonValue;
                     break;
                 case OperatorLessOrEquals:
-                    output = successCurrent && successComparison ?
-                        currentValueInt <= comparisonValueInt :
-                        string.Compare(currentValue, comparisonValue) <= 0;
+                    output = currentValue <= comparisonValue;
                     break;
             }
 
diff --git a/FlightStreamDeck.Logics/Evaluators/IEvaluator.cs b/FlightStreamDeck.Logics/Evaluators/IEvaluator.cs
index 4a62c27..a3e4ccb 100644
--- a/FlightStreamDeck.Logics/Evaluators/IEvaluator.cs
+++ b/FlightStreamDeck.Logics/Evaluators/IEvaluator.cs
@@ -11,6 +11,6 @@ public interface IExpression
     public interface IEvaluator
     {
         (IEnumerable<TOGGLE_VALUE>, IExpression) Parse(string feedbackValue);
-        bool Evaluate(Dictionary<TOGGLE_VALUE, string> values, IExpression expression);
+        bool Evaluate(Dictionary<TOGGLE_VALUE, double> values, IExpression expression);
     }
 }
diff --git a/FlightStreamDeck.Logics/Evaluators/SimpleEvaluator.cs b/FlightStreamDeck.Logics/Evaluators/SimpleEvaluator.cs
index 991f38c..34a194f 100644
--- a/FlightStreamDeck.Logics/Evaluators/SimpleEvaluator.cs
+++ b/FlightStreamDeck.Logics/Evaluators/SimpleEvaluator.cs
@@ -33,13 +33,13 @@ public SimpleEvaluator(EnumConverter enumConverter)
             return (new List<TOGGLE_VALUE> { variable.Value }, new Expression(variable.Value));
         }
 
-        public bool Evaluate(Dictionary<TOGGLE_VALUE, string> values, IExpression expression)
+        public bool Evaluate(Dictionary<TOGGLE_VALUE, double> values, IExpression expression)
         {
             if (expression is Expression simpleExpression)
             {
                 if (values.ContainsKey(simpleExpression.Variable))
                 {
-                    return values[simpleExpression.Variable] != "0";
+                    return values[simpleExpression.Variable] != 0;
                 }
                 return false;
             }
diff --git a/FlightStreamDeck.Logics/IFlightConnector.cs b/FlightStreamDeck.Logics/IFlightConnector.cs
index 6e16f39..755b9fc 100644
--- a/FlightStreamDeck.Logics/IFlightConnector.cs
+++ b/FlightStreamDeck.Logics/IFlightConnector.cs
@@ -45,13 +45,8 @@ public interface IFlightConnector
 
         void RegisterToggleEvent(TOGGLE_EVENT toggleAction);
 
-        void RegisterSimValue(TOGGLE_VALUE simValue);
-        void RegisterSimValue(TOGGLE_VALUE simValue, ValueEntry simValueEntry);
-        void DeRegisterSimValue(TOGGLE_VALUE simValue);
-        void DeRegisterSimValue(TOGGLE_VALUE simValue, ValueEntry simValueEntry);
-
-        void RegisterSimValues(params TOGGLE_VALUE[] simValues);
-        void DeRegisterSimValues(params TOGGLE_VALUE[] simValues);
+        void RegisterSimValues(params (TOGGLE_VALUE variables, string unit)[] simValues);
+        void DeRegisterSimValues(params (TOGGLE_VALUE variables, string unit)[] simValues);
     }
 
     public class AircraftStatusUpdatedEventArgs : EventArgs
@@ -66,12 +61,12 @@ public AircraftStatusUpdatedEventArgs(AircraftStatus aircraftStatus)
 
     public class ToggleValueUpdatedEventArgs : EventArgs
     {
-        public ToggleValueUpdatedEventArgs(Dictionary<TOGGLE_VALUE, string> toggleValueStatus)
+        public ToggleValueUpdatedEventArgs(Dictionary<(TOGGLE_VALUE variable, string unit), double> genericValueStatus)
         {
-            GenericValueStatus = toggleValueStatus;
+            GenericValueStatus = genericValueStatus;
         }
 
-        public Dictionary<TOGGLE_VALUE, string> GenericValueStatus { get; }
+        public Dictionary<(TOGGLE_VALUE variable, string unit), double> GenericValueStatus { get; }
     }
 
     public class AircraftStatus
diff --git a/FlightStreamDeck.Logics/ImageLogic.cs b/FlightStreamDeck.Logics/ImageLogic.cs
index 039e753..8b01723 100644
--- a/FlightStreamDeck.Logics/ImageLogic.cs
+++ b/FlightStreamDeck.Logics/ImageLogic.cs
@@ -14,9 +14,9 @@ public interface IImageLogic
         string GetImage(string text, bool active, string value = null, string imageOnFilePath = null, byte[] imageOnBytes = null, string imageOffFilePath = null, byte[] imageOffBytes = null);
         string GetNumberImage(int number);
         string GetNavComImage(string type, bool dependant, string value1 = null, string value2 = null, bool showMainOnly = false);
-        public string GetHorizonImage(float pitchInDegrees, float rollInDegrees, float headingInDegrees);
-        public string GetGenericGaugeImage(string text, float value, float min, float max, string valuePrecision, float subValue = float.MinValue);
-        public string GetCustomGaugeImage(string textTop, string textBottom, string valueTop, string valueBottom, float min, float max, bool horizontal, string[] chartSplits, int chartWidth, float chevronSize, bool absoluteValueText, string valuePrecision, bool hideHeaderTop, bool hideHeaderBottom);
+        public string GetHorizonImage(double pitchInDegrees, double rollInDegrees, double headingInDegrees);
+        public string GetGenericGaugeImage(string text, double value, double min, double max, string valueFormat, string subValueText = null);
+        public string GetCustomGaugeImage(string textTop, string textBottom, double valueTop, double valueBottom, double min, double max, string valueFormat, bool horizontal, string[] chartSplits, int chartWidth, float chevronSize, bool absoluteValueText, bool hideHeaderTop, bool hideHeaderBottom);
     }
 
     public class ImageLogic : IImageLogic
@@ -170,7 +170,7 @@ public string GetNavComImage(string type, bool dependant, string value1 = null,
             return "data:image/png;base64, " + base64;
         }
 
-        public string GetHorizonImage(float pitchInDegrees, float rollInDegrees, float headingInDegrees)
+        public string GetHorizonImage(double pitchInDegrees, double rollInDegrees, double headingInDegrees)
         {
             //var font = SystemFonts.CreateFont("Arial", 10, FontStyle.Regular);
             //var valueFont = SystemFonts.CreateFont("Arial", 12, FontStyle.Regular);
@@ -184,7 +184,7 @@ public string GetHorizonImage(float pitchInDegrees, float rollInDegrees, float h
                     (int)Math.Round((float)-size.Width / 2 + 52),
                     (int)Math.Round((float)-size.Height / 2 + 52 - (pitchInDegrees * 2))
                     ), new GraphicsOptions());
-                ctx.Rotate(rollInDegrees);
+                ctx.Rotate((float)rollInDegrees);
             });
 
             using (var img = new Image<Rgba32>(WIDTH, WIDTH))
@@ -214,7 +214,7 @@ public string GetHorizonImage(float pitchInDegrees, float rollInDegrees, float h
             }
         }
 
-        public string GetGenericGaugeImage(string text, float value, float min, float max, string valuePrecision, float subValue = float.MinValue)
+        public string GetGenericGaugeImage(string text, double value, double min, double max, string valueFormat, string subValueText = null)
         {
             var font = SystemFonts.CreateFont("Arial", 22, FontStyle.Regular);
             var titleFont = SystemFonts.CreateFont("Arial", 13, FontStyle.Regular);
@@ -256,12 +256,13 @@ public string GetGenericGaugeImage(string text, float value, float min, float ma
                     ctx.DrawText(text, titleFont, Color.White, new PointF(HALF_WIDTH - size.Width / 2, 40));
                 }
 
-                var valueText = value.ToString(valuePrecision);
+                var valueText = value.ToString(valueFormat);
                 var sizeValue = TextMeasurer.Measure(valueText, new RendererOptions(font));
                 Color textColor = value > max ? Color.Red : Color.White;
                 ctx.DrawText(valueText, font, textColor, new PointF(18, 20));
 
-                if (subValue != float.MinValue) ctx.DrawText(subValue.ToString("F2"), titleFont, textColor, new PointF(18, 20 + sizeValue.Height + size.Height));
+                // TODO: get proper sub display decimals
+                if (!string.IsNullOrWhiteSpace(subValueText)) ctx.DrawText(subValueText, titleFont, textColor, new PointF(18, 20 + sizeValue.Height + size.Height));
             });
 
             using var memoryStream = new MemoryStream();
@@ -272,7 +273,7 @@ public string GetGenericGaugeImage(string text, float value, float min, float ma
         }
 
 
-        public string GetCustomGaugeImage(string textTop, string textBottom, string valueTop, string valueBottom, float min, float max, bool horizontal, string[] splitGauge, int chartWidth, float chevronSize, bool absoluteValueText, string valuePrecision, bool hideHeaderTop, bool hideHeaderBottom)
+        public string GetCustomGaugeImage(string textTop, string textBottom, double valueTop, double valueBottom, double min, double max, string valueFormat, bool horizontal, string[] splitGauge, int chartWidth, float chevronSize, bool displayAbsoluteValue,  bool hideHeaderTop, bool hideHeaderBottom)
         {
             var font = SystemFonts.CreateFont("Arial", 25, FontStyle.Regular);
             var titleFont = SystemFonts.CreateFont("Arial", 15, FontStyle.Regular);
@@ -330,16 +331,14 @@ public string GetCustomGaugeImage(string textTop, string textBottom, string valu
                 }
 
                 //topValue
-                float.TryParse(valueTop, out float floatValueTop);
-                var ratio = (floatValueTop - (min < max ? min : max)) / range;
-                valueTop = absoluteValueText ? Math.Abs(floatValueTop).ToString(valuePrecision) : valueTop;
-                setupValue(true, textTop, valueTop, ratio, img_width, chevronSize, width_margin, chartWidth, min, max, ctx, hideHeaderTop);
+                var ratio = (valueTop - (min < max ? min : max)) / range;
+                var valueTopText = (displayAbsoluteValue ? Math.Abs(valueTop) : valueTop).ToString(valueFormat);
+                setupValue(true, textTop, valueTopText, (float)ratio, img_width, chevronSize, width_margin, chartWidth, (float)min, (float)max, ctx, hideHeaderTop);
 
                 //bottomValue
-                float.TryParse(valueBottom, out float floatValueBottom);
-                ratio = (floatValueBottom - (min < max ? min : max)) / range;
-                valueBottom = absoluteValueText ? Math.Abs(floatValueBottom).ToString(valuePrecision) : valueBottom;
-                setupValue(false, textBottom, valueBottom, ratio, img_width, chevronSize, width_margin, chartWidth, min, max, ctx, hideHeaderBottom);
+                ratio = (valueBottom - (min < max ? min : max)) / range;
+                var valueBottomText = (displayAbsoluteValue ? Math.Abs(valueBottom) : valueBottom).ToString(valueFormat);
+                setupValue(false, textBottom, valueBottomText, (float)ratio, img_width, chevronSize, width_margin, chartWidth, (float)min, (float)max, ctx, hideHeaderBottom);
 
                 if (!horizontal) ctx.Rotate(-90);
             });
diff --git a/FlightStreamDeck.LogicsTests/ComparisonEvaluatorTests.cs b/FlightStreamDeck.LogicsTests/ComparisonEvaluatorTests.cs
index 1d5b91d..98802d7 100644
--- a/FlightStreamDeck.LogicsTests/ComparisonEvaluatorTests.cs
+++ b/FlightStreamDeck.LogicsTests/ComparisonEvaluatorTests.cs
@@ -7,7 +7,7 @@ namespace FlightStreamDeck.Logics.Tests
     [TestClass]
     public class ComparisonEvaluatorTests
     {
-        private void Workhorse(string currentValue, string comparisonValue, List<string> expectedTrueComparisons)
+        private void Workhorse(double currentValue, double comparisonValue, List<string> expectedTrueComparisons)
         {
             List<string> errors = new List<string>();
 
@@ -32,8 +32,8 @@ private void Workhorse(string currentValue, string comparisonValue, List<string>
         public void CompareValuesTest_Same_Value_Numeric()
         {
             //Arrange
-            string currentValue = "0";
-            string comparisonValue = "0";
+            var currentValue = 0;
+            var comparisonValue = 0;
             List<string> expectedTrueComparisons = new List<string> {
                 ComparisonEvaluator.OperatorEquals,
                 ComparisonEvaluator.OperatorGreaterOrEquals,
@@ -48,8 +48,8 @@ public void CompareValuesTest_Same_Value_Numeric()
         public void CompareValuesTest_Different_Value_Greater_Numeric()
         {
             //Arrange
-            string currentValue = "1";
-            string comparisonValue = "0";
+            var currentValue = 1;
+            var comparisonValue = 0;
             List<string> expectedTrueComparisons = new List<string> {
                 ComparisonEvaluator.OperatorNotEquals,
                 ComparisonEvaluator.OperatorGreaterOrEquals,
@@ -64,8 +64,8 @@ public void CompareValuesTest_Different_Value_Greater_Numeric()
         public void CompareValuesTest_Different_Value_Less_Numeric()
         {
             //Arrange
-            string currentValue = "-1";
-            string comparisonValue = "0";
+            var currentValue = -1;
+            var comparisonValue = 0;
             List<string> expectedTrueComparisons = new List<string> {
                 ComparisonEvaluator.OperatorNotEquals,
                 ComparisonEvaluator.OperatorLessOrEquals,
@@ -79,53 +79,53 @@ public void CompareValuesTest_Different_Value_Less_Numeric()
 
         #region Alpha Comparison
 
-        [TestMethod]
-        public void CompareValuesTest_Same_Value_Alpha()
-        {
-            //Arrange
-            string currentValue = "m";
-            string comparisonValue = "m";
-            List<string> expectedTrueComparisons = new List<string> {
-                ComparisonEvaluator.OperatorEquals,
-                ComparisonEvaluator.OperatorGreaterOrEquals,
-                ComparisonEvaluator.OperatorLessOrEquals
-            };
-
-            //Act
-            Workhorse(currentValue, comparisonValue, expectedTrueComparisons);
-        }
-
-        [TestMethod]
-        public void CompareValuesTest_Different_Value_Greater_Alpha()
-        {
-            //Arrange
-            string currentValue = "n";
-            string comparisonValue = "m";
-            List<string> expectedTrueComparisons = new List<string> {
-                ComparisonEvaluator.OperatorNotEquals,
-                ComparisonEvaluator.OperatorGreaterOrEquals,
-                ComparisonEvaluator.OperatorGreater
-            };
-
-            //Act
-            Workhorse(currentValue, comparisonValue, expectedTrueComparisons);
-        }
-
-        [TestMethod]
-        public void CompareValuesTest_Different_Value_Less_Alpha()
-        {
-            //Arrange
-            string currentValue = "l";
-            string comparisonValue = "m";
-            List<string> expectedTrueComparisons = new List<string> {
-                ComparisonEvaluator.OperatorNotEquals,
-                ComparisonEvaluator.OperatorLessOrEquals,
-                ComparisonEvaluator.OperatorLess
-            };
-
-            //Act
-            Workhorse(currentValue, comparisonValue, expectedTrueComparisons);
-        }
+        //[TestMethod]
+        //public void CompareValuesTest_Same_Value_Alpha()
+        //{
+        //    //Arrange
+        //    string currentValue = "m";
+        //    string comparisonValue = "m";
+        //    List<string> expectedTrueComparisons = new List<string> {
+        //        ComparisonEvaluator.OperatorEquals,
+        //        ComparisonEvaluator.OperatorGreaterOrEquals,
+        //        ComparisonEvaluator.OperatorLessOrEquals
+        //    };
+
+        //    //Act
+        //    Workhorse(currentValue, comparisonValue, expectedTrueComparisons);
+        //}
+
+        //[TestMethod]
+        //public void CompareValuesTest_Different_Value_Greater_Alpha()
+        //{
+        //    //Arrange
+        //    string currentValue = "n";
+        //    string comparisonValue = "m";
+        //    List<string> expectedTrueComparisons = new List<string> {
+        //        ComparisonEvaluator.OperatorNotEquals,
+        //        ComparisonEvaluator.OperatorGreaterOrEquals,
+        //        ComparisonEvaluator.OperatorGreater
+        //    };
+
+        //    //Act
+        //    Workhorse(currentValue, comparisonValue, expectedTrueComparisons);
+        //}
+
+        //[TestMethod]
+        //public void CompareValuesTest_Different_Value_Less_Alpha()
+        //{
+        //    //Arrange
+        //    string currentValue = "l";
+        //    string comparisonValue = "m";
+        //    List<string> expectedTrueComparisons = new List<string> {
+        //        ComparisonEvaluator.OperatorNotEquals,
+        //        ComparisonEvaluator.OperatorLessOrEquals,
+        //        ComparisonEvaluator.OperatorLess
+        //    };
+
+        //    //Act
+        //    Workhorse(currentValue, comparisonValue, expectedTrueComparisons);
+        //}
 
         #endregion
     }
diff --git a/FlightStreamDeck.LogicsTests/ImageLogicTests.cs b/FlightStreamDeck.LogicsTests/ImageLogicTests.cs
index c4d9205..80f704b 100644
--- a/FlightStreamDeck.LogicsTests/ImageLogicTests.cs
+++ b/FlightStreamDeck.LogicsTests/ImageLogicTests.cs
@@ -57,7 +57,7 @@ public void GetCustomImageTest_NoCoordinateRangeError()
 
             try
             {
-                images.GetCustomGaugeImage("T", "B", "2000", "-2000", 1, 1, false, new string[] { "100:green" }, 5, 3, false, "2", false, false);
+                images.GetCustomGaugeImage("T", "B", 2000, -2000, 1, 1, "F2", false, new string[] { "100:green" }, 5, 3, false, false, false);
             }
             catch (Exception e)
             {
diff --git a/FlightStreamDeck.SimConnectFSX/SimConnectFlightConnector.cs b/FlightStreamDeck.SimConnectFSX/SimConnectFlightConnector.cs
index 29c3183..8198811 100644
--- a/FlightStreamDeck.SimConnectFSX/SimConnectFlightConnector.cs
+++ b/FlightStreamDeck.SimConnectFSX/SimConnectFlightConnector.cs
@@ -21,8 +21,11 @@ public class SimConnectFlightConnector : IFlightConnector
         public event EventHandler Closed;
 
         private readonly List<TOGGLE_EVENT> genericEvents = new List<TOGGLE_EVENT>();
-        private readonly HashSet<TOGGLE_VALUE> genericValues = new HashSet<TOGGLE_VALUE>();
-        private readonly Dictionary<TOGGLE_VALUE, ValueEntry> specifiedValuesWithUnitAndDecimals = new Dictionary<TOGGLE_VALUE, ValueEntry>();
+
+        /// <summary>
+        /// This is a reference counter to make sure we do not deregister variables that are still in use.
+        /// </summary>
+        private readonly Dictionary<(TOGGLE_VALUE variables, string unit), int> genericValues = new Dictionary<(TOGGLE_VALUE variables, string unit), int>();
 
         private readonly object lockLists = new object();
 
@@ -624,7 +627,7 @@ private void Simconnect_OnRecvSimobjectDataBytypeAsync(SimConnect sender, SIMCON
 
                 case (uint)DATA_REQUESTS.TOGGLE_VALUE_DATA:
                     {
-                        var result = new Dictionary<TOGGLE_VALUE, string>();
+                        var result = new Dictionary<(TOGGLE_VALUE variable, string unit), double>();
                         lock (lockLists)
                         {
                             if (data.dwDefineCount != genericValues.Count)
@@ -643,10 +646,8 @@ private void Simconnect_OnRecvSimobjectDataBytypeAsync(SimConnect sender, SIMCON
 
                             for (int i = 0; i < data.dwDefineCount; i++)
                             {
-                                var genericValue = genericValues.ElementAt(i);
-                                int decimals = genericValue.GetDecimals(specifiedValuesWithUnitAndDecimals);
-                                double toggleValue = Math.Round(dataArray.Value.Get(i), decimals);
-                                result.Add(genericValue, toggleValue.ToString("F" + decimals.ToString()));
+                                var genericValue = genericValues.Keys.ElementAt(i);
+                                result.Add(genericValue, dataArray.Value.Get(i));
                             }
                         }
 
@@ -757,65 +758,7 @@ public void RegisterToggleEvent(TOGGLE_EVENT toggleAction)
             simconnect.MapClientEventToSimEvent(toggleAction, toggleAction.EventToSimConnectEvent());
         }
 
-        public void RegisterSimValue(TOGGLE_VALUE simValue)
-        {
-            var changed = false;
-            lock (lockLists)
-            {
-                logger.LogInformation("Registering {value}", simValue);
-                changed = genericValues.Add(simValue);
-            }
-            if (changed)
-            {
-                RegisterGenericValues();
-            }
-        }
-
-        public void RegisterSimValue(TOGGLE_VALUE simValue, ValueEntry simValueEntry)
-        {
-            var changed = false;
-            lock (lockLists)
-            {
-                logger.LogInformation("Registering {key} {value}", simValue, simValueEntry);
-                changed = genericValues.Add(simValue);
-                specifiedValuesWithUnitAndDecimals.Add(simValue, simValueEntry);
-            }
-            if (changed)
-            {
-                RegisterGenericValues();
-            }
-        }
-
-        public void DeRegisterSimValue(TOGGLE_VALUE simValue)
-        {
-            var changed = false;
-            lock (lockLists)
-            {
-                logger.LogInformation("De-Registering {value}", simValue);
-                changed = genericValues.Remove(simValue);
-            }
-            if (changed)
-            {
-                RegisterGenericValues();
-            }
-        }
-
-        public void DeRegisterSimValue(TOGGLE_VALUE simValue, ValueEntry simValueEntry)
-        {
-            var changed = false;
-            lock (lockLists)
-            {
-                logger.LogInformation("De-Registering {value} {sve}", simValue, simValueEntry);
-                changed = genericValues.Remove(simValue);
-                specifiedValuesWithUnitAndDecimals.Remove(simValue);
-            }
-            if (changed)
-            {
-                RegisterGenericValues();
-            }
-        }
-
-        public void RegisterSimValues(params TOGGLE_VALUE[] simValues)
+        public void RegisterSimValues(params (TOGGLE_VALUE variables, string unit)[] simValues)
         {
             var changed = false;
             lock (lockLists)
@@ -823,7 +766,15 @@ public void RegisterSimValues(params TOGGLE_VALUE[] simValues)
                 logger.LogInformation("Registering {values}", string.Join(", ", simValues));
                 foreach (var simValue in simValues)
                 {
-                    changed |= genericValues.Add(simValue);
+                    if (genericValues.ContainsKey(simValue))
+                    {
+                        genericValues[simValue]++;
+                    }
+                    else
+                    {
+                        genericValues.Add(simValue, 1);
+                        changed = true;
+                    }
                 }
             }
             if (changed)
@@ -832,7 +783,7 @@ public void RegisterSimValues(params TOGGLE_VALUE[] simValues)
             }
         }
 
-        public void DeRegisterSimValues(params TOGGLE_VALUE[] simValues)
+        public void DeRegisterSimValues(params (TOGGLE_VALUE variables, string unit)[] simValues)
         {
             var changed = false;
             lock (lockLists)
@@ -840,7 +791,19 @@ public void DeRegisterSimValues(params TOGGLE_VALUE[] simValues)
                 logger.LogInformation("De-Registering {values}", string.Join(", ", simValues));
                 foreach (var simValue in simValues)
                 {
-                    changed |= genericValues.Remove(simValue);
+                    if (genericValues.ContainsKey(simValue))
+                    {
+                        var currentCount = genericValues[simValue];
+                        if (currentCount > 1)
+                        {
+                            genericValues[simValue]--;
+                        }
+                        else
+                        {
+                            genericValues.Remove(simValue);
+                            changed = true;
+                        }
+                    }
                 }
             }
             if (changed)
@@ -891,15 +854,16 @@ private void RegisterGenericValues()
                     {
                         var log = "Registering generic data structure:";
 
-                        foreach (TOGGLE_VALUE simValue in genericValues)
+                        foreach ((TOGGLE_VALUE simValue, string unit) in genericValues.Keys)
                         {
                             string value = simValue.ToString().Replace("__", ":").Replace("_", " ");
-                            log += string.Format("\n- {0} {1}", simValue, value);
+                            var simUnit = EventValueLibrary.GetUnit(simValue, unit);
+                            log += string.Format("\n- {0} {1} {2}", simValue, value, simUnit);
 
                             simconnect.AddToDataDefinition(
                                 DEFINITIONS.GenericData,
                                 value,
-                                simValue.GetUnit(specifiedValuesWithUnitAndDecimals),
+                                simUnit,
                                 SIMCONNECT_DATATYPE.FLOAT64,
                                 0.0f,
                                 SimConnect.SIMCONNECT_UNUSED
diff --git a/docs/USERGUIDE.md b/docs/USERGUIDE.md
index 16eb61f..2151b66 100644
--- a/docs/USERGUIDE.md
+++ b/docs/USERGUIDE.md
@@ -102,16 +102,24 @@ This button is very similar to Generic Toggle Button except from it does not hav
 
 ![Sample NAV/COM buttons](sample_custom_gauge.png)
 
-- `Minimal value` and `Maximum value` are compulsory, indicating the range of the `Display value`.
-- Having a `Minimal value` greater than the `Maximum value` will flip the way the value resolves on the graph (see two trim gauges above).
-- You may enter `Use Absolute Value for Value Text` on a `custom` type gauge, which will display the value without a negative if one would show up (right column trim gauges, for example).
-- The gauge may be cusom color coded, and knows basic colors from [system.drawing.colors](https://docs.microsoft.com/en-us/dotnet/api/system.drawing.color?view=net-5.0#properties).
+There are 2 types of generic gauge at the moment: Simple and Custom. Simple allows you to display a value in an arc gauge while Custom allows you to display up to 2 values with customizable colors.
+
+###### Common Parameters
+
+- `Minimum` and `Maximum` indicate the range of the `Display value`. You can input a number or a SimConnect variable in those fields.
+
+###### Notes for Simple Gauge
+
+- `Sub value` shows a small number below the main display value.  In my example for Indicated Altitude, the inches of MG displayed by adding `KOHLSMAN_SETTING_HG` to this setting.
+
+###### Notes for Custom Gauge
+
+- Having a `Minimum` greater than the `Maximum value` will flip the way the value resolves on the graph (see two trim gauges above).
+- Setting `Display absolute value` to 'Yes' will display the value without a negative sign (e.g. right column trim gauges).
+- The gauge may be cusom color coded, and knows basic colors from [System.Drawing.Colors](https://docs.microsoft.com/en-us/dotnet/api/system.drawing.color?view=net-5.0#properties).
   - The default custom gauge that displays is color coded like the fuel gauge and has all the properties in it for a generic 2 tank aircraft.
-- You can adjust the thickness of the bar by adjusting `Chart Thickness` in the custom 
-section.
-- You can adjust the chevron size by adjusting `Chart Chevron Size` in the custom section.
-- If you do not specify a header for a value in the top or bottom, it won't show that respective value or chevron.  If you want a blank chevron, simply put a blank space in, it will recognize that.
-- There is now a concept of a `Sub Display value`.  In my example for Indicated Altitude, the inches of MG displayed by adding `KOHLSMAN_SETTING_HG` to that setting.
+- `Chevron Size` and `Thickness` allows you to further customize the display.
+- If you do not input `Header` or `Bottom Header`, the respective value and chevron won't show up.  If you want a blank chevron, simply put a blank space in header fields.
 
 #### Custom Images
 
@@ -146,7 +154,7 @@ Here are the steps that you need to do to get access to the new events:
 7. There should now be a "MSFS2020-module" folder, open that folder.
 8. Copy the "mobiflight-event-module" folder to your MSFS community folder.
 9. Relaunch MSFS 2020
-10. Configure Flight-Stream-Deck with [newly supported events](https://github.com/nguyenquyhy/Flight-Tracker-StreamDeck/blob/master/FlightStreamDeck.Core/Structs.cs#L1317), courtesy of MobiFlight!  They are like the normal SDK events, except the wasm module in the community folder interacts with the gauges/instruments directly when receiving them.
+10. Configure Flight-Stream-Deck with [newly supported events](/FlightStreamDeck.Core/Structs.cs#L1317), courtesy of MobiFlight!  They are like the normal SDK events, except the wasm module in the community folder interacts with the gauges/instruments directly when receiving them.
 
 We've included a quick GNS 530 example for the knobs and basic buttons [here](https://github.com/nguyenquyhy/Flight-Tracker-StreamDeck/tree/master/Assets/Starter%20Profiles/MobiFlight-GNS-530.streamDeckProfile)
 
