diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 4012cf2f..2a486d36 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -22,23 +22,23 @@ ost_db = {
 # STATIC VARIABLES
 ATTRIBUTES = {
     'NVMe': {
-        'critical_warning': {'Error': 1},
-        'media_errors': {'Error': 1},
-        'power_on_hours': {'Warning': 12000, 'Error': 18000, 'Ignore': True},
+        'critical_warning': {'Error':   1},
+        'media_errors':     {'Error':   1},
+        'power_on_hours':   {'Warning': 12000, 'Error': 18000, 'Ignore': True},
         'unsafe_shutdowns': {'Warning': 1},
         },
     'SMART': {
-        5: {'Error': 1},
-        9: {'Warning': 12000, 'Error': 18000, 'Ignore': True},
-        10: {'Warning': 1},
-        184: {'Error': 1},
-        187: {'Warning': 1},
-        188: {'Warning': 1},
-        196: {'Warning': 1, 'Error': 10, 'Ignore': True},
-        197: {'Error': 1},
-        198: {'Error': 1},
-        199: {'Error': 1, 'Ignore': True},
-        201: {'Warning': 1},
+        5:   {'Hex': '05', 'Error':   1},
+        9:   {'Hex': '09', 'Warning': 12000, 'Error': 18000, 'Ignore': True},
+        10:  {'Hex': '0A', 'Error':   1},
+        184: {'Hex': 'B8', 'Error':   1},
+        187: {'Hex': 'BB', 'Error':   1},
+        188: {'Hex': 'BC', 'Error':   1},
+        196: {'Hex': 'C4', 'Error':   1},
+        197: {'Hex': 'C5', 'Error':   1},
+        198: {'Hex': 'C6', 'Error':   1},
+        199: {'Hex': 'C7', 'Error':   1, 'Ignore': True},
+        201: {'Hex': 'C9', 'Error':   1},
         },
     }
 IO_VARS = {