you can configure to use colors for signal quality (works only with ProgresType big line + outline); update MV-Themes

339 files changed, 508 insertions, 162 deletions

diff --git a/MV_Themes.HISTORY b/MV_Themes.HISTORY
index 9eb6cb78..b04aa6d3 100644
--- a/MV_Themes.HISTORY
+++ b/MV_Themes.HISTORY
@@ -50,3 +50,14 @@ HISTORY
  [15.03.2014] - 'recording_cutted_extra.png' kleiner und in Themenfarbe
               - Fehler in 'vps.png' korrigiert
  [16.03.2014] - Schriftfarbe bei Nachrichten #AAAAAA
+ [21.03.2014] - Schriftfarbe bei Nachrichten #BBBBBB
+              - Farbe Statusmeldung und Knopf 'Blau' in #2222CC
+ [22.03.2014] - Timerkonflikt: Neu 'clrTopBarConflictLowFg', 'clrTopBarConflictLowBg',
+                'clrTopBarConflictHighFg' und 'clrTopBarConflictHighBg'
+              - Audio: Neu 'clrTrackItemSelableBg', 'clrTrackItemSelableFont',
+                'clrTrackItemBorderFg', 'clrTrackItemBorderBg',
+                'clrTrackItemSelableBorderFg' und 'clrTrackItemSelableBorderBg'
+              - Farbe der Symbole 'topbar_timer.png', 'topbar_timerconflict_low.png'
+                und 'topbar_timerconflict_high.png' angepasst
+              - Hinweis auf 'make install' im Skript 'flatPlus_MV_Update.sh'
+              - Option für 'Silent Update' (-u) im Skript 'flatPlus_MV_Update.sh'
diff --git a/MV_Themes.INFO b/MV_Themes.INFO
index b7f0d256..d78da62c 100644
--- a/MV_Themes.INFO
+++ b/MV_Themes.INFO
@@ -1,4 +1,4 @@
-flatPlus-MV_Themen erstellt am 16.03.2014 09:35
+flatPlus-MV_Themen erstellt am 22.03.2014 15:41
 Basisthema: flatPlus-MVGreen.theme, Basisicons: MVdefault
 
 => Installationshimnweise am Ende der Datei! <=
@@ -97,7 +97,6 @@ skinflatplus.EpgAdditionalInfoShow = 1
 skinflatplus.MainMenuItemScale = 1.000000
 skinflatplus.marginOsdHor = 0
 skinflatplus.marginOsdVer = 0
-skinflatplus.MenuChannelType = 1
 skinflatplus.MenuChannelView = 1
 skinflatplus.MenuContentFullSize = 0
 skinflatplus.MenuEventView = 1
@@ -116,6 +115,8 @@ skinflatplus.RecordingSimpleAspectFormat = 1
 skinflatplus.SignalQualityShow = 1
 skinflatplus.TopBarFontSize = 0.048000
 skinflatplus.TopBarMenuIconShow = 1
+skinflatplus.TopBarRecConflictsHigh = 3
+skinflatplus.TopBarRecConflictsShow = 1
 skinflatplus.TopBarRecordingShow = 1
 
 Empfohlene Einstellungen im VDR (Menue - Einstellungen - OSD):
diff --git a/baserender.c b/baserender.c
index 53c3dc56..b857f111 100644
--- a/baserender.c
+++ b/baserender.c
@@ -697,7 +697,7 @@ void cFlatBaseRender::contentDraw(void) {
     }
 }
 
