diff --git a/package/1bar_1display.yaml b/package/1bar_1display.yaml
index e43e91e..14c876d 100644
--- a/package/1bar_1display.yaml
+++ b/package/1bar_1display.yaml
@@ -22,16 +22,16 @@ binary_sensor:
   ### Buttons Main Display ###
   ############################
   - platform: gpio
-    id: 'base_j2_btn_left'
-    name: "Display button Left"
+    id: 'main_display_btn_left'
+    name: "Main Display button Left"
     pin: 
       mcp23xxx: base_J2
       number: 6
       mode: INPUT_PULLUP
       inverted: true
   - platform: gpio
-    id: 'base_j2_btn_right'
-    name: "Display button Right"
+    id: 'main_display_btn_right'
+    name: "Main Display button Right"
     pin: 
       mcp23xxx: base_J2
       number: 2
@@ -42,16 +42,16 @@ binary_sensor:
   ### Buttons BAR module 1 ###
   ############################
   - platform: gpio
-    id: 'base_j3_btn_left'
-    name: "BAR button Left"
+    id: 'bar1_btn_left'
+    name: "BAR 1 button Left"
     pin: 
       mcp23xxx: base_J3
       number: 6
       mode: INPUT_PULLUP
       inverted: true
   - platform: gpio
-    id: 'base_j3_btn_right'
-    name: "BAR button Right"
+    id: 'bar1_btn_right'
+    name: "BAR 1 button Right"
     pin: 
       mcp23xxx: base_J3
       number: 2
@@ -65,29 +65,29 @@ light:
   ### RGB LED's BAR module ###
   ############################
   - platform: partition
-    name: "BAR J3 Left RGB Front"
-    id: bar_j3_left_rgb_front
+    name: "BAR 1 Left RGB Front"
+    id: bar1_left_rgb_front
     segments:
       - id: neopixels
         from: 0
         to: 0
   - platform: partition
-    name: "BAR J3 Left RGB Back"
-    id: bar_j3_left_rgb_back
+    name: "BAR 1 Left RGB Back"
+    id: bar1_left_rgb_back
     segments:
       - id: neopixels
         from: 1
         to: 1
   - platform: partition
-    name: "BAR J3 Right RGB Front"
-    id: bar_j3_right_rgb_front
+    name: "BAR 1 Right RGB Front"
+    id: bar1_right_rgb_front
     segments:
       - id: neopixels
         from: 2
         to: 2
   - platform: partition
-    name: "BAR J3 Right RGB Back"
-    id: bar_j3_right_rgb_back
+    name: "BAR 1 Right RGB Back"
+    id: bar1_right_rgb_back
     segments:
       - id: neopixels
         from: 3
@@ -97,7 +97,7 @@ display:
   ####################
   ### Main Display ###
   ####################
-  - id: display_j2_main
+  - id: main_display
     platform: ili9xxx
     model: ili9341
     color_order: rgb
@@ -120,7 +120,7 @@ display:
   ##################
   ### BAR module ###
   ##################
-  - id: display_j3_Left
+  - id: display_bar1_left
     platform: ili9xxx
     model: ST7735
     color_order: bgr
@@ -141,7 +141,7 @@ display:
       width: 80
       offset_width: 24
     rotation: 270
-  - id: display_j3_Right
+  - id: display_bar1_left
     platform: ili9xxx
     model: ST7735
     color_order: bgr
diff --git a/package/2bar_1display.yaml b/package/2bar_1display.yaml
index 0781ed5..4c808f1 100644
--- a/package/2bar_1display.yaml
+++ b/package/2bar_1display.yaml
@@ -25,16 +25,16 @@ binary_sensor:
   ### Buttons Main Display ###
   ############################
   - platform: gpio
-    id: 'base_j1_btn_left'
-    name: "Display button Left"
+    id: 'main_display_btn_left'
+    name: "Main Display button Left"
     pin: 
       mcp23xxx: base_J1
       number: 6
       mode: INPUT_PULLUP
       inverted: true
   - platform: gpio
