diff --git a/src/lcd_elements.hpp b/src/lcd_elements.hpp
index 66c53db..ce35778 100644
--- a/src/lcd_elements.hpp
+++ b/src/lcd_elements.hpp
@@ -21,103 +21,103 @@
  *    Dashboard Element & Picture IDs    *
  * ***************************************/
 // Lights
-#define LCD_DASHBOARD_ELEMENT_LIGHT_ALL 0
-#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_ALL "light_all"
-#define LCD_DASHBOARD_PIC_LIGHT_ALL_ON 0
-#define LCD_DASHBOARD_PIC_LIGHT_ALL_ON_PRESSED 1
-#define LCD_DASHBOARD_PIC_LIGHT_ALL_OFF 1
-#define LCD_DASHBOARD_PIC_LIGHT_ALL_OFF_PRESSED 0
+#define LCD_DASHBOARD_ELEMENT_LIGHT_ALL 12
+#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_ALL "btn_lta"
+#define LCD_DASHBOARD_PIC_LIGHT_ALL_ON 37
+#define LCD_DASHBOARD_PIC_LIGHT_ALL_ON_PRESSED 36
+#define LCD_DASHBOARD_PIC_LIGHT_ALL_OFF 35
+#define LCD_DASHBOARD_PIC_LIGHT_ALL_OFF_PRESSED 34
 
-#define LCD_DASHBOARD_ELEMENT_LIGHT_1 0
-#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_1 "light_1"
-#define LCD_DASHBOARD_PIC_LIGHT_1_ON 2
-#define LCD_DASHBOARD_PIC_LIGHT_1_ON_PRESSED 3
-#define LCD_DASHBOARD_PIC_LIGHT_1_OFF 3
-#define LCD_DASHBOARD_PIC_LIGHT_1_OFF_PRESSED 2
+#define LCD_DASHBOARD_ELEMENT_LIGHT_1 8
+#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_1 "btn_lt1"
+#define LCD_DASHBOARD_PIC_LIGHT_1_ON 17
+#define LCD_DASHBOARD_PIC_LIGHT_1_ON_PRESSED 16
+#define LCD_DASHBOARD_PIC_LIGHT_1_OFF 15
+#define LCD_DASHBOARD_PIC_LIGHT_1_OFF_PRESSED 14
 
-#define LCD_DASHBOARD_ELEMENT_LIGHT_2 1
-#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_2 "light_2"
-#define LCD_DASHBOARD_PIC_LIGHT_2_ON 4
-#define LCD_DASHBOARD_PIC_LIGHT_2_ON_PRESSED 5
-#define LCD_DASHBOARD_PIC_LIGHT_2_OFF 5
-#define LCD_DASHBOARD_PIC_LIGHT_2_OFF_PRESSED 4
+#define LCD_DASHBOARD_ELEMENT_LIGHT_2 9
+#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_2 "btn_lt2"
+#define LCD_DASHBOARD_PIC_LIGHT_2_ON 21
+#define LCD_DASHBOARD_PIC_LIGHT_2_ON_PRESSED 20
+#define LCD_DASHBOARD_PIC_LIGHT_2_OFF 19
+#define LCD_DASHBOARD_PIC_LIGHT_2_OFF_PRESSED 18
 
-#define LCD_DASHBOARD_ELEMENT_LIGHT_3 2
-#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_3 "light_3"
-#define LCD_DASHBOARD_PIC_LIGHT_3_ON 6
-#define LCD_DASHBOARD_PIC_LIGHT_3_ON_PRESSED 7
-#define LCD_DASHBOARD_PIC_LIGHT_3_OFF 7
-#define LCD_DASHBOARD_PIC_LIGHT_3_OFF_PRESSED 6
+#define LCD_DASHBOARD_ELEMENT_LIGHT_3 10
+#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_3 "btn_lt3"
+#define LCD_DASHBOARD_PIC_LIGHT_3_ON 25
+#define LCD_DASHBOARD_PIC_LIGHT_3_ON_PRESSED 24
+#define LCD_DASHBOARD_PIC_LIGHT_3_OFF 23
+#define LCD_DASHBOARD_PIC_LIGHT_3_OFF_PRESSED 22
 
-#define LCD_DASHBOARD_ELEMENT_LIGHT_4 3
-#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_4 "light_4"
-#define LCD_DASHBOARD_PIC_LIGHT_4_ON 8
-#define LCD_DASHBOARD_PIC_LIGHT_4_ON_PRESSED 9
-#define LCD_DASHBOARD_PIC_LIGHT_4_OFF 9
-#define LCD_DASHBOARD_PIC_LIGHT_4_OFF_PRESSED 8
+#define LCD_DASHBOARD_ELEMENT_LIGHT_4 11
+#define LCD_DASHBOARD_ELEMENT_NAME_LIGHT_4 "btn_lt4"
+#define LCD_DASHBOARD_PIC_LIGHT_4_ON 29
+#define LCD_DASHBOARD_PIC_LIGHT_4_ON_PRESSED 28
+#define LCD_DASHBOARD_PIC_LIGHT_4_OFF 27
+#define LCD_DASHBOARD_PIC_LIGHT_4_OFF_PRESSED 26
 
 // Fans