-void cFlatBaseRender::ProgressBarCreate(int Left, int Top, int Width, int Height, int MarginHor, int MarginVer, tColor ColorFg, tColor ColorBarFg, tColor ColorBg, int Type, bool SetBackground) {
+void cFlatBaseRender::ProgressBarCreate(int Left, int Top, int Width, int Height, int MarginHor, int MarginVer, tColor ColorFg, tColor ColorBarFg, tColor ColorBg, int Type, bool SetBackground, bool isSignal) {
     progressBarTop = Top;
     progressBarWidth = Width;
     progressBarHeight = Height;
@@ -710,6 +710,7 @@ void cFlatBaseRender::ProgressBarCreate(int Left, int Top, int Width, int Height
     progressBarColorBg = ColorBg;
     
     progressBarSetBackground = SetBackground;
+    progressBarIsSignal = isSignal;
     
     progressBarColorBarCurFg = Theme.Color(clrReplayProgressBarCurFg);
     
@@ -722,14 +723,14 @@ void cFlatBaseRender::ProgressBarCreate(int Left, int Top, int Width, int Height
 void cFlatBaseRender::ProgressBarDraw(int Current, int Total) {
     ProgressBarDrawRaw(progressBarPixmap, progressBarPixmapBg, cRect(0, 0, progressBarWidth, progressBarHeight),
         cRect(0, 0, progressBarWidth+progressBarMarginVer*2, progressBarHeight+progressBarMarginHor*2),
-        Current, Total, progressBarColorFg, progressBarColorBarFg, progressBarColorBg, ProgressType, progressBarSetBackground);
+        Current, Total, progressBarColorFg, progressBarColorBarFg, progressBarColorBg, ProgressType, progressBarSetBackground, progressBarIsSignal);
 }
 
 void cFlatBaseRender::ProgressBarDrawBgColor(void) {
     progressBarPixmapBg->Fill(progressBarColorBg);
 }
 
-void cFlatBaseRender::ProgressBarDrawRaw(cPixmap *Pixmap, cPixmap *PixmapBg, cRect rect, cRect rectBg, int Current, int Total, tColor ColorFg, tColor ColorBarFg, tColor ColorBg, int Type, bool SetBackground) {
+void cFlatBaseRender::ProgressBarDrawRaw(cPixmap *Pixmap, cPixmap *PixmapBg, cRect rect, cRect rectBg, int Current, int Total, tColor ColorFg, tColor ColorBarFg, tColor ColorBg, int Type, bool SetBackground, bool isSignal) {
     int Middle = rect.Height()/2;
     
     double percentLeft = ((double)Current) / (double)Total;
@@ -779,8 +780,22 @@ void cFlatBaseRender::ProgressBarDrawRaw(cPixmap *Pixmap, cPixmap *PixmapBg, cRe
             Pixmap->DrawRectangle(cRect( rect.Left(), rect.Top(), out, rect.Height()), ColorFg);
             Pixmap->DrawRectangle(cRect( rect.Left() + rect.Width() - out, rect.Top(), out, rect.Height()), ColorFg);
             
-            if (Current > 0)
-                Pixmap->DrawRectangle(cRect( rect.Left(), rect.Top() + Middle - (big/2), (rect.Width() * percentLeft), big), ColorBarFg);
+            if (Current > 0) {
+                if( isSignal ) {
+                    double perc = 100.0 / (double) Total * (double) Current / 100.0;
+                    if( perc > 0.666 ) {
+                        Pixmap->DrawRectangle(cRect( rect.Left() + out, rect.Top() + Middle - (big/2) + out, (rect.Width() * percentLeft) - out*2, big - out*2), Theme.Color(clrButtonGreen));
+                        Pixmap->DrawRectangle(cRect( rect.Left() + out, rect.Top() + Middle - (big/2) + out, (rect.Width() * 0.666) - out*2, big - out*2), Theme.Color(clrButtonYellow));
+                        Pixmap->DrawRectangle(cRect( rect.Left() + out, rect.Top() + Middle - (big/2) + out, (rect.Width() * 0.333) - out*2, big - out*2), Theme.Color(clrButtonRed));
+                    } else if( perc > 0.333 ) {
+                        Pixmap->DrawRectangle(cRect( rect.Left() + out, rect.Top() + Middle - (big/2) + out, (rect.Width() * percentLeft) - out*2, big - out*2), Theme.Color(clrButtonYellow));
+                        Pixmap->DrawRectangle(cRect( rect.Left() + out, rect.Top() + Middle - (big/2) + out, (rect.Width() * 0.333) - out*2, big - out*2), Theme.Color(clrButtonRed));
+                    } else
+                        Pixmap->DrawRectangle(cRect( rect.Left() + out, rect.Top() + Middle - (big/2) + out, (rect.Width() * percentLeft) - out*2, big - out*2), Theme.Color(clrButtonRed));
+                    
+                } else
+                    Pixmap->DrawRectangle(cRect( rect.Left() + out, rect.Top() + Middle - (big/2) + out, (rect.Width() * percentLeft) - out*2, big - out*2), ColorBarFg);
+            }
             break;
         }
         case 3: // small line + big line + dot
diff --git a/baserender.h b/baserender.h
index e113777a..b9ddcccb 100644
--- a/baserender.h
+++ b/baserender.h
@@ -61,6 +61,7 @@ class cFlatBaseRender
         int progressBarHeight, progressBarTop, progressBarWidth, progressBarMarginHor, progressBarMarginVer;
         int ProgressType;
         bool progressBarSetBackground;
+        bool progressBarIsSignal;
         tColor progressBarColorFg, progressBarColorBarFg, progressBarColorBarCurFg, progressBarColorBg;
         tColor progressBarColorMark, progressBarColorMarkCurrent;
         
@@ -138,8 +139,8 @@ class cFlatBaseRender
         void MessageSet(eMessageType Type, const char *Text);
         void MessageClear(void);
 
-        void ProgressBarDrawRaw(cPixmap *Pixmap, cPixmap *PixmapBg, cRect rec, cRect recBg, int Current, int Total, tColor ColorFg, tColor ColorBarFg, tColor ColorBg, int Type, bool SetBackground);
-        void ProgressBarCreate(int Left, int Top, int Width, int Height, int MarginHor, int MarginVer, tColor ColorFg, tColor ColorBarFg, tColor ColorBg, int Type, bool SetBackground = false);
+        void ProgressBarDrawRaw(cPixmap *Pixmap, cPixmap *PixmapBg, cRect rec, cRect recBg, int Current, int Total, tColor ColorFg, tColor ColorBarFg, tColor ColorBg, int Type, bool SetBackground, bool isSignal = false);
+        void ProgressBarCreate(int Left, int Top, int Width, int Height, int MarginHor, int MarginVer, tColor ColorFg, tColor ColorBarFg, tColor ColorBg, int Type, bool SetBackground = false, bool isSignal = false);
         void ProgressBarDrawBgColor(void);
         void ProgressBarDraw(int Current, int Total);
         void ProgressBarDrawMarks(int Current, int Total, const cMarks *Marks, tColor Color, tColor ColorCurrent);
diff --git a/config.c b/config.c
index 85905c6c..f3e6d789 100644
--- a/config.c
+++ b/config.c
@@ -13,6 +13,7 @@ cFlatConfig::cFlatConfig(void) {
 
     ChannelIconsShow = true;
     SignalQualityShow = true;
+    SignalQualityUseColors = false;
     
     DiskUsageShow = true;
     
@@ -197,6 +198,7 @@ bool cFlatConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "MenuItemParseTilde") == 0)                   MenuItemParseTilde = atoi(Value);
     else if (strcmp(Name, "TopBarRecConflictsShow") == 0)               TopBarRecConflictsShow = atoi(Value);
     else if (strcmp(Name, "TopBarRecConflictsHigh") == 0)               TopBarRecConflictsHigh = atoi(Value);
+    else if (strcmp(Name, "SignalQualityUseColors") == 0)               SignalQualityUseColors = atoi(Value);
 
     else return false;
     
diff --git a/config.h b/config.h
index b682c6a7..a921d454 100644
--- a/config.h
+++ b/config.h
@@ -155,6 +155,7 @@ class cFlatConfig
         int ButtonsShowEmpty;
         int ChannelIconsShow;
         int SignalQualityShow;
+        int SignalQualityUseColors;
         int DiskUsageShow;
         
         int MenuItemPadding;
diff --git a/contrib/flatPlus_MV_Update.sh b/contrib/flatPlus_MV_Update.sh
index 23a0de71..6cadee6f 100755
--- a/contrib/flatPlus_MV_Update.sh
+++ b/contrib/flatPlus_MV_Update.sh
@@ -16,7 +16,8 @@ timedout_read() {
   stty "$old_tty_settings"           # See man page for "stty."
 }
 
-# In Skriptordner wechseln
+### Start
+# In Skriptordner wechseln (contrib)
 cd $(dirname $0)  # Skript im contrib-Ordner
 
 if [ ! -d "../$ICONS" -o ! -d "../$THEMES" -o ! -d "../$DECORS" ] ; then
@@ -24,13 +25,26 @@ if [ ! -d "../$ICONS" -o ! -d "../$THEMES" -o ! -d "../$DECORS" ] ; then
   exit 1
 fi
 
-# Löschen!
-echo "-------------------------------"
-echo "MV_Themes löschen? (J/n)"
-timedout_read 5 TASTE
-if [ "$TASTE" = "n" -o "$TASTE" = "N" ] ; then
-  echo "Skript abgebrochen. Es wurde nichts gelöscht!"
-  exit
+if [ -n "$1" ] ; then         # Parameter wurde übergeben
+  if [ "$1" = "-u" -o "$1" = "-U" ] ; then
+    SILENTUPDATE=1 ; echo "Silent Update! ($1)"
+  else
+    echo "Falscher Parameter: $1"
+    echo "Aufruf mit $(basename $0)"
+    echo "Parameter -u    Keine Abfragen (Silent Update)."
+    exit
+  fi
+fi
+
+# MV_Themes Löschen!
+if [ -z "$SILENTUPDATE" ] ; then
+  echo "-------------------------------"
+  echo "MV_Themes löschen? (J/n)"
+  timedout_read 5 TASTE
+  if [ "$TASTE" = "n" -o "$TASTE" = "N" ] ; then
+    echo "Skript abgebrochen. Es wurde nichts gelöscht!"
+    exit
+  fi
 fi
 
 rm -rf ../$ICONS/MV*
@@ -40,22 +54,22 @@ rm -f ../$INFO
 rm -f ../$HIST
 echo "MV-Themen wurden entfernt."
 
-# Themen neu laden
-echo "-------------------------------"
-echo "MV_Themes neu herunterladen und entpacken? (J/n)"
-timedout_read 5 TASTE
-[ "$TASTE" = "n" -o "$TASTE" = "N" ] && exit
+# MV_Themes neu laden
+if [ -z "$SILENTUPDATE" ] ; then
+  echo "-------------------------------"
+  echo "MV_Themes neu herunterladen und entpacken? (J/n)"
+  timedout_read 5 TASTE
+  [ "$TASTE" = "n" -o "$TASTE" = "N" ] && exit
+fi
 
-# Download
 cd ..
+# Download
 wget https://dl.dropboxusercontent.com/u/1490505/VDR/skinflatplus/MV_Themes.tar.xz
+tar -xJf MV_Themes.tar.xz    # Entpacken
+rm -rf MV_Themes.tar.xz      # Archiv entfernen
 
-# Entpacken
-tar -xJf MV_Themes.tar.xz
-
-# Archiv entfernen
-rm -rf MV_Themes.tar.xz
-
+echo "-------------------------------"
 echo "MV-Themen wurden aktualisiert."
+echo "Zum aktivieren 'make install' eingeben."
 
 exit
diff --git a/displaychannel.c b/displaychannel.c
index 5e1ccbfd..5c57f76e 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -22,6 +22,8 @@ cFlatDisplayChannel::cFlatDisplayChannel(bool WithInfo) {
     isRadioChannel = false;
 
     screenWidth = lastScreenWidth = -1;
+    LastSignalStrength = -1;
+    LastSignalQuality = -1;
     
     CreateFullOsd();
     if ( !osd )
@@ -432,6 +434,11 @@ void cFlatDisplayChannel::SignalQualityDraw(void) {
     int SignalQuality = cDevice::ActualDevice()->SignalQuality();
     int signalWidth = channelWidth / 2;
 
+    if( LastSignalStrength == SignalStrength && LastSignalQuality == SignalQuality )
+        return;
+    LastSignalStrength = SignalStrength;
+    LastSignalQuality = SignalQuality;
+    
     cFont *SignalFont = cFont::CreateFont(Setup.FontOsd, Config.decorProgressSignalSize);
     
     int top = fontHeight*2 + fontSmlHeight*2 + marginItem;
@@ -448,7 +455,7 @@ void cFlatDisplayChannel::SignalQualityDraw(void) {
     int progressWidth = signalWidth / 2 - progressLeft - marginItem;
     ProgressBarDrawRaw(chanInfoBottomPixmap, chanInfoBottomPixmap, cRect(progressLeft, progressTop, progressWidth, Config.decorProgressSignalSize),
         cRect(progressLeft, progressTop, progressWidth, Config.decorProgressSignalSize), SignalStrength, 100,
-        Config.decorProgressSignalFg, Config.decorProgressSignalBarFg, Config.decorProgressSignalBg, Config.decorProgressSignalType, false);
+        Config.decorProgressSignalFg, Config.decorProgressSignalBarFg, Config.decorProgressSignalBg, Config.decorProgressSignalType, false, Config.SignalQualityUseColors);
 
     //left = signalWidth / 2 + marginItem;
     top += Config.decorProgressSignalSize + marginItem;
@@ -461,7 +468,8 @@ void cFlatDisplayChannel::SignalQualityDraw(void) {
     
     ProgressBarDrawRaw(chanInfoBottomPixmap, chanInfoBottomPixmap, cRect(progressLeft, progressTop, progressWidth, Config.decorProgressSignalSize),
         cRect(progressLeft, progressTop, progressWidth, Config.decorProgressSignalSize), SignalQuality, 100,
-        Config.decorProgressSignalFg, Config.decorProgressSignalBarFg, Config.decorProgressSignalBg, Config.decorProgressSignalType, false);
+        Config.decorProgressSignalFg, Config.decorProgressSignalBarFg, Config.decorProgressSignalBg, Config.decorProgressSignalType, false, Config.SignalQualityUseColors);
+
 }
 
 void cFlatDisplayChannel::Flush(void) {
diff --git a/displaychannel.h b/displaychannel.h
index 1ef652c2..83011118 100644
--- a/displaychannel.h
+++ b/displaychannel.h
@@ -24,6 +24,8 @@ class cFlatDisplayChannel : public cFlatBaseRender, public cSkinDisplayChannel {
         double screenAspect;
         int heightBottom, heightImageLogo;
     
+        int LastSignalStrength, LastSignalQuality;
+        
         bool isRecording;
         bool isRadioChannel;
         bool isGroup;
diff --git a/icons/MVBerry/changroup.png b/icons/MVBerry/changroup.png
index 103bcd64..02010c79 100644
--- a/icons/MVBerry/changroup.png
+++ b/icons/MVBerry/changroup.png
diff --git a/icons/MVBerry/forward_sel.png b/icons/MVBerry/forward_sel.png
index 2b0ba52b..a8806329 100644
--- a/icons/MVBerry/forward_sel.png
+++ b/icons/MVBerry/forward_sel.png
diff --git a/icons/MVBerry/pause_sel.png b/icons/MVBerry/pause_sel.png
index 2b99ad8d..7b8a27f1 100644
--- a/icons/MVBerry/pause_sel.png
+++ b/icons/MVBerry/pause_sel.png
diff --git a/icons/MVBerry/play_sel.png b/icons/MVBerry/play_sel.png
index 08b533cc..49faaa1d 100644
--- a/icons/MVBerry/play_sel.png
+++ b/icons/MVBerry/play_sel.png
diff --git a/icons/MVBerry/prev_sel.png b/icons/MVBerry/prev_sel.png
index 42573cf2..b6eed339 100644
--- a/icons/MVBerry/prev_sel.png
+++ b/icons/MVBerry/prev_sel.png
diff --git a/icons/MVBerry/recording_cutted_extra.png b/icons/MVBerry/recording_cutted_extra.png
index 8f4e85b7..79caeb22 100644
--- a/icons/MVBerry/recording_cutted_extra.png
+++ b/icons/MVBerry/recording_cutted_extra.png
diff --git a/icons/MVBerry/rewind_sel.png b/icons/MVBerry/rewind_sel.png
index 3186778c..538effe9 100644
--- a/icons/MVBerry/rewind_sel.png
+++ b/icons/MVBerry/rewind_sel.png
diff --git a/icons/MVBerry/skip_sel.png b/icons/MVBerry/skip_sel.png
index 63682c67..0b238213 100644
--- a/icons/MVBerry/skip_sel.png
+++ b/icons/MVBerry/skip_sel.png
diff --git a/icons/MVBerry/topbar_timer.png b/icons/MVBerry/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVBerry/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVBerry/topbar_timerconflict_high.png b/icons/MVBerry/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVBerry/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVBerry/topbar_timerconflict_low.png b/icons/MVBerry/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVBerry/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVBlood/changroup.png b/icons/MVBlood/changroup.png
index bbeb24dd..54662f95 100644
--- a/icons/MVBlood/changroup.png
+++ b/icons/MVBlood/changroup.png
diff --git a/icons/MVBlood/forward_sel.png b/icons/MVBlood/forward_sel.png
index 422443be..5eac5e1a 100644
--- a/icons/MVBlood/forward_sel.png
+++ b/icons/MVBlood/forward_sel.png
diff --git a/icons/MVBlood/pause_sel.png b/icons/MVBlood/pause_sel.png
index bb52d9e9..ffd24da7 100644
--- a/icons/MVBlood/pause_sel.png
+++ b/icons/MVBlood/pause_sel.png
diff --git a/icons/MVBlood/play_sel.png b/icons/MVBlood/play_sel.png
index 9ec30a25..1bfefec9 100644
--- a/icons/MVBlood/play_sel.png
+++ b/icons/MVBlood/play_sel.png
diff --git a/icons/MVBlood/prev_sel.png b/icons/MVBlood/prev_sel.png
index 59065bda..29247e0d 100644
--- a/icons/MVBlood/prev_sel.png
+++ b/icons/MVBlood/prev_sel.png
diff --git a/icons/MVBlood/recording_cutted_extra.png b/icons/MVBlood/recording_cutted_extra.png
index b7ef8683..be13202c 100644
--- a/icons/MVBlood/recording_cutted_extra.png
+++ b/icons/MVBlood/recording_cutted_extra.png
diff --git a/icons/MVBlood/rewind_sel.png b/icons/MVBlood/rewind_sel.png
index 70480eaf..98048074 100644
--- a/icons/MVBlood/rewind_sel.png
+++ b/icons/MVBlood/rewind_sel.png
diff --git a/icons/MVBlood/skip_sel.png b/icons/MVBlood/skip_sel.png
index 6e3bcf21..f7a4ead7 100644
--- a/icons/MVBlood/skip_sel.png
+++ b/icons/MVBlood/skip_sel.png
diff --git a/icons/MVBlood/topbar_timer.png b/icons/MVBlood/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVBlood/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVBlood/topbar_timerconflict_high.png b/icons/MVBlood/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVBlood/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVBlood/topbar_timerconflict_low.png b/icons/MVBlood/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVBlood/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVBlue/changroup.png b/icons/MVBlue/changroup.png
index df2ce44d..88bca478 100644
--- a/icons/MVBlue/changroup.png
+++ b/icons/MVBlue/changroup.png
diff --git a/icons/MVBlue/forward_sel.png b/icons/MVBlue/forward_sel.png
index ed7025be..4416053a 100644
--- a/icons/MVBlue/forward_sel.png
+++ b/icons/MVBlue/forward_sel.png
diff --git a/icons/MVBlue/pause_sel.png b/icons/MVBlue/pause_sel.png
index 24287569..2ee5135d 100644
--- a/icons/MVBlue/pause_sel.png
+++ b/icons/MVBlue/pause_sel.png
diff --git a/icons/MVBlue/play_sel.png b/icons/MVBlue/play_sel.png
index d6d399af..c2c9f050 100644
--- a/icons/MVBlue/play_sel.png
+++ b/icons/MVBlue/play_sel.png
diff --git a/icons/MVBlue/prev_sel.png b/icons/MVBlue/prev_sel.png
index a6c9a589..f069244c 100644
--- a/icons/MVBlue/prev_sel.png
+++ b/icons/MVBlue/prev_sel.png
diff --git a/icons/MVBlue/recording_cutted_extra.png b/icons/MVBlue/recording_cutted_extra.png
index 1b4258ce..0f9280a9 100644
--- a/icons/MVBlue/recording_cutted_extra.png
+++ b/icons/MVBlue/recording_cutted_extra.png
diff --git a/icons/MVBlue/rewind_sel.png b/icons/MVBlue/rewind_sel.png
index b9317d68..e77f3ee6 100644
--- a/icons/MVBlue/rewind_sel.png
+++ b/icons/MVBlue/rewind_sel.png
diff --git a/icons/MVBlue/skip_sel.png b/icons/MVBlue/skip_sel.png
index 1edfd002..dd09613c 100644
--- a/icons/MVBlue/skip_sel.png
+++ b/icons/MVBlue/skip_sel.png
diff --git a/icons/MVBlue/topbar_timer.png b/icons/MVBlue/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVBlue/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVBlue/topbar_timerconflict_high.png b/icons/MVBlue/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVBlue/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVBlue/topbar_timerconflict_low.png b/icons/MVBlue/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVBlue/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVCappuchino/changroup.png b/icons/MVCappuchino/changroup.png
index 2f7b5349..83713b02 100644
--- a/icons/MVCappuchino/changroup.png
+++ b/icons/MVCappuchino/changroup.png
diff --git a/icons/MVCappuchino/forward_sel.png b/icons/MVCappuchino/forward_sel.png
index d7399a27..598f259c 100644
--- a/icons/MVCappuchino/forward_sel.png
+++ b/icons/MVCappuchino/forward_sel.png
diff --git a/icons/MVCappuchino/pause_sel.png b/icons/MVCappuchino/pause_sel.png
index 35ad941a..c7725a99 100644
--- a/icons/MVCappuchino/pause_sel.png
+++ b/icons/MVCappuchino/pause_sel.png
diff --git a/icons/MVCappuchino/play_sel.png b/icons/MVCappuchino/play_sel.png
index 6c54f9bf..a43a809e 100644
--- a/icons/MVCappuchino/play_sel.png
+++ b/icons/MVCappuchino/play_sel.png
diff --git a/icons/MVCappuchino/prev_sel.png b/icons/MVCappuchino/prev_sel.png
index c8155dae..63af8da5 100644
--- a/icons/MVCappuchino/prev_sel.png
+++ b/icons/MVCappuchino/prev_sel.png
diff --git a/icons/MVCappuchino/recording_cutted_extra.png b/icons/MVCappuchino/recording_cutted_extra.png
index cc999093..af550df0 100644
--- a/icons/MVCappuchino/recording_cutted_extra.png
+++ b/icons/MVCappuchino/recording_cutted_extra.png
diff --git a/icons/MVCappuchino/rewind_sel.png b/icons/MVCappuchino/rewind_sel.png
index dca7ee04..7ab7ba8c 100644
--- a/icons/MVCappuchino/rewind_sel.png
+++ b/icons/MVCappuchino/rewind_sel.png
diff --git a/icons/MVCappuchino/skip_sel.png b/icons/MVCappuchino/skip_sel.png
index 8e29887a..77024e9b 100644
--- a/icons/MVCappuchino/skip_sel.png
+++ b/icons/MVCappuchino/skip_sel.png
diff --git a/icons/MVCappuchino/topbar_timer.png b/icons/MVCappuchino/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVCappuchino/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVCappuchino/topbar_timerconflict_high.png b/icons/MVCappuchino/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVCappuchino/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVCappuchino/topbar_timerconflict_low.png b/icons/MVCappuchino/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVCappuchino/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVChocolate/changroup.png b/icons/MVChocolate/changroup.png
index aad1021c..710e1d5b 100644
--- a/icons/MVChocolate/changroup.png
+++ b/icons/MVChocolate/changroup.png
diff --git a/icons/MVChocolate/forward_sel.png b/icons/MVChocolate/forward_sel.png
index 1b476921..2a9842c0 100644
--- a/icons/MVChocolate/forward_sel.png
+++ b/icons/MVChocolate/forward_sel.png
diff --git a/icons/MVChocolate/pause_sel.png b/icons/MVChocolate/pause_sel.png
index cc77f726..f5860057 100644
--- a/icons/MVChocolate/pause_sel.png
+++ b/icons/MVChocolate/pause_sel.png
diff --git a/icons/MVChocolate/play_sel.png b/icons/MVChocolate/play_sel.png
index a322fb0f..c6be753c 100644
--- a/icons/MVChocolate/play_sel.png
+++ b/icons/MVChocolate/play_sel.png
diff --git a/icons/MVChocolate/prev_sel.png b/icons/MVChocolate/prev_sel.png
index b9210f93..73537191 100644
--- a/icons/MVChocolate/prev_sel.png
+++ b/icons/MVChocolate/prev_sel.png
diff --git a/icons/MVChocolate/recording_cutted_extra.png b/icons/MVChocolate/recording_cutted_extra.png
index b79eb6c5..0215608f 100644
--- a/icons/MVChocolate/recording_cutted_extra.png
+++ b/icons/MVChocolate/recording_cutted_extra.png
diff --git a/icons/MVChocolate/rewind_sel.png b/icons/MVChocolate/rewind_sel.png
index c4350451..ad5426c4 100644
--- a/icons/MVChocolate/rewind_sel.png
+++ b/icons/MVChocolate/rewind_sel.png
diff --git a/icons/MVChocolate/skip_sel.png b/icons/MVChocolate/skip_sel.png
index 31c84b58..bc80fbec 100644
--- a/icons/MVChocolate/skip_sel.png
+++ b/icons/MVChocolate/skip_sel.png
diff --git a/icons/MVChocolate/topbar_timer.png b/icons/MVChocolate/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVChocolate/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVChocolate/topbar_timerconflict_high.png b/icons/MVChocolate/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVChocolate/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVChocolate/topbar_timerconflict_low.png b/icons/MVChocolate/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVChocolate/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVCyan/changroup.png b/icons/MVCyan/changroup.png
index 7de71113..8ab8fe54 100644
--- a/icons/MVCyan/changroup.png
+++ b/icons/MVCyan/changroup.png
diff --git a/icons/MVCyan/forward_sel.png b/icons/MVCyan/forward_sel.png
index 5644fb99..ae185d42 100644
--- a/icons/MVCyan/forward_sel.png
+++ b/icons/MVCyan/forward_sel.png
diff --git a/icons/MVCyan/pause_sel.png b/icons/MVCyan/pause_sel.png
index 44824f35..adc3c8aa 100644
--- a/icons/MVCyan/pause_sel.png
+++ b/icons/MVCyan/pause_sel.png
diff --git a/icons/MVCyan/play_sel.png b/icons/MVCyan/play_sel.png
index 3c34313f..171ca3dc 100644
--- a/icons/MVCyan/play_sel.png
+++ b/icons/MVCyan/play_sel.png
diff --git a/icons/MVCyan/prev_sel.png b/icons/MVCyan/prev_sel.png
index ec263480..7aa9803b 100644
--- a/icons/MVCyan/prev_sel.png
+++ b/icons/MVCyan/prev_sel.png
diff --git a/icons/MVCyan/recording_cutted_extra.png b/icons/MVCyan/recording_cutted_extra.png
index fdb15c5e..41f7a889 100644
--- a/icons/MVCyan/recording_cutted_extra.png
+++ b/icons/MVCyan/recording_cutted_extra.png
diff --git a/icons/MVCyan/rewind_sel.png b/icons/MVCyan/rewind_sel.png
index 3898a977..6d56d123 100644
--- a/icons/MVCyan/rewind_sel.png
+++ b/icons/MVCyan/rewind_sel.png
diff --git a/icons/MVCyan/skip_sel.png b/icons/MVCyan/skip_sel.png
index 64ca3526..ae703b89 100644
--- a/icons/MVCyan/skip_sel.png
+++ b/icons/MVCyan/skip_sel.png
diff --git a/icons/MVCyan/topbar_timer.png b/icons/MVCyan/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVCyan/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVCyan/topbar_timerconflict_high.png b/icons/MVCyan/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVCyan/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVCyan/topbar_timerconflict_low.png b/icons/MVCyan/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVCyan/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVDeepBlue/changroup.png b/icons/MVDeepBlue/changroup.png
index 0d9db78e..7ebb5267 100644
--- a/icons/MVDeepBlue/changroup.png
+++ b/icons/MVDeepBlue/changroup.png
diff --git a/icons/MVDeepBlue/forward_sel.png b/icons/MVDeepBlue/forward_sel.png
index 474c4640..d4f777d1 100644
--- a/icons/MVDeepBlue/forward_sel.png
+++ b/icons/MVDeepBlue/forward_sel.png
diff --git a/icons/MVDeepBlue/pause_sel.png b/icons/MVDeepBlue/pause_sel.png
index ee06bfa5..8695eda8 100644
--- a/icons/MVDeepBlue/pause_sel.png
+++ b/icons/MVDeepBlue/pause_sel.png
diff --git a/icons/MVDeepBlue/play_sel.png b/icons/MVDeepBlue/play_sel.png
index 33df1302..6ba9391f 100644
--- a/icons/MVDeepBlue/play_sel.png
+++ b/icons/MVDeepBlue/play_sel.png
diff --git a/icons/MVDeepBlue/prev_sel.png b/icons/MVDeepBlue/prev_sel.png
index e1df2131..da77658f 100644
--- a/icons/MVDeepBlue/prev_sel.png
+++ b/icons/MVDeepBlue/prev_sel.png
diff --git a/icons/MVDeepBlue/recording_cutted_extra.png b/icons/MVDeepBlue/recording_cutted_extra.png
index 0e800bde..69525863 100644
--- a/icons/MVDeepBlue/recording_cutted_extra.png
+++ b/icons/MVDeepBlue/recording_cutted_extra.png
diff --git a/icons/MVDeepBlue/rewind_sel.png b/icons/MVDeepBlue/rewind_sel.png
index 85704851..4bd592b0 100644
--- a/icons/MVDeepBlue/rewind_sel.png
+++ b/icons/MVDeepBlue/rewind_sel.png
diff --git a/icons/MVDeepBlue/skip_sel.png b/icons/MVDeepBlue/skip_sel.png
index b349c982..b00fe617 100644
--- a/icons/MVDeepBlue/skip_sel.png
+++ b/icons/MVDeepBlue/skip_sel.png
diff --git a/icons/MVDeepBlue/topbar_timer.png b/icons/MVDeepBlue/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVDeepBlue/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVDeepBlue/topbar_timerconflict_high.png b/icons/MVDeepBlue/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVDeepBlue/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVDeepBlue/topbar_timerconflict_low.png b/icons/MVDeepBlue/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVDeepBlue/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVFog/changroup.png b/icons/MVFog/changroup.png
index bc50c03a..cac23d98 100644
--- a/icons/MVFog/changroup.png
+++ b/icons/MVFog/changroup.png
diff --git a/icons/MVFog/forward_sel.png b/icons/MVFog/forward_sel.png
index e10a2f3f..38e7dfba 100644
--- a/icons/MVFog/forward_sel.png
+++ b/icons/MVFog/forward_sel.png
diff --git a/icons/MVFog/pause_sel.png b/icons/MVFog/pause_sel.png
index 1417c989..4df2d388 100644
--- a/icons/MVFog/pause_sel.png
+++ b/icons/MVFog/pause_sel.png
diff --git a/icons/MVFog/play_sel.png b/icons/MVFog/play_sel.png
index 946e5a84..f208f547 100644
--- a/icons/MVFog/play_sel.png
+++ b/icons/MVFog/play_sel.png
diff --git a/icons/MVFog/prev_sel.png b/icons/MVFog/prev_sel.png
index 42964dfb..c84c34bd 100644
--- a/icons/MVFog/prev_sel.png
+++ b/icons/MVFog/prev_sel.png
diff --git a/icons/MVFog/recording_cutted_extra.png b/icons/MVFog/recording_cutted_extra.png
index b8b2af2e..d194e046 100644
--- a/icons/MVFog/recording_cutted_extra.png
+++ b/icons/MVFog/recording_cutted_extra.png
diff --git a/icons/MVFog/rewind_sel.png b/icons/MVFog/rewind_sel.png
index fce79c12..386b0ce7 100644
--- a/icons/MVFog/rewind_sel.png
+++ b/icons/MVFog/rewind_sel.png
diff --git a/icons/MVFog/skip_sel.png b/icons/MVFog/skip_sel.png
index 92b849ef..72860645 100644
--- a/icons/MVFog/skip_sel.png
+++ b/icons/MVFog/skip_sel.png
diff --git a/icons/MVFog/topbar_timer.png b/icons/MVFog/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVFog/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVFog/topbar_timerconflict_high.png b/icons/MVFog/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVFog/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVFog/topbar_timerconflict_low.png b/icons/MVFog/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVFog/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVGrapefruit/changroup.png b/icons/MVGrapefruit/changroup.png
index f2815af2..d3dba1af 100644
--- a/icons/MVGrapefruit/changroup.png
+++ b/icons/MVGrapefruit/changroup.png
diff --git a/icons/MVGrapefruit/forward_sel.png b/icons/MVGrapefruit/forward_sel.png
index 0d7e869d..332cd857 100644
--- a/icons/MVGrapefruit/forward_sel.png
+++ b/icons/MVGrapefruit/forward_sel.png
diff --git a/icons/MVGrapefruit/pause_sel.png b/icons/MVGrapefruit/pause_sel.png
index 6acd99fa..03771b71 100644
--- a/icons/MVGrapefruit/pause_sel.png
+++ b/icons/MVGrapefruit/pause_sel.png
diff --git a/icons/MVGrapefruit/play_sel.png b/icons/MVGrapefruit/play_sel.png
index da2107eb..f854e22c 100644
--- a/icons/MVGrapefruit/play_sel.png
+++ b/icons/MVGrapefruit/play_sel.png
diff --git a/icons/MVGrapefruit/prev_sel.png b/icons/MVGrapefruit/prev_sel.png
index 84885f92..d5ec7611 100644
--- a/icons/MVGrapefruit/prev_sel.png
+++ b/icons/MVGrapefruit/prev_sel.png
diff --git a/icons/MVGrapefruit/recording_cutted_extra.png b/icons/MVGrapefruit/recording_cutted_extra.png
index 0c792f0c..6820f749 100644
--- a/icons/MVGrapefruit/recording_cutted_extra.png
+++ b/icons/MVGrapefruit/recording_cutted_extra.png
diff --git a/icons/MVGrapefruit/rewind_sel.png b/icons/MVGrapefruit/rewind_sel.png
index cfa4b1f3..37af1344 100644
--- a/icons/MVGrapefruit/rewind_sel.png
+++ b/icons/MVGrapefruit/rewind_sel.png
diff --git a/icons/MVGrapefruit/skip_sel.png b/icons/MVGrapefruit/skip_sel.png
index 2d800695..7aafbfe7 100644
--- a/icons/MVGrapefruit/skip_sel.png
+++ b/icons/MVGrapefruit/skip_sel.png
diff --git a/icons/MVGrapefruit/topbar_timer.png b/icons/MVGrapefruit/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVGrapefruit/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVGrapefruit/topbar_timerconflict_high.png b/icons/MVGrapefruit/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVGrapefruit/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVGrapefruit/topbar_timerconflict_low.png b/icons/MVGrapefruit/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVGrapefruit/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVGreen/changroup.png b/icons/MVGreen/changroup.png
index eae4fbfd..069510d7 100644
--- a/icons/MVGreen/changroup.png
+++ b/icons/MVGreen/changroup.png
diff --git a/icons/MVGreen/forward_sel.png b/icons/MVGreen/forward_sel.png
index 36838961..378b9e9d 100644
--- a/icons/MVGreen/forward_sel.png
+++ b/icons/MVGreen/forward_sel.png
diff --git a/icons/MVGreen/pause_sel.png b/icons/MVGreen/pause_sel.png
index bea2d40c..46c969c3 100644
--- a/icons/MVGreen/pause_sel.png
+++ b/icons/MVGreen/pause_sel.png
diff --git a/icons/MVGreen/play_sel.png b/icons/MVGreen/play_sel.png
index 78146587..4418561f 100644
--- a/icons/MVGreen/play_sel.png
+++ b/icons/MVGreen/play_sel.png
diff --git a/icons/MVGreen/prev_sel.png b/icons/MVGreen/prev_sel.png
index 0360d82d..ad0f1d84 100644
--- a/icons/MVGreen/prev_sel.png
+++ b/icons/MVGreen/prev_sel.png
diff --git a/icons/MVGreen/recording_cutted_extra.png b/icons/MVGreen/recording_cutted_extra.png
index 634baf9c..e78f238d 100644
--- a/icons/MVGreen/recording_cutted_extra.png
+++ b/icons/MVGreen/recording_cutted_extra.png
diff --git a/icons/MVGreen/rewind_sel.png b/icons/MVGreen/rewind_sel.png
index cd67db69..2ade2693 100644
--- a/icons/MVGreen/rewind_sel.png
+++ b/icons/MVGreen/rewind_sel.png
diff --git a/icons/MVGreen/skip_sel.png b/icons/MVGreen/skip_sel.png
index 41df2c52..a1df8b73 100644
--- a/icons/MVGreen/skip_sel.png
+++ b/icons/MVGreen/skip_sel.png
diff --git a/icons/MVGreen/topbar_timer.png b/icons/MVGreen/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVGreen/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVGreen/topbar_timerconflict_high.png b/icons/MVGreen/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVGreen/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVGreen/topbar_timerconflict_low.png b/icons/MVGreen/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVGreen/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVGreen2/changroup.png b/icons/MVGreen2/changroup.png
index eae4fbfd..069510d7 100644
--- a/icons/MVGreen2/changroup.png
+++ b/icons/MVGreen2/changroup.png
diff --git a/icons/MVGreen2/forward_sel.png b/icons/MVGreen2/forward_sel.png
index 36838961..378b9e9d 100644
--- a/icons/MVGreen2/forward_sel.png
+++ b/icons/MVGreen2/forward_sel.png
diff --git a/icons/MVGreen2/pause_sel.png b/icons/MVGreen2/pause_sel.png
index bea2d40c..46c969c3 100644
--- a/icons/MVGreen2/pause_sel.png
+++ b/icons/MVGreen2/pause_sel.png
diff --git a/icons/MVGreen2/play_sel.png b/icons/MVGreen2/play_sel.png
index 78146587..4418561f 100644
--- a/icons/MVGreen2/play_sel.png
+++ b/icons/MVGreen2/play_sel.png
diff --git a/icons/MVGreen2/prev_sel.png b/icons/MVGreen2/prev_sel.png
index 0360d82d..ad0f1d84 100644
--- a/icons/MVGreen2/prev_sel.png
+++ b/icons/MVGreen2/prev_sel.png
diff --git a/icons/MVGreen2/recording_cutted_extra.png b/icons/MVGreen2/recording_cutted_extra.png
index 634baf9c..e78f238d 100644
--- a/icons/MVGreen2/recording_cutted_extra.png
+++ b/icons/MVGreen2/recording_cutted_extra.png
diff --git a/icons/MVGreen2/rewind_sel.png b/icons/MVGreen2/rewind_sel.png
index cd67db69..2ade2693 100644
--- a/icons/MVGreen2/rewind_sel.png
+++ b/icons/MVGreen2/rewind_sel.png
diff --git a/icons/MVGreen2/skip_sel.png b/icons/MVGreen2/skip_sel.png
index 41df2c52..a1df8b73 100644
--- a/icons/MVGreen2/skip_sel.png
+++ b/icons/MVGreen2/skip_sel.png
diff --git a/icons/MVGreen2/topbar_timer.png b/icons/MVGreen2/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVGreen2/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVGreen2/topbar_timerconflict_high.png b/icons/MVGreen2/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVGreen2/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVGreen2/topbar_timerconflict_low.png b/icons/MVGreen2/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVGreen2/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVGrey/changroup.png b/icons/MVGrey/changroup.png
index eca2a58e..0abbd824 100644
--- a/icons/MVGrey/changroup.png
+++ b/icons/MVGrey/changroup.png
diff --git a/icons/MVGrey/forward_sel.png b/icons/MVGrey/forward_sel.png
index 2b22b715..e085c8b0 100644
--- a/icons/MVGrey/forward_sel.png
+++ b/icons/MVGrey/forward_sel.png
diff --git a/icons/MVGrey/pause_sel.png b/icons/MVGrey/pause_sel.png
index 75659cea..74e7b84b 100644
--- a/icons/MVGrey/pause_sel.png
+++ b/icons/MVGrey/pause_sel.png
diff --git a/icons/MVGrey/play_sel.png b/icons/MVGrey/play_sel.png
index 710410dc..0556c631 100644
--- a/icons/MVGrey/play_sel.png
+++ b/icons/MVGrey/play_sel.png
diff --git a/icons/MVGrey/prev_sel.png b/icons/MVGrey/prev_sel.png
index e06ea0bd..02aa8bed 100644
--- a/icons/MVGrey/prev_sel.png
+++ b/icons/MVGrey/prev_sel.png
diff --git a/icons/MVGrey/recording_cutted_extra.png b/icons/MVGrey/recording_cutted_extra.png
index 070a5a95..5606b85a 100644
--- a/icons/MVGrey/recording_cutted_extra.png
+++ b/icons/MVGrey/recording_cutted_extra.png
diff --git a/icons/MVGrey/rewind_sel.png b/icons/MVGrey/rewind_sel.png
index cad50bbe..8f6a8f84 100644
--- a/icons/MVGrey/rewind_sel.png
+++ b/icons/MVGrey/rewind_sel.png
diff --git a/icons/MVGrey/skip_sel.png b/icons/MVGrey/skip_sel.png
index a6d3d66f..1ebb28e5 100644
--- a/icons/MVGrey/skip_sel.png
+++ b/icons/MVGrey/skip_sel.png
diff --git a/icons/MVGrey/topbar_timer.png b/icons/MVGrey/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVGrey/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVGrey/topbar_timerconflict_high.png b/icons/MVGrey/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVGrey/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVGrey/topbar_timerconflict_low.png b/icons/MVGrey/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVGrey/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVHelloKitty/changroup.png b/icons/MVHelloKitty/changroup.png
index afd149a7..a8d4aa2d 100644
--- a/icons/MVHelloKitty/changroup.png
+++ b/icons/MVHelloKitty/changroup.png
diff --git a/icons/MVHelloKitty/forward_sel.png b/icons/MVHelloKitty/forward_sel.png
index a629a02c..9d49cd66 100644
--- a/icons/MVHelloKitty/forward_sel.png
+++ b/icons/MVHelloKitty/forward_sel.png
diff --git a/icons/MVHelloKitty/pause_sel.png b/icons/MVHelloKitty/pause_sel.png
index a37ceb5d..033337c3 100644
--- a/icons/MVHelloKitty/pause_sel.png
+++ b/icons/MVHelloKitty/pause_sel.png
diff --git a/icons/MVHelloKitty/play_sel.png b/icons/MVHelloKitty/play_sel.png
index f1a1f3b6..5b07e28b 100644
--- a/icons/MVHelloKitty/play_sel.png
+++ b/icons/MVHelloKitty/play_sel.png
diff --git a/icons/MVHelloKitty/prev_sel.png b/icons/MVHelloKitty/prev_sel.png
index 36aec6fb..6de3b646 100644
--- a/icons/MVHelloKitty/prev_sel.png
+++ b/icons/MVHelloKitty/prev_sel.png
diff --git a/icons/MVHelloKitty/recording_cutted_extra.png b/icons/MVHelloKitty/recording_cutted_extra.png
index f01bf623..22aa2ce6 100644
--- a/icons/MVHelloKitty/recording_cutted_extra.png
+++ b/icons/MVHelloKitty/recording_cutted_extra.png
diff --git a/icons/MVHelloKitty/rewind_sel.png b/icons/MVHelloKitty/rewind_sel.png
index 8df9b204..2d970de8 100644
--- a/icons/MVHelloKitty/rewind_sel.png
+++ b/icons/MVHelloKitty/rewind_sel.png
diff --git a/icons/MVHelloKitty/skip_sel.png b/icons/MVHelloKitty/skip_sel.png
index 7037c2e5..a3b60efd 100644
--- a/icons/MVHelloKitty/skip_sel.png
+++ b/icons/MVHelloKitty/skip_sel.png
diff --git a/icons/MVHelloKitty/topbar_timer.png b/icons/MVHelloKitty/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVHelloKitty/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVHelloKitty/topbar_timerconflict_high.png b/icons/MVHelloKitty/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVHelloKitty/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVHelloKitty/topbar_timerconflict_low.png b/icons/MVHelloKitty/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVHelloKitty/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVHelloKitty2/changroup.png b/icons/MVHelloKitty2/changroup.png
index afd149a7..a8d4aa2d 100644
--- a/icons/MVHelloKitty2/changroup.png
+++ b/icons/MVHelloKitty2/changroup.png
diff --git a/icons/MVHelloKitty2/forward_sel.png b/icons/MVHelloKitty2/forward_sel.png
index a629a02c..9d49cd66 100644
--- a/icons/MVHelloKitty2/forward_sel.png
+++ b/icons/MVHelloKitty2/forward_sel.png
diff --git a/icons/MVHelloKitty2/pause_sel.png b/icons/MVHelloKitty2/pause_sel.png
index a37ceb5d..033337c3 100644
--- a/icons/MVHelloKitty2/pause_sel.png
+++ b/icons/MVHelloKitty2/pause_sel.png
diff --git a/icons/MVHelloKitty2/play_sel.png b/icons/MVHelloKitty2/play_sel.png
index f1a1f3b6..5b07e28b 100644
--- a/icons/MVHelloKitty2/play_sel.png
+++ b/icons/MVHelloKitty2/play_sel.png
diff --git a/icons/MVHelloKitty2/prev_sel.png b/icons/MVHelloKitty2/prev_sel.png
index 36aec6fb..6de3b646 100644
--- a/icons/MVHelloKitty2/prev_sel.png
+++ b/icons/MVHelloKitty2/prev_sel.png
diff --git a/icons/MVHelloKitty2/recording_cutted_extra.png b/icons/MVHelloKitty2/recording_cutted_extra.png
index f01bf623..22aa2ce6 100644
--- a/icons/MVHelloKitty2/recording_cutted_extra.png
+++ b/icons/MVHelloKitty2/recording_cutted_extra.png
diff --git a/icons/MVHelloKitty2/rewind_sel.png b/icons/MVHelloKitty2/rewind_sel.png
index 8df9b204..2d970de8 100644
--- a/icons/MVHelloKitty2/rewind_sel.png
+++ b/icons/MVHelloKitty2/rewind_sel.png
diff --git a/icons/MVHelloKitty2/skip_sel.png b/icons/MVHelloKitty2/skip_sel.png
index 7037c2e5..a3b60efd 100644
--- a/icons/MVHelloKitty2/skip_sel.png
+++ b/icons/MVHelloKitty2/skip_sel.png
diff --git a/icons/MVHelloKitty2/topbar_timer.png b/icons/MVHelloKitty2/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVHelloKitty2/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVHelloKitty2/topbar_timerconflict_high.png b/icons/MVHelloKitty2/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVHelloKitty2/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVHelloKitty2/topbar_timerconflict_low.png b/icons/MVHelloKitty2/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVHelloKitty2/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVLightBlue/changroup.png b/icons/MVLightBlue/changroup.png
index fc48cd9d..727c3498 100644
--- a/icons/MVLightBlue/changroup.png
+++ b/icons/MVLightBlue/changroup.png
diff --git a/icons/MVLightBlue/forward_sel.png b/icons/MVLightBlue/forward_sel.png
index e129264b..8386cd10 100644
--- a/icons/MVLightBlue/forward_sel.png
+++ b/icons/MVLightBlue/forward_sel.png
diff --git a/icons/MVLightBlue/pause_sel.png b/icons/MVLightBlue/pause_sel.png
index 8b72a7da..4b514911 100644
--- a/icons/MVLightBlue/pause_sel.png
+++ b/icons/MVLightBlue/pause_sel.png
diff --git a/icons/MVLightBlue/play_sel.png b/icons/MVLightBlue/play_sel.png
index c480cc22..28a144b1 100644
--- a/icons/MVLightBlue/play_sel.png
+++ b/icons/MVLightBlue/play_sel.png
diff --git a/icons/MVLightBlue/prev_sel.png b/icons/MVLightBlue/prev_sel.png
index 6bbb4b7f..cac1ba36 100644
--- a/icons/MVLightBlue/prev_sel.png
+++ b/icons/MVLightBlue/prev_sel.png
diff --git a/icons/MVLightBlue/recording_cutted_extra.png b/icons/MVLightBlue/recording_cutted_extra.png
index 7d4abfc7..c65566fa 100644
--- a/icons/MVLightBlue/recording_cutted_extra.png
+++ b/icons/MVLightBlue/recording_cutted_extra.png
diff --git a/icons/MVLightBlue/rewind_sel.png b/icons/MVLightBlue/rewind_sel.png
index 7381b2e4..0733a15c 100644
--- a/icons/MVLightBlue/rewind_sel.png
+++ b/icons/MVLightBlue/rewind_sel.png
diff --git a/icons/MVLightBlue/skip_sel.png b/icons/MVLightBlue/skip_sel.png
index 162fdb06..f29b65d1 100644
--- a/icons/MVLightBlue/skip_sel.png
+++ b/icons/MVLightBlue/skip_sel.png
diff --git a/icons/MVLightBlue/topbar_timer.png b/icons/MVLightBlue/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVLightBlue/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVLightBlue/topbar_timerconflict_high.png b/icons/MVLightBlue/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVLightBlue/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVLightBlue/topbar_timerconflict_low.png b/icons/MVLightBlue/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVLightBlue/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVLightGreen/changroup.png b/icons/MVLightGreen/changroup.png
index f1df20fd..6724583b 100644
--- a/icons/MVLightGreen/changroup.png
+++ b/icons/MVLightGreen/changroup.png
diff --git a/icons/MVLightGreen/forward_sel.png b/icons/MVLightGreen/forward_sel.png
index edce76da..313c2702 100644
--- a/icons/MVLightGreen/forward_sel.png
+++ b/icons/MVLightGreen/forward_sel.png
diff --git a/icons/MVLightGreen/pause_sel.png b/icons/MVLightGreen/pause_sel.png
index 6b7e79a4..f0efb45b 100644
--- a/icons/MVLightGreen/pause_sel.png
+++ b/icons/MVLightGreen/pause_sel.png
diff --git a/icons/MVLightGreen/play_sel.png b/icons/MVLightGreen/play_sel.png
index 588abc3e..28c1721d 100644
--- a/icons/MVLightGreen/play_sel.png
+++ b/icons/MVLightGreen/play_sel.png
diff --git a/icons/MVLightGreen/prev_sel.png b/icons/MVLightGreen/prev_sel.png
index ae25703d..091ae9f1 100644
--- a/icons/MVLightGreen/prev_sel.png
+++ b/icons/MVLightGreen/prev_sel.png
diff --git a/icons/MVLightGreen/recording_cutted_extra.png b/icons/MVLightGreen/recording_cutted_extra.png
index 736cfe10..773b2641 100644
--- a/icons/MVLightGreen/recording_cutted_extra.png
+++ b/icons/MVLightGreen/recording_cutted_extra.png
diff --git a/icons/MVLightGreen/rewind_sel.png b/icons/MVLightGreen/rewind_sel.png
index 1377d6d1..0e4ed835 100644
--- a/icons/MVLightGreen/rewind_sel.png
+++ b/icons/MVLightGreen/rewind_sel.png
diff --git a/icons/MVLightGreen/skip_sel.png b/icons/MVLightGreen/skip_sel.png
index 2eb43350..dde40abe 100644
--- a/icons/MVLightGreen/skip_sel.png
+++ b/icons/MVLightGreen/skip_sel.png
diff --git a/icons/MVLightGreen/topbar_timer.png b/icons/MVLightGreen/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVLightGreen/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVLightGreen/topbar_timerconflict_high.png b/icons/MVLightGreen/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVLightGreen/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVLightGreen/topbar_timerconflict_low.png b/icons/MVLightGreen/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVLightGreen/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVMint/changroup.png b/icons/MVMint/changroup.png
index 918aca4c..41aa84ad 100644
--- a/icons/MVMint/changroup.png
+++ b/icons/MVMint/changroup.png
diff --git a/icons/MVMint/forward_sel.png b/icons/MVMint/forward_sel.png
index a5c552a8..db11b174 100644
--- a/icons/MVMint/forward_sel.png
+++ b/icons/MVMint/forward_sel.png
diff --git a/icons/MVMint/pause_sel.png b/icons/MVMint/pause_sel.png
index 27a447ba..3468004f 100644
--- a/icons/MVMint/pause_sel.png
+++ b/icons/MVMint/pause_sel.png
diff --git a/icons/MVMint/play_sel.png b/icons/MVMint/play_sel.png
index 0dfda070..c325f601 100644
--- a/icons/MVMint/play_sel.png
+++ b/icons/MVMint/play_sel.png
diff --git a/icons/MVMint/prev_sel.png b/icons/MVMint/prev_sel.png
index 3a7d8596..25181974 100644
--- a/icons/MVMint/prev_sel.png
+++ b/icons/MVMint/prev_sel.png
diff --git a/icons/MVMint/recording_cutted_extra.png b/icons/MVMint/recording_cutted_extra.png
index a111702a..9026cbf8 100644
--- a/icons/MVMint/recording_cutted_extra.png
+++ b/icons/MVMint/recording_cutted_extra.png
diff --git a/icons/MVMint/rewind_sel.png b/icons/MVMint/rewind_sel.png
index e9686d64..52b9d9de 100644
--- a/icons/MVMint/rewind_sel.png
+++ b/icons/MVMint/rewind_sel.png
diff --git a/icons/MVMint/skip_sel.png b/icons/MVMint/skip_sel.png
index 4528afb4..6f9ee364 100644
--- a/icons/MVMint/skip_sel.png
+++ b/icons/MVMint/skip_sel.png
diff --git a/icons/MVMint/topbar_timer.png b/icons/MVMint/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVMint/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVMint/topbar_timerconflict_high.png b/icons/MVMint/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVMint/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVMint/topbar_timerconflict_low.png b/icons/MVMint/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVMint/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVNuts/changroup.png b/icons/MVNuts/changroup.png
index c8f6acfe..5bbd99f1 100644
--- a/icons/MVNuts/changroup.png
+++ b/icons/MVNuts/changroup.png
diff --git a/icons/MVNuts/forward_sel.png b/icons/MVNuts/forward_sel.png
index 8d331e4e..4b9efdf7 100644
--- a/icons/MVNuts/forward_sel.png
+++ b/icons/MVNuts/forward_sel.png
diff --git a/icons/MVNuts/pause_sel.png b/icons/MVNuts/pause_sel.png
index bee9c9af..a7db13cc 100644
--- a/icons/MVNuts/pause_sel.png
+++ b/icons/MVNuts/pause_sel.png
diff --git a/icons/MVNuts/play_sel.png b/icons/MVNuts/play_sel.png
index a9a3d1ad..a31e1ec9 100644
--- a/icons/MVNuts/play_sel.png
+++ b/icons/MVNuts/play_sel.png
diff --git a/icons/MVNuts/prev_sel.png b/icons/MVNuts/prev_sel.png
index 70319df8..16a435eb 100644
--- a/icons/MVNuts/prev_sel.png
+++ b/icons/MVNuts/prev_sel.png
diff --git a/icons/MVNuts/recording_cutted_extra.png b/icons/MVNuts/recording_cutted_extra.png
index 2f6e96b4..e4aaa2e7 100644
--- a/icons/MVNuts/recording_cutted_extra.png
+++ b/icons/MVNuts/recording_cutted_extra.png
diff --git a/icons/MVNuts/rewind_sel.png b/icons/MVNuts/rewind_sel.png
index dbbf9510..b80b9e77 100644
--- a/icons/MVNuts/rewind_sel.png
+++ b/icons/MVNuts/rewind_sel.png
diff --git a/icons/MVNuts/skip_sel.png b/icons/MVNuts/skip_sel.png
index b872e850..896febe0 100644
--- a/icons/MVNuts/skip_sel.png
+++ b/icons/MVNuts/skip_sel.png
diff --git a/icons/MVNuts/topbar_timer.png b/icons/MVNuts/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVNuts/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVNuts/topbar_timerconflict_high.png b/icons/MVNuts/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVNuts/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVNuts/topbar_timerconflict_low.png b/icons/MVNuts/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVNuts/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVOlive/changroup.png b/icons/MVOlive/changroup.png
index 6840b82f..2900246b 100644
--- a/icons/MVOlive/changroup.png
+++ b/icons/MVOlive/changroup.png
diff --git a/icons/MVOlive/forward_sel.png b/icons/MVOlive/forward_sel.png
index b5a02562..d7547c59 100644
--- a/icons/MVOlive/forward_sel.png
+++ b/icons/MVOlive/forward_sel.png
diff --git a/icons/MVOlive/pause_sel.png b/icons/MVOlive/pause_sel.png
index 8e0f4682..20d05fc2 100644
--- a/icons/MVOlive/pause_sel.png
+++ b/icons/MVOlive/pause_sel.png
diff --git a/icons/MVOlive/play_sel.png b/icons/MVOlive/play_sel.png
index 2af85e7d..4b23fb7e 100644
--- a/icons/MVOlive/play_sel.png
+++ b/icons/MVOlive/play_sel.png
diff --git a/icons/MVOlive/prev_sel.png b/icons/MVOlive/prev_sel.png
index 203827ee..682e8183 100644
--- a/icons/MVOlive/prev_sel.png
+++ b/icons/MVOlive/prev_sel.png
diff --git a/icons/MVOlive/recording_cutted_extra.png b/icons/MVOlive/recording_cutted_extra.png
index 33ac9f98..05036fb9 100644
--- a/icons/MVOlive/recording_cutted_extra.png
+++ b/icons/MVOlive/recording_cutted_extra.png
diff --git a/icons/MVOlive/rewind_sel.png b/icons/MVOlive/rewind_sel.png
index 2f6a3aca..37cf0e8a 100644
--- a/icons/MVOlive/rewind_sel.png
+++ b/icons/MVOlive/rewind_sel.png
diff --git a/icons/MVOlive/skip_sel.png b/icons/MVOlive/skip_sel.png
index 5e3d06d3..318e884e 100644
--- a/icons/MVOlive/skip_sel.png
+++ b/icons/MVOlive/skip_sel.png
diff --git a/icons/MVOlive/topbar_timer.png b/icons/MVOlive/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVOlive/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVOlive/topbar_timerconflict_high.png b/icons/MVOlive/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVOlive/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVOlive/topbar_timerconflict_low.png b/icons/MVOlive/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVOlive/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVPflaume/changroup.png b/icons/MVPflaume/changroup.png
index 80ed39ea..1b6bdd5a 100644
--- a/icons/MVPflaume/changroup.png
+++ b/icons/MVPflaume/changroup.png
diff --git a/icons/MVPflaume/forward_sel.png b/icons/MVPflaume/forward_sel.png
index db99ca56..e5991fbb 100644
--- a/icons/MVPflaume/forward_sel.png
+++ b/icons/MVPflaume/forward_sel.png
diff --git a/icons/MVPflaume/pause_sel.png b/icons/MVPflaume/pause_sel.png
index b227f6f6..f5e3111c 100644
--- a/icons/MVPflaume/pause_sel.png
+++ b/icons/MVPflaume/pause_sel.png
diff --git a/icons/MVPflaume/play_sel.png b/icons/MVPflaume/play_sel.png
index dd75bd8d..9dfb86d7 100644
--- a/icons/MVPflaume/play_sel.png
+++ b/icons/MVPflaume/play_sel.png
diff --git a/icons/MVPflaume/prev_sel.png b/icons/MVPflaume/prev_sel.png
index b5be02d2..c36f3462 100644
--- a/icons/MVPflaume/prev_sel.png
+++ b/icons/MVPflaume/prev_sel.png
diff --git a/icons/MVPflaume/recording_cutted_extra.png b/icons/MVPflaume/recording_cutted_extra.png
index f1a347eb..49ff084d 100644
--- a/icons/MVPflaume/recording_cutted_extra.png
+++ b/icons/MVPflaume/recording_cutted_extra.png
diff --git a/icons/MVPflaume/rewind_sel.png b/icons/MVPflaume/rewind_sel.png
index 27c09e93..62f23f20 100644
--- a/icons/MVPflaume/rewind_sel.png
+++ b/icons/MVPflaume/rewind_sel.png
diff --git a/icons/MVPflaume/skip_sel.png b/icons/MVPflaume/skip_sel.png
index 1036cb18..4f42f468 100644
--- a/icons/MVPflaume/skip_sel.png
+++ b/icons/MVPflaume/skip_sel.png
diff --git a/icons/MVPflaume/topbar_timer.png b/icons/MVPflaume/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVPflaume/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVPflaume/topbar_timerconflict_high.png b/icons/MVPflaume/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVPflaume/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVPflaume/topbar_timerconflict_low.png b/icons/MVPflaume/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVPflaume/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVPumpkin/changroup.png b/icons/MVPumpkin/changroup.png
index 454ea7b4..22a93bef 100644
--- a/icons/MVPumpkin/changroup.png
+++ b/icons/MVPumpkin/changroup.png
diff --git a/icons/MVPumpkin/forward_sel.png b/icons/MVPumpkin/forward_sel.png
index 97f1842a..3fe6a09b 100644
--- a/icons/MVPumpkin/forward_sel.png
+++ b/icons/MVPumpkin/forward_sel.png
diff --git a/icons/MVPumpkin/pause_sel.png b/icons/MVPumpkin/pause_sel.png
index c1c44cb2..2ebebfc9 100644
--- a/icons/MVPumpkin/pause_sel.png
+++ b/icons/MVPumpkin/pause_sel.png
diff --git a/icons/MVPumpkin/play_sel.png b/icons/MVPumpkin/play_sel.png
index e6383fce..203e2052 100644
--- a/icons/MVPumpkin/play_sel.png
+++ b/icons/MVPumpkin/play_sel.png
diff --git a/icons/MVPumpkin/prev_sel.png b/icons/MVPumpkin/prev_sel.png
index b1565d67..b91737ca 100644
--- a/icons/MVPumpkin/prev_sel.png
+++ b/icons/MVPumpkin/prev_sel.png
diff --git a/icons/MVPumpkin/recording_cutted_extra.png b/icons/MVPumpkin/recording_cutted_extra.png
index 36e53533..1b197e36 100644
--- a/icons/MVPumpkin/recording_cutted_extra.png
+++ b/icons/MVPumpkin/recording_cutted_extra.png
diff --git a/icons/MVPumpkin/rewind_sel.png b/icons/MVPumpkin/rewind_sel.png
index d7cdafab..359b24cf 100644
--- a/icons/MVPumpkin/rewind_sel.png
+++ b/icons/MVPumpkin/rewind_sel.png
diff --git a/icons/MVPumpkin/skip_sel.png b/icons/MVPumpkin/skip_sel.png
index bc276fd5..de6de978 100644
--- a/icons/MVPumpkin/skip_sel.png
+++ b/icons/MVPumpkin/skip_sel.png
diff --git a/icons/MVPumpkin/topbar_timer.png b/icons/MVPumpkin/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVPumpkin/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVPumpkin/topbar_timerconflict_high.png b/icons/MVPumpkin/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVPumpkin/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVPumpkin/topbar_timerconflict_low.png b/icons/MVPumpkin/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVPumpkin/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVPurple/changroup.png b/icons/MVPurple/changroup.png
index a693b89f..10291719 100644
--- a/icons/MVPurple/changroup.png
+++ b/icons/MVPurple/changroup.png
diff --git a/icons/MVPurple/forward_sel.png b/icons/MVPurple/forward_sel.png
index 3350070f..a7297073 100644
--- a/icons/MVPurple/forward_sel.png
+++ b/icons/MVPurple/forward_sel.png
diff --git a/icons/MVPurple/pause_sel.png b/icons/MVPurple/pause_sel.png
index 68327be2..dbd1a784 100644
--- a/icons/MVPurple/pause_sel.png
+++ b/icons/MVPurple/pause_sel.png
diff --git a/icons/MVPurple/play_sel.png b/icons/MVPurple/play_sel.png
index 0342d509..61032e3f 100644
--- a/icons/MVPurple/play_sel.png
+++ b/icons/MVPurple/play_sel.png
diff --git a/icons/MVPurple/prev_sel.png b/icons/MVPurple/prev_sel.png
index 281002bc..46bf6ea3 100644
--- a/icons/MVPurple/prev_sel.png
+++ b/icons/MVPurple/prev_sel.png
diff --git a/icons/MVPurple/recording_cutted_extra.png b/icons/MVPurple/recording_cutted_extra.png
index c66d967a..f013f118 100644
--- a/icons/MVPurple/recording_cutted_extra.png
+++ b/icons/MVPurple/recording_cutted_extra.png
diff --git a/icons/MVPurple/rewind_sel.png b/icons/MVPurple/rewind_sel.png
index 13340f23..90bef399 100644
--- a/icons/MVPurple/rewind_sel.png
+++ b/icons/MVPurple/rewind_sel.png
diff --git a/icons/MVPurple/skip_sel.png b/icons/MVPurple/skip_sel.png
index 39e520dc..766f66c3 100644
--- a/icons/MVPurple/skip_sel.png
+++ b/icons/MVPurple/skip_sel.png
diff --git a/icons/MVPurple/topbar_timer.png b/icons/MVPurple/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVPurple/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVPurple/topbar_timerconflict_high.png b/icons/MVPurple/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVPurple/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVPurple/topbar_timerconflict_low.png b/icons/MVPurple/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVPurple/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVPurpleGrey/changroup.png b/icons/MVPurpleGrey/changroup.png
index 309e6356..5031424e 100644
--- a/icons/MVPurpleGrey/changroup.png
+++ b/icons/MVPurpleGrey/changroup.png
diff --git a/icons/MVPurpleGrey/forward_sel.png b/icons/MVPurpleGrey/forward_sel.png
index 9368f25d..b80b7186 100644
--- a/icons/MVPurpleGrey/forward_sel.png
+++ b/icons/MVPurpleGrey/forward_sel.png
diff --git a/icons/MVPurpleGrey/pause_sel.png b/icons/MVPurpleGrey/pause_sel.png
index bb44b487..d3055e00 100644
--- a/icons/MVPurpleGrey/pause_sel.png
+++ b/icons/MVPurpleGrey/pause_sel.png
diff --git a/icons/MVPurpleGrey/play_sel.png b/icons/MVPurpleGrey/play_sel.png
index 8dc7f804..5b9d9b23 100644
--- a/icons/MVPurpleGrey/play_sel.png
+++ b/icons/MVPurpleGrey/play_sel.png
diff --git a/icons/MVPurpleGrey/prev_sel.png b/icons/MVPurpleGrey/prev_sel.png
index e4fec42e..1f996c1e 100644
--- a/icons/MVPurpleGrey/prev_sel.png
+++ b/icons/MVPurpleGrey/prev_sel.png
diff --git a/icons/MVPurpleGrey/recording_cutted_extra.png b/icons/MVPurpleGrey/recording_cutted_extra.png
index 9fd6381f..73d2efde 100644
--- a/icons/MVPurpleGrey/recording_cutted_extra.png
+++ b/icons/MVPurpleGrey/recording_cutted_extra.png
diff --git a/icons/MVPurpleGrey/rewind_sel.png b/icons/MVPurpleGrey/rewind_sel.png
index b783fc77..5eeece72 100644
--- a/icons/MVPurpleGrey/rewind_sel.png
+++ b/icons/MVPurpleGrey/rewind_sel.png
diff --git a/icons/MVPurpleGrey/skip_sel.png b/icons/MVPurpleGrey/skip_sel.png
index ef602c18..113efcbd 100644
--- a/icons/MVPurpleGrey/skip_sel.png
+++ b/icons/MVPurpleGrey/skip_sel.png
diff --git a/icons/MVPurpleGrey/topbar_timer.png b/icons/MVPurpleGrey/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVPurpleGrey/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVPurpleGrey/topbar_timerconflict_high.png b/icons/MVPurpleGrey/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVPurpleGrey/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVPurpleGrey/topbar_timerconflict_low.png b/icons/MVPurpleGrey/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVPurpleGrey/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVRauchglas/changroup.png b/icons/MVRauchglas/changroup.png
index aad1021c..710e1d5b 100644
--- a/icons/MVRauchglas/changroup.png
+++ b/icons/MVRauchglas/changroup.png
diff --git a/icons/MVRauchglas/forward_sel.png b/icons/MVRauchglas/forward_sel.png
index 1b476921..2a9842c0 100644
--- a/icons/MVRauchglas/forward_sel.png
+++ b/icons/MVRauchglas/forward_sel.png
diff --git a/icons/MVRauchglas/pause_sel.png b/icons/MVRauchglas/pause_sel.png
index cc77f726..f5860057 100644
--- a/icons/MVRauchglas/pause_sel.png
+++ b/icons/MVRauchglas/pause_sel.png
diff --git a/icons/MVRauchglas/play_sel.png b/icons/MVRauchglas/play_sel.png
index a322fb0f..c6be753c 100644
--- a/icons/MVRauchglas/play_sel.png
+++ b/icons/MVRauchglas/play_sel.png
diff --git a/icons/MVRauchglas/prev_sel.png b/icons/MVRauchglas/prev_sel.png
index b9210f93..73537191 100644
--- a/icons/MVRauchglas/prev_sel.png
+++ b/icons/MVRauchglas/prev_sel.png
diff --git a/icons/MVRauchglas/recording_cutted_extra.png b/icons/MVRauchglas/recording_cutted_extra.png
index b79eb6c5..0215608f 100644
--- a/icons/MVRauchglas/recording_cutted_extra.png
+++ b/icons/MVRauchglas/recording_cutted_extra.png
diff --git a/icons/MVRauchglas/rewind_sel.png b/icons/MVRauchglas/rewind_sel.png
index c4350451..ad5426c4 100644
--- a/icons/MVRauchglas/rewind_sel.png
+++ b/icons/MVRauchglas/rewind_sel.png
diff --git a/icons/MVRauchglas/skip_sel.png b/icons/MVRauchglas/skip_sel.png
index 31c84b58..bc80fbec 100644
--- a/icons/MVRauchglas/skip_sel.png
+++ b/icons/MVRauchglas/skip_sel.png
diff --git a/icons/MVRauchglas/topbar_timer.png b/icons/MVRauchglas/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVRauchglas/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVRauchglas/topbar_timerconflict_high.png b/icons/MVRauchglas/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVRauchglas/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVRauchglas/topbar_timerconflict_low.png b/icons/MVRauchglas/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVRauchglas/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVRed/changroup.png b/icons/MVRed/changroup.png
index e47e4efe..222502a2 100644
--- a/icons/MVRed/changroup.png
+++ b/icons/MVRed/changroup.png
diff --git a/icons/MVRed/forward_sel.png b/icons/MVRed/forward_sel.png
index 3366f4f1..f78320d2 100644
--- a/icons/MVRed/forward_sel.png
+++ b/icons/MVRed/forward_sel.png
diff --git a/icons/MVRed/pause_sel.png b/icons/MVRed/pause_sel.png
index f67acbb4..d06e75ab 100644
--- a/icons/MVRed/pause_sel.png
+++ b/icons/MVRed/pause_sel.png
diff --git a/icons/MVRed/play_sel.png b/icons/MVRed/play_sel.png
index 24b19634..38259508 100644
--- a/icons/MVRed/play_sel.png
+++ b/icons/MVRed/play_sel.png
diff --git a/icons/MVRed/prev_sel.png b/icons/MVRed/prev_sel.png
index 729e5036..366f6ee9 100644
--- a/icons/MVRed/prev_sel.png
+++ b/icons/MVRed/prev_sel.png
diff --git a/icons/MVRed/recording_cutted_extra.png b/icons/MVRed/recording_cutted_extra.png
index 3da53f53..311e9048 100644
--- a/icons/MVRed/recording_cutted_extra.png
+++ b/icons/MVRed/recording_cutted_extra.png
diff --git a/icons/MVRed/rewind_sel.png b/icons/MVRed/rewind_sel.png
index e707e6fa..226bdaa2 100644
--- a/icons/MVRed/rewind_sel.png
+++ b/icons/MVRed/rewind_sel.png
diff --git a/icons/MVRed/skip_sel.png b/icons/MVRed/skip_sel.png
index a406c46c..db0fa522 100644
--- a/icons/MVRed/skip_sel.png
+++ b/icons/MVRed/skip_sel.png
diff --git a/icons/MVRed/topbar_timer.png b/icons/MVRed/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVRed/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVRed/topbar_timerconflict_high.png b/icons/MVRed/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVRed/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVRed/topbar_timerconflict_low.png b/icons/MVRed/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVRed/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVXMAS/changroup.png b/icons/MVXMAS/changroup.png
index 33796c28..af0cde5d 100644
--- a/icons/MVXMAS/changroup.png
+++ b/icons/MVXMAS/changroup.png
diff --git a/icons/MVXMAS/forward_sel.png b/icons/MVXMAS/forward_sel.png
index 345e1786..894bdb10 100644
--- a/icons/MVXMAS/forward_sel.png
+++ b/icons/MVXMAS/forward_sel.png
diff --git a/icons/MVXMAS/pause_sel.png b/icons/MVXMAS/pause_sel.png
index aa6e1fd7..8dc410f8 100644
--- a/icons/MVXMAS/pause_sel.png
+++ b/icons/MVXMAS/pause_sel.png
diff --git a/icons/MVXMAS/play_sel.png b/icons/MVXMAS/play_sel.png
index 98a108dc..86365c47 100644
--- a/icons/MVXMAS/play_sel.png
+++ b/icons/MVXMAS/play_sel.png
diff --git a/icons/MVXMAS/prev_sel.png b/icons/MVXMAS/prev_sel.png
index 5e7fd2db..aa5a5ce7 100644
--- a/icons/MVXMAS/prev_sel.png
+++ b/icons/MVXMAS/prev_sel.png
diff --git a/icons/MVXMAS/recording_cutted_extra.png b/icons/MVXMAS/recording_cutted_extra.png
index ac6c398e..4500f310 100644
--- a/icons/MVXMAS/recording_cutted_extra.png
+++ b/icons/MVXMAS/recording_cutted_extra.png
diff --git a/icons/MVXMAS/rewind_sel.png b/icons/MVXMAS/rewind_sel.png
index 1c665f5f..7b7cacf5 100644
--- a/icons/MVXMAS/rewind_sel.png
+++ b/icons/MVXMAS/rewind_sel.png
diff --git a/icons/MVXMAS/skip_sel.png b/icons/MVXMAS/skip_sel.png
index d26f62e1..cb0e7444 100644
--- a/icons/MVXMAS/skip_sel.png
+++ b/icons/MVXMAS/skip_sel.png
diff --git a/icons/MVXMAS/topbar_timer.png b/icons/MVXMAS/topbar_timer.png
new file mode 120000
index 00000000..f94bc90c
--- /dev/null
+++ b/icons/MVXMAS/topbar_timer.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timer.png
\ No newline at end of file
diff --git a/icons/MVXMAS/topbar_timerconflict_high.png b/icons/MVXMAS/topbar_timerconflict_high.png
new file mode 120000
index 00000000..c28186c2
--- /dev/null
+++ b/icons/MVXMAS/topbar_timerconflict_high.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_high.png
\ No newline at end of file
diff --git a/icons/MVXMAS/topbar_timerconflict_low.png b/icons/MVXMAS/topbar_timerconflict_low.png
new file mode 120000
index 00000000..edaf7f5e
--- /dev/null
+++ b/icons/MVXMAS/topbar_timerconflict_low.png
@@ -0,0 +1 @@
+../MVdefault/topbar_timerconflict_low.png
\ No newline at end of file
diff --git a/icons/MVdefault/169.png b/icons/MVdefault/169.png
index ad29d3df..867701ab 100755
--- a/icons/MVdefault/169.png
+++ b/icons/MVdefault/169.png
diff --git a/icons/MVdefault/221.png b/icons/MVdefault/221.png
index 5f9c35c9..91e48a03 100755
--- a/icons/MVdefault/221.png
+++ b/icons/MVdefault/221.png
diff --git a/icons/MVdefault/43.png b/icons/MVdefault/43.png
index 9432f7c7..66738825 100755
--- a/icons/MVdefault/43.png
+++ b/icons/MVdefault/43.png
diff --git a/icons/MVdefault/crypted.png b/icons/MVdefault/crypted.png
index a9aae82d..64584fdd 100755
--- a/icons/MVdefault/crypted.png
+++ b/icons/MVdefault/crypted.png
diff --git a/icons/MVdefault/forward.png b/icons/MVdefault/forward.png
index aa863017..60fa3877 100755
--- a/icons/MVdefault/forward.png
+++ b/icons/MVdefault/forward.png
diff --git a/icons/MVdefault/hd.png b/icons/MVdefault/hd.png
index 2dc867bb..3f80321c 100755
--- a/icons/MVdefault/hd.png
+++ b/icons/MVdefault/hd.png
diff --git a/icons/MVdefault/pause.png b/icons/MVdefault/pause.png
index 68045516..78a2585d 100755
--- a/icons/MVdefault/pause.png
+++ b/icons/MVdefault/pause.png
diff --git a/icons/MVdefault/play.png b/icons/MVdefault/play.png
index 8c4676dc..113154a9 100755
--- a/icons/MVdefault/play.png
+++ b/icons/MVdefault/play.png
diff --git a/icons/MVdefault/prev.png b/icons/MVdefault/prev.png
index f108086c..6c63d86f 100755
--- a/icons/MVdefault/prev.png
+++ b/icons/MVdefault/prev.png
diff --git a/icons/MVdefault/rewind.png b/icons/MVdefault/rewind.png
index 0f5b03d5..6fab49df 100755
--- a/icons/MVdefault/rewind.png
+++ b/icons/MVdefault/rewind.png
diff --git a/icons/MVdefault/sd.png b/icons/MVdefault/sd.png
index 90418b35..ff1998d3 100755
--- a/icons/MVdefault/sd.png
+++ b/icons/MVdefault/sd.png
diff --git a/icons/MVdefault/skip.png b/icons/MVdefault/skip.png
index 1823ead5..b51e3a6c 100755
--- a/icons/MVdefault/skip.png
+++ b/icons/MVdefault/skip.png
diff --git a/icons/MVdefault/topbar_timer.png b/icons/MVdefault/topbar_timer.png
new file mode 100755
index 00000000..d0d727f0
--- /dev/null
+++ b/icons/MVdefault/topbar_timer.png
diff --git a/icons/MVdefault/topbar_timerconflict_high.png b/icons/MVdefault/topbar_timerconflict_high.png
new file mode 100755
index 00000000..237af9fc
--- /dev/null
+++ b/icons/MVdefault/topbar_timerconflict_high.png
diff --git a/icons/MVdefault/topbar_timerconflict_low.png b/icons/MVdefault/topbar_timerconflict_low.png
new file mode 100755
index 00000000..36f1cdfc
--- /dev/null
+++ b/icons/MVdefault/topbar_timerconflict_low.png
diff --git a/icons/MVdefault/uncrypted.png b/icons/MVdefault/uncrypted.png
index ef6f76bf..5f5ddd3e 100755
--- a/icons/MVdefault/uncrypted.png
+++ b/icons/MVdefault/uncrypted.png
diff --git a/po/de_DE.po b/po/de_DE.po
index 71e6466d..f1188289 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinflat 0.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-21 23:40+0100\n"
+"POT-Creation-Date: 2014-03-22 16:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -225,6 +225,9 @@ msgstr "Zeige Kanalinfo Icons"
 msgid "Show signal quality"
 msgstr "Zeige Signalqualität"
 
+msgid "Colors for signal quality"
+msgstr "Farben für Signalqualität"
+
 msgid "Show resolution & aspect"
 msgstr "Zeige Auflösung & Aspect"
 
diff --git a/setup.c b/setup.c
index 957e664a..75766e09 100644
--- a/setup.c
+++ b/setup.c
@@ -188,6 +188,7 @@ void cFlatSetup::Store(void) {
     SetupStore("MenuItemParseTilde", Config.MenuItemParseTilde);
     SetupStore("TopBarRecConflictsShow", Config.TopBarRecConflictsShow);
     SetupStore("TopBarRecConflictsHigh", Config.TopBarRecConflictsHigh);
+    SetupStore("SignalQualityUseColors", Config.SignalQualityUseColors);
 
     Config.Init();
 }
@@ -310,6 +311,7 @@ void cFlatSetupChannelInfo::Setup(void) {
 
     Add(new cMenuEditBoolItem(tr("Show Channelinfo icons"), &SetupConfig->ChannelIconsShow));
     Add(new cMenuEditBoolItem(tr("Show signal quality"), &SetupConfig->SignalQualityShow));
+    Add(new cMenuEditBoolItem(tr("Colors for signal quality"), &SetupConfig->SignalQualityUseColors));
     Add(new cMenuEditBoolItem(tr("Show resolution & aspect"), &SetupConfig->ChannelResolutionAspectShow));
     Add(new cMenuEditBoolItem(tr("Show format (hd/sd)"), &SetupConfig->ChannelFormatShow));
     Add(new cMenuEditBoolItem(tr("Simple aspect & format"), &SetupConfig->ChannelSimpleAspectFormat));
diff --git a/themes/flatPlus-MVBerry.theme b/themes/flatPlus-MVBerry.theme
index 4bc51bc1..cd186ab0 100755
--- a/themes/flatPlus-MVBerry.theme
+++ b/themes/flatPlus-MVBerry.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFA61D4D
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5A61D4D
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5A61D4D
 clrTrackItemCurrentBorderBg = C5A61D4D
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVBlood.theme b/themes/flatPlus-MVBlood.theme
index 13276a44..502ea143 100755
--- a/themes/flatPlus-MVBlood.theme
+++ b/themes/flatPlus-MVBlood.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5221111
 clrTopBarBorderFg = C5221111
 clrTopBarBorderBg = C5221111
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5221111
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5221111
 clrButtonBg = C5221111
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5221111
 clrButtonBorderBg = C5221111
 clrMessageBg = C5221111
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF911D10
 clrReplayBorderFg = C5221111
 clrReplayBorderBg = C5221111
-clrTrackItemBg = C5221111
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5221111
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5221111
+clrTrackItemSelableBorderBg = C5221111
 clrTrackItemCurrentBg = C5911D10
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5221111
-clrTrackItemBorderBg = C5221111
 clrTrackItemCurrentBorderFg = C5911D10
 clrTrackItemCurrentBorderBg = C5911D10
 clrVolumeBg = C5221111
diff --git a/themes/flatPlus-MVBlue.theme b/themes/flatPlus-MVBlue.theme
index 7667fa92..bc70fe1b 100755
--- a/themes/flatPlus-MVBlue.theme
+++ b/themes/flatPlus-MVBlue.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF0050EF
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C50050EF
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C50050EF
 clrTrackItemCurrentBorderBg = C50050EF
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVCappuchino.theme b/themes/flatPlus-MVCappuchino.theme
index 99670a34..cf65f668 100755
--- a/themes/flatPlus-MVCappuchino.theme
+++ b/themes/flatPlus-MVCappuchino.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF87794E
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C587794E
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C587794E
 clrTrackItemCurrentBorderBg = C587794E
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVChocolate.theme b/themes/flatPlus-MVChocolate.theme
index 56c7cc11..f58b5bc4 100755
--- a/themes/flatPlus-MVChocolate.theme
+++ b/themes/flatPlus-MVChocolate.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF825A2C
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5825A2C
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5825A2C
 clrTrackItemCurrentBorderBg = C5825A2C
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVCyan.theme b/themes/flatPlus-MVCyan.theme
index dbd62425..978c24e6 100755
--- a/themes/flatPlus-MVCyan.theme
+++ b/themes/flatPlus-MVCyan.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF149BAF
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5149BAF
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5149BAF
 clrTrackItemCurrentBorderBg = C5149BAF
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVDeepBlue.theme b/themes/flatPlus-MVDeepBlue.theme
index 2083d024..3baf6390 100755
--- a/themes/flatPlus-MVDeepBlue.theme
+++ b/themes/flatPlus-MVDeepBlue.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101030
 clrTopBarBorderFg = C5101030
 clrTopBarBorderBg = C5101030
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101030
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101030
 clrButtonBg = C5101030
 clrButtonFont = FFDDDDEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101030
 clrButtonBorderBg = C5101030
 clrMessageBg = C5101030
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFDDDDEE
 clrReplayMarkCurrentFg = FF0545DF
 clrReplayBorderFg = C5101030
 clrReplayBorderBg = C5101030
-clrTrackItemBg = C5101030
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFDDDDEE
+clrTrackItemSelableBg = C5101030
+clrTrackItemSelableFont = FFDDDDEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101030
+clrTrackItemSelableBorderBg = C5101030
 clrTrackItemCurrentBg = C50545DF
 clrTrackItemCurrentFont = FFDDDDEE
-clrTrackItemBorderFg = C5101030
-clrTrackItemBorderBg = C5101030
 clrTrackItemCurrentBorderFg = C50545DF
 clrTrackItemCurrentBorderBg = C50545DF
 clrVolumeBg = C5101030
diff --git a/themes/flatPlus-MVFog.theme b/themes/flatPlus-MVFog.theme
index 0ac75034..ee62cd25 100755
--- a/themes/flatPlus-MVFog.theme
+++ b/themes/flatPlus-MVFog.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5DEDEDE
 clrTopBarBorderFg = C5DEDEDE
 clrTopBarBorderBg = C5DEDEDE
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5DEDEDE
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5DEDEDE
 clrButtonBg = C5DEDEDE
 clrButtonFont = FF647887
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5DEDEDE
 clrButtonBorderBg = C5DEDEDE
 clrMessageBg = C5DEDEDE
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FF647887
 clrReplayMarkCurrentFg = FFDEDEDE
 clrReplayBorderFg = C5DEDEDE
 clrReplayBorderBg = C5DEDEDE
-clrTrackItemBg = C5DEDEDE
+clrTrackItemBg = C5555555
 clrTrackItemFont = FF647887
+clrTrackItemSelableBg = C5DEDEDE
+clrTrackItemSelableFont = FF647887
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5DEDEDE
+clrTrackItemSelableBorderBg = C5DEDEDE
 clrTrackItemCurrentBg = C5DEDEDE
 clrTrackItemCurrentFont = FF647887
-clrTrackItemBorderFg = C5DEDEDE
-clrTrackItemBorderBg = C5DEDEDE
 clrTrackItemCurrentBorderFg = C5DEDEDE
 clrTrackItemCurrentBorderBg = C5DEDEDE
 clrVolumeBg = C5DEDEDE
diff --git a/themes/flatPlus-MVGrapefruit.theme b/themes/flatPlus-MVGrapefruit.theme
index dc163278..14026efa 100755
--- a/themes/flatPlus-MVGrapefruit.theme
+++ b/themes/flatPlus-MVGrapefruit.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFC3461B
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5C3461B
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5C3461B
 clrTrackItemCurrentBorderBg = C5C3461B
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVGreen.theme b/themes/flatPlus-MVGreen.theme
index 886d0da9..42e6e558 100755
--- a/themes/flatPlus-MVGreen.theme
+++ b/themes/flatPlus-MVGreen.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF008A00
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5008A00
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5008A00
 clrTrackItemCurrentBorderBg = C5008A00
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVGreen2.theme b/themes/flatPlus-MVGreen2.theme
index e365d9b2..7144f607 100755
--- a/themes/flatPlus-MVGreen2.theme
+++ b/themes/flatPlus-MVGreen2.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5112211
 clrTopBarBorderFg = C5112211
 clrTopBarBorderBg = C5112211
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5112211
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5112211
 clrButtonBg = C5112211
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5112211
 clrButtonBorderBg = C5112211
 clrMessageBg = C5112211
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF008A00
 clrReplayBorderFg = C5112211
 clrReplayBorderBg = C5112211
-clrTrackItemBg = C5112211
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5112211
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5112211
+clrTrackItemSelableBorderBg = C5112211
 clrTrackItemCurrentBg = C5008A00
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5112211
-clrTrackItemBorderBg = C5112211
 clrTrackItemCurrentBorderFg = C5008A00
 clrTrackItemCurrentBorderBg = C5008A00
 clrVolumeBg = C5112211
diff --git a/themes/flatPlus-MVGrey.theme b/themes/flatPlus-MVGrey.theme
index 0cec944d..98862ff4 100755
--- a/themes/flatPlus-MVGrey.theme
+++ b/themes/flatPlus-MVGrey.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF647687
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5647687
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5647687
 clrTrackItemCurrentBorderBg = C5647687
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVHelloKitty.theme b/themes/flatPlus-MVHelloKitty.theme
index c0a23ce4..38b0ff27 100755
--- a/themes/flatPlus-MVHelloKitty.theme
+++ b/themes/flatPlus-MVHelloKitty.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFF472D0
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5F472D0
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5F472D0
 clrTrackItemCurrentBorderBg = C5F472D0
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVHelloKitty2.theme b/themes/flatPlus-MVHelloKitty2.theme
index e21e9f60..72917673 100755
--- a/themes/flatPlus-MVHelloKitty2.theme
+++ b/themes/flatPlus-MVHelloKitty2.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5FF80F0
 clrTopBarBorderFg = C5FF80F0
 clrTopBarBorderBg = C5FF80F0
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5FF80F0
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5FF80F0
 clrButtonBg = C5FF80F0
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5FF80F0
 clrButtonBorderBg = C5FF80F0
 clrMessageBg = C5FF80F0
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFF472D0
 clrReplayBorderFg = C5FF80F0
 clrReplayBorderBg = C5FF80F0
-clrTrackItemBg = C5FF80F0
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5FF80F0
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5FF80F0
+clrTrackItemSelableBorderBg = C5FF80F0
 clrTrackItemCurrentBg = C5F472D0
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5FF80F0
-clrTrackItemBorderBg = C5FF80F0
 clrTrackItemCurrentBorderFg = C5F472D0
 clrTrackItemCurrentBorderBg = C5F472D0
 clrVolumeBg = C5FF80F0
diff --git a/themes/flatPlus-MVLightBlue.theme b/themes/flatPlus-MVLightBlue.theme
index b6922d93..28655946 100755
--- a/themes/flatPlus-MVLightBlue.theme
+++ b/themes/flatPlus-MVLightBlue.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF1BA1E2
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C51BA1E2
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C51BA1E2
 clrTrackItemCurrentBorderBg = C51BA1E2
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVLightGreen.theme b/themes/flatPlus-MVLightGreen.theme
index 49fe7beb..a85d7600 100755
--- a/themes/flatPlus-MVLightGreen.theme
+++ b/themes/flatPlus-MVLightGreen.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF70AD11
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C570AD11
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C570AD11
 clrTrackItemCurrentBorderBg = C570AD11
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVMint.theme b/themes/flatPlus-MVMint.theme
index 0640dd28..f5f89014 100755
--- a/themes/flatPlus-MVMint.theme
+++ b/themes/flatPlus-MVMint.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFA4C400
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5A4C400
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5A4C400
 clrTrackItemCurrentBorderBg = C5A4C400
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVNuts.theme b/themes/flatPlus-MVNuts.theme
index b4098801..5f206df8 100755
--- a/themes/flatPlus-MVNuts.theme
+++ b/themes/flatPlus-MVNuts.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFBF9217
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5BF9217
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5BF9217
 clrTrackItemCurrentBorderBg = C5BF9217
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVOlive.theme b/themes/flatPlus-MVOlive.theme
index 19b9a79d..04ee1f85 100755
--- a/themes/flatPlus-MVOlive.theme
+++ b/themes/flatPlus-MVOlive.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF6D8764
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C56D8764
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C56D8764
 clrTrackItemCurrentBorderBg = C56D8764
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVPflaume.theme b/themes/flatPlus-MVPflaume.theme
index d3a1aee0..7f7dd2f1 100755
--- a/themes/flatPlus-MVPflaume.theme
+++ b/themes/flatPlus-MVPflaume.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF6A00FF
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C56A00FF
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C56A00FF
 clrTrackItemCurrentBorderBg = C56A00FF
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVPumpkin.theme b/themes/flatPlus-MVPumpkin.theme
index 70e1d752..8ac2f178 100755
--- a/themes/flatPlus-MVPumpkin.theme
+++ b/themes/flatPlus-MVPumpkin.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFF0A30A
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5F0A30A
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5F0A30A
 clrTrackItemCurrentBorderBg = C5F0A30A
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVPurple.theme b/themes/flatPlus-MVPurple.theme
index 94c45b9e..748b745b 100755
--- a/themes/flatPlus-MVPurple.theme
+++ b/themes/flatPlus-MVPurple.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF6C0AAB
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C56C0AAB
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C56C0AAB
 clrTrackItemCurrentBorderBg = C56C0AAB
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVPurpleGrey.theme b/themes/flatPlus-MVPurpleGrey.theme
index c50463ff..efe7c5ca 100755
--- a/themes/flatPlus-MVPurpleGrey.theme
+++ b/themes/flatPlus-MVPurpleGrey.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF76608A
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C576608A
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C576608A
 clrTrackItemCurrentBorderBg = C576608A
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVRauchglas.theme b/themes/flatPlus-MVRauchglas.theme
index 652444aa..a560186f 100755
--- a/themes/flatPlus-MVRauchglas.theme
+++ b/themes/flatPlus-MVRauchglas.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5200F02
 clrTopBarBorderFg = C5200F02
 clrTopBarBorderBg = C5200F02
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5200F02
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5200F02
 clrButtonBg = C5200F02
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5200F02
 clrButtonBorderBg = C5200F02
 clrMessageBg = C5200F02
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF825A2C
 clrReplayBorderFg = C5200F02
 clrReplayBorderBg = C5200F02
-clrTrackItemBg = C5200F02
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5200F02
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5200F02
+clrTrackItemSelableBorderBg = C5200F02
 clrTrackItemCurrentBg = C5825A2C
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5200F02
-clrTrackItemBorderBg = C5200F02
 clrTrackItemCurrentBorderFg = C5825A2C
 clrTrackItemCurrentBorderBg = C5825A2C
 clrVolumeBg = C5200F02
diff --git a/themes/flatPlus-MVRed.theme b/themes/flatPlus-MVRed.theme
index e9c3078b..33d2eebd 100755
--- a/themes/flatPlus-MVRed.theme
+++ b/themes/flatPlus-MVRed.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5101010
 clrTopBarBorderFg = C5101010
 clrTopBarBorderBg = C5101010
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5101010
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5101010
 clrButtonBg = C5101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5101010
 clrButtonBorderBg = C5101010
 clrMessageBg = C5101010
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFE51400
 clrReplayBorderFg = C5101010
 clrReplayBorderBg = C5101010
-clrTrackItemBg = C5101010
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5101010
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5101010
+clrTrackItemSelableBorderBg = C5101010
 clrTrackItemCurrentBg = C5E51400
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5101010
-clrTrackItemBorderBg = C5101010
 clrTrackItemCurrentBorderFg = C5E51400
 clrTrackItemCurrentBorderBg = C5E51400
 clrVolumeBg = C5101010
diff --git a/themes/flatPlus-MVXMAS.theme b/themes/flatPlus-MVXMAS.theme
index dec3385e..80474545 100755
--- a/themes/flatPlus-MVXMAS.theme
+++ b/themes/flatPlus-MVXMAS.theme
@@ -7,17 +7,21 @@ clrTopBarRecordingActiveFg = FFCC1111
 clrTopBarRecordingActiveBg = C5114511
 clrTopBarBorderFg = C5114511
 clrTopBarBorderBg = C5114511
+clrTopBarConflictLowFg = FFCCBB33
+clrTopBarConflictLowBg = C5114511
+clrTopBarConflictHighFg =  FFCC2222
+clrTopBarConflictHighBg = C5114511
 clrButtonBg = C5114511
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFCC2222
 clrButtonGreen = FF40A040
 clrButtonYellow = FFCCBB22
-clrButtonBlue = FF0000CC
+clrButtonBlue = FF2222CC
 clrButtonBorderFg = C5114511
 clrButtonBorderBg = C5114511
 clrMessageBg = C5114511
 clrMessageFont = FFAAAAAA
-clrMessageStatus = FF1311CC
+clrMessageStatus = FF2222CC
 clrMessageInfo = FF337633
 clrMessageWarning = FFCCBB33
 clrMessageError = FFCC2222
@@ -89,12 +93,16 @@ clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFCC1111
 clrReplayBorderFg = C5114511
 clrReplayBorderBg = C5114511
-clrTrackItemBg = C5114511
+clrTrackItemBg = C5555555
 clrTrackItemFont = FFEEEEEE
+clrTrackItemSelableBg = C5114511
+clrTrackItemSelableFont = FFEEEEEE
+clrTrackItemBorderFg = C5555555
+clrTrackItemBorderBg = C5555555
+clrTrackItemSelableBorderFg = C5114511
+clrTrackItemSelableBorderBg = C5114511
 clrTrackItemCurrentBg = C5CC1111
 clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C5114511
-clrTrackItemBorderBg = C5114511
 clrTrackItemCurrentBorderFg = C5CC1111
 clrTrackItemCurrentBorderBg = C5CC1111
 clrVolumeBg = C5114511