-    id: 'base_j1_btn_right'
-    name: "Display button Right"
+    id: 'main_display_btn_right'
+    name: "Main Display button Right"
     pin: 
       mcp23xxx: base_J1
       number: 2
@@ -45,7 +45,7 @@ binary_sensor:
   ### Buttons BAR module 1 ###
   ############################
   - platform: gpio
-    id: 'base_j2_btn_left'
+    id: 'bar1_btn_left'
     name: "BAR 1 button Left"
     pin: 
       mcp23xxx: base_J2
@@ -53,7 +53,7 @@ binary_sensor:
       mode: INPUT_PULLUP
       inverted: true
   - platform: gpio
-    id: 'base_j2_btn_right'
+    id: 'bar1_btn_right'
     name: "BAR 1 button Right"
     pin: 
       mcp23xxx: base_J2
@@ -65,7 +65,7 @@ binary_sensor:
   ### Buttons BAR module 2 ###
   ############################
   - platform: gpio
-    id: 'base_j3_btn_left'
+    id: 'bar2_btn_left'
     name: "BAR 2 button Left"
     pin: 
       mcp23xxx: base_J3
@@ -73,7 +73,7 @@ binary_sensor:
       mode: INPUT_PULLUP
       inverted: true
   - platform: gpio
-    id: 'base_j3_btn_right'
+    id: 'bar2_btn_right'
     name: "BAR 2 button Right"
     pin: 
       mcp23xxx: base_J3
@@ -89,28 +89,28 @@ light:
   ##############################
   - platform: partition
     name: "BAR 1 Left RGB Front"
-    id: bar_1_left_rgb_front
+    id: bar1_left_rgb_front
     segments:
       - id: neopixels
         from: 0
         to: 0
   - platform: partition
     name: "BAR 1 Left RGB Back"
-    id: bar_1_left_rgb_back
+    id: bar1_left_rgb_back
     segments:
       - id: neopixels
         from: 1
         to: 1
   - platform: partition
     name: "BAR 1 Right RGB Front"
-    id: bar_1_right_rgb_front
+    id: bar1_right_rgb_front
     segments:
       - id: neopixels
         from: 2
         to: 2
   - platform: partition
     name: "BAR 1 Right RGB Back"
-    id: bar_1_right_rgb_back
+    id: bar1_right_rgb_back
     segments:
       - id: neopixels
         from: 3
@@ -120,28 +120,28 @@ light:
   ##############################
   - platform: partition
     name: "BAR 2 Left RGB Front"
-    id: bar_2_left_rgb_front
+    id: bar2_left_rgb_front
     segments:
       - id: neopixels
         from: 4
         to: 4
   - platform: partition
     name: "BAR 2 Left RGB Back"
-    id: bar_2_left_rgb_back
+    id: bar2_left_rgb_back
     segments:
       - id: neopixels
         from: 5
         to: 5
   - platform: partition
     name: "BAR 2 Right RGB Front"
-    id: bar_2_right_rgb_front
+    id: bar2_right_rgb_front
     segments:
       - id: neopixels
         from: 6
         to: 6
   - platform: partition
     name: "BAR 2 Right RGB Back"
-    id: bar_2_right_rgb_back
+    id: bar2_right_rgb_back
     segments:
       - id: neopixels
         from: 7
@@ -151,7 +151,7 @@ display:
   ####################
   ### Main Display ###
   ####################
-  - id: display_j1_main
+  - id: main_display
     platform: ili9xxx
     model: ili9341
     color_order: rgb
@@ -174,7 +174,7 @@ display:
   ####################
   ### BAR module 1 ###
   ####################
-  - id: display_j2_Left
+  - id: display_bar1_left
     platform: ili9xxx
     model: ST7735
     color_order: bgr