-#define LCD_DASHBOARD_ELEMENT_FAN_ALL 4
-#define LCD_DASHBOARD_ELEMENT_NAME_FAN_ALL "fan_all"
-#define LCD_DASHBOARD_PIC_FAN_ALL_ON 10
-#define LCD_DASHBOARD_PIC_FAN_ALL_ON_PRESSED 11
-#define LCD_DASHBOARD_PIC_FAN_ALL_OFF 11
-#define LCD_DASHBOARD_PIC_FAN_ALL_OFF_PRESSED 10
+#define LCD_DASHBOARD_ELEMENT_FAN_ALL 16
+#define LCD_DASHBOARD_ELEMENT_NAME_FAN_ALL "btn_fana"
+#define LCD_DASHBOARD_PIC_FAN_ALL_ON 50
+#define LCD_DASHBOARD_PIC_FAN_ALL_ON_PRESSED 51
+#define LCD_DASHBOARD_PIC_FAN_ALL_OFF 52
+#define LCD_DASHBOARD_PIC_FAN_ALL_OFF_PRESSED 53
 
-#define LCD_DASHBOARD_ELEMENT_FAN_1 4
-#define LCD_DASHBOARD_ELEMENT_NAME_FAN_1 "fan_1"
-#define LCD_DASHBOARD_PIC_FAN_1_ON 12
-#define LCD_DASHBOARD_PIC_FAN_1_ON_PRESSED 13
-#define LCD_DASHBOARD_PIC_FAN_1_OFF 13
-#define LCD_DASHBOARD_PIC_FAN_1_OFF_PRESSED 12
+#define LCD_DASHBOARD_ELEMENT_FAN_1 13
+#define LCD_DASHBOARD_ELEMENT_NAME_FAN_1 "btn_fan1"
+#define LCD_DASHBOARD_PIC_FAN_1_ON 41
+#define LCD_DASHBOARD_PIC_FAN_1_ON_PRESSED 40
+#define LCD_DASHBOARD_PIC_FAN_1_OFF 39
+#define LCD_DASHBOARD_PIC_FAN_1_OFF_PRESSED 38
 
-#define LCD_DASHBOARD_ELEMENT_FAN_2 5
-#define LCD_DASHBOARD_ELEMENT_NAME_FAN_2 "fan_2"
-#define LCD_DASHBOARD_PIC_FAN_2_ON 14
-#define LCD_DASHBOARD_PIC_FAN_2_ON_PRESSED 15
-#define LCD_DASHBOARD_PIC_FAN_2_OFF 15
-#define LCD_DASHBOARD_PIC_FAN_2_OFF_PRESSED 14
+#define LCD_DASHBOARD_ELEMENT_FAN_2 14
+#define LCD_DASHBOARD_ELEMENT_NAME_FAN_2 "btn_fan2"
+#define LCD_DASHBOARD_PIC_FAN_2_ON 45
+#define LCD_DASHBOARD_PIC_FAN_2_ON_PRESSED 44
+#define LCD_DASHBOARD_PIC_FAN_2_OFF 43
+#define LCD_DASHBOARD_PIC_FAN_2_OFF_PRESSED 42
 
-#define LCD_DASHBOARD_ELEMENT_FAN_3 6
-#define LCD_DASHBOARD_ELEMENT_NAME_FAN_3 "fan_3"
-#define LCD_DASHBOARD_PIC_FAN_3_ON 16
-#define LCD_DASHBOARD_PIC_FAN_3_ON_PRESSED 17
-#define LCD_DASHBOARD_PIC_FAN_3_OFF 17
-#define LCD_DASHBOARD_PIC_FAN_3_OFF_PRESSED 16
+#define LCD_DASHBOARD_ELEMENT_FAN_3 15
+#define LCD_DASHBOARD_ELEMENT_NAME_FAN_3 "btn_fan3"
+#define LCD_DASHBOARD_PIC_FAN_3_ON 49
+#define LCD_DASHBOARD_PIC_FAN_3_ON_PRESSED 48
+#define LCD_DASHBOARD_PIC_FAN_3_OFF 47
+#define LCD_DASHBOARD_PIC_FAN_3_OFF_PRESSED 46
 
 // Air Purifier
