Reverting to original to resolve merge conflicts

ColorsMK1.py

@@ -3,57 +3,21 @@
 class Rgb:
 	BLACK = Color(4)
 
-	#RED
 	RED = Color(7)
 	RED_FULL = Color(7)
 	RED_HALF = Color(6)
 	RED_THIRD = Color(5)
-
 	RED_BLINK = Color(11)
-	RED_BLINK_HALF = Color(10)
-	RED_BLINK_THIRD = Color(9)
 
-	#GREEN
 	GREEN = Color(52)
 	GREEN_FULL = Color(52)
 	GREEN_HALF = Color(36)
 	GREEN_THIRD = Color(20)
-
 	GREEN_BLINK = Color(56)
-	GREEN_BLINK_HALF = Color(40)
-	GREEN_BLINK_THIRD = Color(24)
 
-	#AMBER
 	AMBER = Color(55)
 	AMBER_FULL = Color(55)
 	AMBER_HALF = Color(38)
 	AMBER_THIRD = Color(21)
-
-	AMBER_BLINK = Color(59)
-	AMBER_BLINK_HALF = Color(42)
-	AMBER_BLINK_THIRD = Color(25)
-
-	#YELLOW
-	YELLOW = Color(54)
-	YELLOW_FULL = Color(54)
-	YELLOW_HALF = Color(37)
-
-	YELLOW_BLINK = Color(58)
-	YELLOW_BLINK_HALF = Color(41)
-
-	#ORANGE
-	ORANGE = Color(39)
-	ORANGE_FULL = Color(39)
-	ORANGE_HALF = Color(22)
-
-	ORANGE_BLINK = Color(43)
-	ORANGE_BLINK_HALF = Color(26)
-
-	#MISC
-	MANDARIN = Color(23)
-	MANDARIN_FULL = Color(23)
-	ORANGE_BLINK = Color(27)
-
-	LIME = Color(43)
-	LIME_FULL = Color(43)
-	LIME_BLINK = Color(47)
+	AMBER_BLINK = Color(21)
+

InstrumentControllerComponent.py

@@ -567,7 +567,7 @@ def _update_matrix(self):
 				button.set_enabled(True)
 				button.force_next_send()
 
-			#self._control_surface._config_button.send_value(32)#Send enable flashing led config message to LP
+			#self._control_surface._config_button.send_value(32)
 
 
 	def tuple_idx(self, tuple, obj):