@@ -195,7 +195,7 @@ display:
       width: 80
       offset_width: 24
     rotation: 270
-  - id: display_j2_Right
+  - id: display_bar1_right
     platform: ili9xxx
     model: ST7735
     color_order: bgr
@@ -219,7 +219,7 @@ display:
   ####################
   ### BAR module 2 ###
   ####################
-  - id: display_j3_Left
+  - id: display_bar2_left
     platform: ili9xxx
     model: ST7735
     color_order: bgr
@@ -240,7 +240,7 @@ display:
       width: 80
       offset_width: 24
     rotation: 270
-  - id: display_j3_Right
+  - id: display_bar2_right
     platform: ili9xxx
     model: ST7735
     color_order: bgr
diff --git a/package/3bar_1display.yaml b/package/3bar_1display.yaml
index 63dbed1..cbe1b80 100644
--- a/package/3bar_1display.yaml
+++ b/package/3bar_1display.yaml
@@ -28,7 +28,7 @@ binary_sensor:
   ### Buttons Main Display ###
   ############################
   - platform: gpio
-    id: 'base_j0_btn_left'
+    id: 'main_display_btn_left'
     name: "Display button Left"
     pin: 
       mcp23xxx: base_J0
@@ -36,7 +36,7 @@ binary_sensor:
       mode: INPUT_PULLUP
       inverted: true
   - platform: gpio
-    id: 'base_j0_btn_right'
+    id: 'main_display_btn_right'
     name: "Display button Right"
     pin: 
       mcp23xxx: base_J0
@@ -48,7 +48,7 @@ binary_sensor:
   ### Buttons BAR module 1 ###
   ############################
   - platform: gpio
-    id: 'base_j1_btn_left'
+    id: 'bar1_btn_left'
     name: "BAR 1 button Left"
     pin: 
       mcp23xxx: base_J1
@@ -56,7 +56,7 @@ binary_sensor:
       mode: INPUT_PULLUP
       inverted: true
   - platform: gpio
-    id: 'base_j1_btn_right'
+    id: 'bar1_btn_right'
     name: "BAR 1 button Right"
     pin: 
       mcp23xxx: base_J1
@@ -68,7 +68,7 @@ binary_sensor:
   ### Buttons BAR module 2 ###
   ############################
   - platform: gpio
-    id: 'base_j2_btn_left'
+    id: 'bar2_btn_left'
     name: "BAR 2 button Left"
     pin: 
       mcp23xxx: base_J2
@@ -76,7 +76,7 @@ binary_sensor:
       mode: INPUT_PULLUP
       inverted: true
   - platform: gpio
-    id: 'base_j2_btn_right'
+    id: 'bar2_btn_right'
     name: "BAR 2 button Right"
     pin: 
       mcp23xxx: base_J2
@@ -88,7 +88,7 @@ binary_sensor:
   ### Buttons BAR module 3 ###
   ############################
   - platform: gpio
-    id: 'base_j3_btn_left'
+    id: 'bar3_btn_left'
     name: "BAR 3 button Left"
     pin: 
       mcp23xxx: base_J3
@@ -96,7 +96,7 @@ binary_sensor:
       mode: INPUT_PULLUP
       inverted: true
   - platform: gpio
-    id: 'base_j3_btn_right'
+    id: 'bar3_btn_right'
     name: "BAR 3 button Right"
     pin: 
       mcp23xxx: base_J3
@@ -112,28 +112,28 @@ light:
   ##############################
   - platform: partition
     name: "BAR 1 Left RGB Front"
-    id: bar_1_left_rgb_front
+    id: bar1_left_rgb_front
     segments:
       - id: neopixels
         from: 0
         to: 0
   - platform: partition
     name: "BAR 1 Left RGB Back"
-    id: bar_1_left_rgb_back
+    id: bar1_left_rgb_back
     segments:
       - id: neopixels
         from: 1
         to: 1
   - platform: partition
     name: "BAR 1 Right RGB Front"