-#define LCD_DASHBOARD_ELEMENT_AIR_PURIFIER 7
-#define LCD_DASHBOARD_ELEMENT_NAME_AIR_PURIFIER "purifier"
-#define LCD_DASHBOARD_PIC_AIR_PURIFIER_ON 18
-#define LCD_DASHBOARD_PIC_AIR_PURIFIER_ON_PRESSED 19
-#define LCD_DASHBOARD_PIC_AIR_PURIFIER_OFF 19
-#define LCD_DASHBOARD_PIC_AIR_PURIFIER_OFF_PRESSED 18
+#define LCD_DASHBOARD_ELEMENT_AIR_PURIFIER 1
+#define LCD_DASHBOARD_ELEMENT_NAME_AIR_PURIFIER "btn_ap"
+#define LCD_DASHBOARD_PIC_AIR_PURIFIER_ON 5
+#define LCD_DASHBOARD_PIC_AIR_PURIFIER_ON_PRESSED 4
+#define LCD_DASHBOARD_PIC_AIR_PURIFIER_OFF 3
+#define LCD_DASHBOARD_PIC_AIR_PURIFIER_OFF_PRESSED 2
 
 // Mosquito Zapper
-#define LCD_DASHBOARD_ELEMENT_MOSQUITO_ZAPPER 8
-#define LCD_DASHBOARD_ELEMENT_NAME_MOSQUITO_ZAPPER "zapper"
-#define LCD_DASHBOARD_PIC_MOSQUITO_ZAPPER_ON 20
-#define LCD_DASHBOARD_PIC_MOSQUITO_ZAPPER_ON_PRESSED 21
-#define LCD_DASHBOARD_PIC_MOSQUITO_ZAPPER_OFF 21
-#define LCD_DASHBOARD_PIC_MOSQUITO_ZAPPER_OFF_PRESSED 20
+#define LCD_DASHBOARD_ELEMENT_MOSQUITO_ZAPPER 5
+#define LCD_DASHBOARD_ELEMENT_NAME_MOSQUITO_ZAPPER "btn_mq"
+#define LCD_DASHBOARD_PIC_MOSQUITO_ZAPPER_ON 33
+#define LCD_DASHBOARD_PIC_MOSQUITO_ZAPPER_ON_PRESSED 32
+#define LCD_DASHBOARD_PIC_MOSQUITO_ZAPPER_OFF 31
+#define LCD_DASHBOARD_PIC_MOSQUITO_ZAPPER_OFF_PRESSED 30
 
 // AQI
-#define LCD_DASHBOARD_ELEMENT_AQI_TEXT 9
-#define LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT "aqi_txt"
-#define LCD_DASHBOARD_ELEMENT_AQI_PICTURE 10
-#define LCD_DASHBOARD_ELEMENT_NAME_AQI_PICTURE "aqi_pic"
-#define LCD_DASHBOARD_PIC_AQI_GOOD 22
-#define LCD_DASHBOARD_PIC_AQI_MODERATE 23
-#define LCD_DASHBOARD_PIC_AQI_UNHEALTHY_FOR_SENSITIVE_GROUPS 24
-#define LCD_DASHBOARD_PIC_AQI_UNHEALTHY 25
-#define LCD_DASHBOARD_PIC_AQI_VERY_UNHEALTHY 26
-#define LCD_DASHBOARD_PIC_AQI_HAZARDOUS 27
+#define LCD_DASHBOARD_ELEMENT_AQI_TEXT 3
+#define LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT "txt_aqi"
+#define LCD_DASHBOARD_ELEMENT_AQI_PICTURE 2
+#define LCD_DASHBOARD_ELEMENT_NAME_AQI_PICTURE "ico_aqi"
+#define LCD_DASHBOARD_PIC_AQI_GOOD 6
+#define LCD_DASHBOARD_PIC_AQI_MODERATE 7
+#define LCD_DASHBOARD_PIC_AQI_UNHEALTHY_FOR_SENSITIVE_GROUPS 8
+#define LCD_DASHBOARD_PIC_AQI_UNHEALTHY 9
+#define LCD_DASHBOARD_PIC_AQI_VERY_UNHEALTHY 10
+#define LCD_DASHBOARD_PIC_AQI_HAZARDOUS 11
 
 // Socket Power
-#define LCD_DASHBOARD_ELEMENT_SOCKET_POWER 11
-#define LCD_DASHBOARD_ELEMENT_NAME_SOCKET_POWER "socket"
-#define LCD_DASHBOARD_PIC_SOCKET_POWER_ON 28
-#define LCD_DASHBOARD_PIC_SOCKET_POWER_OFF 29
+#define LCD_DASHBOARD_ELEMENT_SOCKET_POWER 7
+#define LCD_DASHBOARD_ELEMENT_NAME_SOCKET_POWER "img_socket"
+#define LCD_DASHBOARD_PIC_SOCKET_POWER_ON 12
+#define LCD_DASHBOARD_PIC_SOCKET_POWER_OFF 13
 
 // Air Conditioner
 #define LCD_DASHBOARD_ELEMENT_AC_STATE 12