diff --git a/InstrumentControllerComponent.py b/InstrumentControllerComponent.py
index bcc5e63..c0b5254 100755
--- a/InstrumentControllerComponent.py
+++ b/InstrumentControllerComponent.py
@@ -104,13 +104,14 @@ def _change_swing_amount_value(self, value):
 		
 	def _set_swing_amount_value(self, value):
 		self.song().swing_amount = value
-		self._control_surface.show_message("Swing amount: " + str(int(self._swing_amount()*100)) + "%")
+		self._control_surface.show_message("REPEATER Swing amount: " + str(int(self._swing_amount()*100)) + "%")
 				
 	def _swing_amount(self):
 		return self.song().swing_amount
 	
 	def _toggle_note_repeater(self):
 		self._note_repeat.set_enabled(not self._note_repeat.is_enabled())
+		
 
 	# Refresh button and its listener
 	def set_scales_toggle_button(self, button):
@@ -292,7 +293,8 @@ def _matrix_value_quickscale(self, value, x, y, is_momentary):  # matrix buttons
 						elif x == 5:
 							self._set_swing_amount_value(0.75)	
 						elif x == 6:
-							self._toggle_note_repeater()																							
+							self._toggle_note_repeater()
+							self._control_surface.show_message("REPEATER is: " + str("ON" if self._note_repeat.is_enabled() else "OFF"))																							
 						elif x == 7:
 							self.setup_quick_scale_mode()
 							
@@ -300,7 +302,7 @@ def _matrix_value_quickscale(self, value, x, y, is_momentary):  # matrix buttons
 						if x in range(8):
 							
 							self._note_repeat.set_freq_index(x)
-							self._control_surface.show_message("QUANTIZATION: " + str(self._note_repeat.freq_name()))
+							self._control_surface.show_message("REPEATER Step: " + str(self._note_repeat.freq_name()))
 					self.update()							
 
 	def setup_quick_scale_mode(self):
@@ -312,7 +314,7 @@ def setup_quick_scale_mode(self):
 		elif self._quick_scale_root==1:
 			self._control_surface.show_message("quick scale : modes")
 		else:
-			self._control_surface.show_message("quick scale : note repeater")
+			self._control_surface.show_message("quick scale : REPEATER")
 
 	def update(self):
 		if self.is_enabled():
diff --git a/NoteRepeatComponent.py b/NoteRepeatComponent.py
index af0bbf2..1f7601a 100644
--- a/NoteRepeatComponent.py
+++ b/NoteRepeatComponent.py
@@ -22,7 +22,7 @@ def __init__(self, *a, **k):
         super(NoteRepeatComponent, self).__init__(*a, **k)
         self._last_record_quantization = None
         self._note_repeat = None
-        self._freq_index = 5
+        self._freq_index = 2
         self.set_note_repeat(None)
         Live.Base.log("NoteRepeatComponent - Init End")
 
diff --git a/SkinMK1.py b/SkinMK1.py
index 183b7ab..de9220b 100644
--- a/SkinMK1.py
+++ b/SkinMK1.py
@@ -320,8 +320,8 @@ class QuickScale:
 		
 	class QuickScale:  # quick scale on top of instrument mode
 		class Modus:
-			On = Rgb.ORANGE
-			Off = Rgb.MANDARIN
+			On = Rgb.MANDARIN
+			Off = Rgb.ORANGE
 		class Major:  # quick scale while in major mode
 			class Key:
 				On = Rgb.AMBER
@@ -345,11 +345,11 @@ class Key:
 			Mode = Rgb.GREEN
 		class NoteRepeater:
 			On = Rgb.RED_BLINK
-			Off = Rgb.RED_THIRD
+			Off = Rgb.BLACK
 		class Quant:
 			On = Rgb.GREEN
 			Off = Rgb.GREEN_THIRD
-			Mode = Rgb.YELLOW
+			Mode = Rgb.GREEN
 			Straight = Rgb.ORANGE
 			Swing = Rgb.MANDARIN
 			Dotted = Rgb.LIME
diff --git a/SkinMK2.py b/SkinMK2.py
index 57f643e..cdeacd7 100644
--- a/SkinMK2.py
+++ b/SkinMK2.py
@@ -325,7 +325,20 @@ class Key:
 			CircleOfFifths = Rgb.RED
 			RelativeScale = Rgb.RED
 			Mode = Rgb.GREEN
-		
+		class NoteRepeater:
+			On = Rgb.RED_BLINK
+			Off = Rgb.BLACK
+		class Quant:
+			On = Rgb.GREEN
+			Off = Rgb.GREEN_THIRD
+			Mode = Rgb.GREEN
+			Straight = Rgb.BLUE_THIRD
+			Swing = Rgb.LIGHT_BLUE
+			Dotted = Rgb.PURPLE_THIRD
+			Flam = Rgb.PURPLE
+			Selected = Rgb.RED
+			Note = Rgb.RED_HALF	
+			Tripplet = Rgb.RED_THIRD			
 
 def make_skin():
 	return Skin(Colors)
\ No newline at end of file