-    id: bar_1_right_rgb_front
+    id: bar1_right_rgb_front
     segments:
       - id: neopixels
         from: 2
         to: 2
   - platform: partition
     name: "BAR 1 Right RGB Back"
-    id: bar_1_right_rgb_back
+    id: bar1_right_rgb_back
     segments:
       - id: neopixels
         from: 3
@@ -143,28 +143,28 @@ light:
   ##############################
   - platform: partition
     name: "BAR 2 Left RGB Front"
-    id: bar_2_left_rgb_front
+    id: bar2_left_rgb_front
     segments:
       - id: neopixels
         from: 4
         to: 4
   - platform: partition
     name: "BAR 2 Left RGB Back"
-    id: bar_2_left_rgb_back
+    id: bar2_left_rgb_back
     segments:
       - id: neopixels
         from: 5
         to: 5
   - platform: partition
     name: "BAR 2 Right RGB Front"
-    id: bar_2_right_rgb_front
+    id: bar2_right_rgb_front
     segments:
       - id: neopixels
         from: 6
         to: 6
   - platform: partition
     name: "BAR 2 Right RGB Back"
-    id: bar_2_right_rgb_back
+    id: bar2_right_rgb_back
     segments:
       - id: neopixels
         from: 7
@@ -174,28 +174,28 @@ light:
   ##############################
   - platform: partition
     name: "BAR 3 Left RGB Front"
-    id: bar_3_left_rgb_front
+    id: bar3_left_rgb_front
     segments:
       - id: neopixels
         from: 8
         to: 8
   - platform: partition
     name: "BAR 3 Left RGB Back"
-    id: bar_3_left_rgb_back
+    id: bar3_left_rgb_back
     segments:
       - id: neopixels
         from: 9
         to: 9
   - platform: partition
     name: "BAR 3 Right RGB Front"
-    id: bar_3_right_rgb_front
+    id: bar3_right_rgb_front
     segments:
       - id: neopixels
         from: 10 
         to: 10
   - platform: partition
     name: "BAR 3 Right RGB Back"
-    id: bar_3_right_rgb_back
+    id: bar3_right_rgb_back
     segments:
       - id: neopixels
         from: 11
@@ -205,7 +205,7 @@ display:
   ####################
   ### Main Display ###
   ####################
-  - id: display_j0_main
+  - id: main_display
     platform: ili9xxx
     model: ili9341
     invert_colors: false
@@ -228,7 +228,7 @@ display:
   ####################
   ### BAR module 1 ###
   ####################
-  - id: display_j1_Left
+  - id: display_bar1_left
     platform: ili9xxx
     model: ST7735
     color_order: bgr
@@ -249,7 +249,7 @@ display:
       width: 80
       offset_width: 24
     rotation: 270
-  - id: display_j1_Right
+  - id: display_bar1_right
     platform: ili9xxx
     model: ST7735
     color_order: bgr
@@ -273,7 +273,7 @@ display:
   ####################
   ### BAR module 2 ###
   ####################
-  - id: display_j2_Left
+  - id: display_bar2_left
     platform: ili9xxx
     model: ST7735
     color_order: bgr
@@ -294,7 +294,7 @@ display:
       width: 80
       offset_width: 24
     rotation: 270
-  - id: display_j2_Right
+  - id: display_bar2_right
     platform: ili9xxx
     model: ST7735
     color_order: bgr
@@ -318,7 +318,7 @@ display:
   ####################
   ### BAR module 3 ###
   ####################
-  - id: display_j3_Left
+  - id: display_bar3_left
     platform: ili9xxx
     model: ST7735
     color_order: bgr
@@ -339,7 +339,7 @@ display:
       width: 80
       offset_width: 24
     rotation: 270
-  - id: display_j3_Right
+  - id: display_bar3_right
     platform: ili9xxx
     model: ST7735
     color_order: bgr