diff --git a/apps/abrepeat.h b/apps/abrepeat.h
index 3c9853f2c5..8d5ea9dd66 100644
--- a/apps/abrepeat.h
+++ b/apps/abrepeat.h
@@ -28,9 +28,7 @@
 
 #define AB_MARKER_NONE 0
 
-#if (AB_REPEAT_ENABLE == 1)
 #include "settings.h"
-#endif
 
 void ab_repeat_init(void);           
 #if 0 /* Currently unused */
@@ -68,11 +66,7 @@ static inline bool ab_B_marker_set(void)
 
 static inline bool ab_repeat_mode_enabled(void)
 {
-#if (AB_REPEAT_ENABLE == 2)
-    return ab_A_marker_set() || ab_B_marker_set();
-#else
     return global_settings.repeat_mode == REPEAT_AB;
-#endif
 }
 
 static inline bool ab_reached_B_marker(unsigned int song_position)
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 2194b2fca0..73ccfa7762 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -325,7 +325,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
                 case REPEAT_AB:
                     gui_statusbar_icon_play_mode(display, Icon_RepeatAB);
                     break;
-#endif /* AB_REPEAT_ENABLE == 1 */
+#endif /* AB_REPEAT_ENABLE */
 
                 case REPEAT_ONE:
                     gui_statusbar_icon_play_mode(display, Icon_RepeatOne);
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 6b5270eb7e..a582afa76b 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -888,10 +888,6 @@ long gui_wps_show(void)
                     {
                         ab_jump_to_A_marker();
                         break;
-#if (AB_REPEAT_ENABLE == 2)
-                    } else {
-                        ab_reset_markers();
-#endif
                     }
                 }
                 else
@@ -915,10 +911,6 @@ long gui_wps_show(void)
                     {
                         ab_jump_to_A_marker();
                         break;
-#if (AB_REPEAT_ENABLE == 2)
-                    } else {
-                        ab_reset_markers();
-#endif
                     }
                 }
                 else
diff --git a/firmware/export/config/application.h b/firmware/export/config/application.h
index 48c384d1a6..a5583ded75 100644
--- a/firmware/export/config/application.h
+++ b/firmware/export/config/application.h
@@ -56,7 +56,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
diff --git a/firmware/export/config/archosfmrecorder.h b/firmware/export/config/archosfmrecorder.h
index b64cc2db01..3e2c7e932e 100644
--- a/firmware/export/config/archosfmrecorder.h
+++ b/firmware/export/config/archosfmrecorder.h
@@ -71,7 +71,7 @@
 #define CONFIG_TUNER S1A0903X01
 #endif
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you have a MAS3587F */
 #define CONFIG_CODEC MAS3587F
diff --git a/firmware/export/config/archosondiofm.h b/firmware/export/config/archosondiofm.h
index 39133ad789..d735f1f0a1 100644
--- a/firmware/export/config/archosondiofm.h
+++ b/firmware/export/config/archosondiofm.h
@@ -41,7 +41,7 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* define this if you have access to the pitchscreen */
diff --git a/firmware/export/config/archosondiosp.h b/firmware/export/config/archosondiosp.h
index 0dac0b2a61..61116033d7 100644
--- a/firmware/export/config/archosondiosp.h
+++ b/firmware/export/config/archosondiosp.h
@@ -34,7 +34,7 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* define this if you have access to the pitchscreen */
diff --git a/firmware/export/config/archosplayer.h b/firmware/export/config/archosplayer.h
index f5e120efef..bc75433950 100644
--- a/firmware/export/config/archosplayer.h
+++ b/firmware/export/config/archosplayer.h
@@ -24,7 +24,7 @@
 /* define this if you have the Player's keyboard */
 #define CONFIG_KEYPAD PLAYER_PAD
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* The number of bytes reserved for loadable plugins */
diff --git a/firmware/export/config/archosrecorder.h b/firmware/export/config/archosrecorder.h
index 38141e3342..f64dd3cf8d 100644
--- a/firmware/export/config/archosrecorder.h
+++ b/firmware/export/config/archosrecorder.h
@@ -60,7 +60,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x8000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you have a MAS3587F */
 #define CONFIG_CODEC MAS3587F
diff --git a/firmware/export/config/archosrecorderv2.h b/firmware/export/config/archosrecorderv2.h
index 08ee6e83af..e2f3b66a82 100644
--- a/firmware/export/config/archosrecorderv2.h
+++ b/firmware/export/config/archosrecorderv2.h
@@ -66,7 +66,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x8000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you have a MAS3587F */
 #define CONFIG_CODEC MAS3587F
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h
index e06e9ea6f8..f9de2768bd 100644
--- a/firmware/export/config/cowond2.h
+++ b/firmware/export/config/cowond2.h
@@ -104,7 +104,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
diff --git a/firmware/export/config/gigabeatfx.h b/firmware/export/config/gigabeatfx.h
index bcb6f73a63..b64f3f5b3b 100644
--- a/firmware/export/config/gigabeatfx.h
+++ b/firmware/export/config/gigabeatfx.h
@@ -104,7 +104,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you have the WM8975 audio codec */
 #define HAVE_WM8751
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h
index 4ba8d9288b..e4c380f8c6 100644
--- a/firmware/export/config/gogearhdd1630.h
+++ b/firmware/export/config/gogearhdd1630.h
@@ -111,7 +111,7 @@
 /* WM8731 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-/* TODO: #define AB_REPEAT_ENABLE 1 */
+/* TODO: #define AB_REPEAT_ENABLE */
 
 /* FM Tuner */
 #define CONFIG_TUNER      TEA5767
diff --git a/firmware/export/config/gogearhdd6330.h b/firmware/export/config/gogearhdd6330.h
index 5bcd1c2c1e..2ef8a43227 100644
--- a/firmware/export/config/gogearhdd6330.h
+++ b/firmware/export/config/gogearhdd6330.h
@@ -111,7 +111,7 @@
 /* WM8731 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-/* TODO: #define AB_REPEAT_ENABLE 1 */
+/* TODO: #define AB_REPEAT_ENABLE */
 
 /* FM Tuner */
 #define CONFIG_TUNER      TEA5767
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config/gogearsa9200.h
index 9de624e454..2d777f1977 100644
--- a/firmware/export/config/gogearsa9200.h
+++ b/firmware/export/config/gogearsa9200.h
@@ -94,7 +94,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
diff --git a/firmware/export/config/iaudio7.h b/firmware/export/config/iaudio7.h
index 6698e13931..8a04bc06c2 100644
--- a/firmware/export/config/iaudio7.h
+++ b/firmware/export/config/iaudio7.h
@@ -107,7 +107,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
diff --git a/firmware/export/config/iaudiom3.h b/firmware/export/config/iaudiom3.h
index 08d8c39475..6fdf11ca77 100644
--- a/firmware/export/config/iaudiom3.h
+++ b/firmware/export/config/iaudiom3.h
@@ -72,7 +72,7 @@
 
 #define CONFIG_KEYPAD IAUDIO_M3_PAD
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this if you do software codec */
diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config/iaudiom5.h
index f3ccbc0622..824744032a 100644
--- a/firmware/export/config/iaudiom5.h
+++ b/firmware/export/config/iaudiom5.h
@@ -89,7 +89,7 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this if you do software codec */
diff --git a/firmware/export/config/iaudiox5.h b/firmware/export/config/iaudiox5.h
index ea7dfbc87e..998feedb87 100644
--- a/firmware/export/config/iaudiox5.h
+++ b/firmware/export/config/iaudiox5.h
@@ -91,7 +91,7 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this if you do software codec */
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h
index 2a08a710e7..b0be26d8fc 100644
--- a/firmware/export/config/ipod4g.h
+++ b/firmware/export/config/ipod4g.h
@@ -106,7 +106,7 @@
 /* Define this if you have the WM8975 audio codec */
 #define HAVE_WM8975
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* define this if you have a disk storage, i.e. something
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h
index 2b4276257f..428e1140c7 100644
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
@@ -90,7 +90,7 @@
 /* Define this if you have the WM8975 audio codec */
 #define HAVE_WM8975
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* define this if you have a disk storage, i.e. something
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h
index 81529a5de5..121a7fc801 100644
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config/ipodmini1g.h
@@ -110,7 +110,7 @@
 /* WM8721 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* define this if you have a disk storage, i.e. something
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h
index 0b6e7636c0..d2be6d1253 100644
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
@@ -108,7 +108,7 @@
 /* WM8721 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* define this if you have a disk storage, i.e. something
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config/ipodnano1g.h
index f60f3c975a..d843a33dd3 100644
--- a/firmware/export/config/ipodnano1g.h
+++ b/firmware/export/config/ipodnano1g.h
@@ -90,7 +90,7 @@
 /* Define this if you have the WM8975 audio codec */
 #define HAVE_WM8975
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this for LCD backlight available */
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config/ipodnano2g.h
index 3ce4a2926b..a4189b35f3 100644
--- a/firmware/export/config/ipodnano2g.h
+++ b/firmware/export/config/ipodnano2g.h
@@ -97,7 +97,7 @@
 
 #define CONFIG_KEYPAD IPOD_4G_PAD
 
-//#define AB_REPEAT_ENABLE 1
+//#define AB_REPEAT_ENABLE
 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this to enable morse code input */
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h
index 54c604f38a..e0c3bfb68e 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
@@ -95,7 +95,7 @@
 /* Define this if you have the WM8758 audio codec */
 #define HAVE_WM8758
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* define this if you have a disk storage, i.e. something
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h
index 95e643e3d8..83c92651a2 100644
--- a/firmware/export/config/iriverh10.h
+++ b/firmware/export/config/iriverh10.h
@@ -110,7 +110,7 @@
 /* WM8731 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner */
 #define CONFIG_TUNER TEA5767
@@ -119,7 +119,7 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 #define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */
 #define BATTERY_CAPACITY_MIN 1500  /* min. capacity selectable */
diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h
index 5e09595b17..4ebbde8ab1 100644
--- a/firmware/export/config/iriverh100.h
+++ b/firmware/export/config/iriverh100.h
@@ -105,7 +105,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 #define CONFIG_TUNER TEA5767
 #define CONFIG_TUNER_XTAL 32768
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h
index 4e901cc432..c2cffcf41f 100644
--- a/firmware/export/config/iriverh10_5gb.h
+++ b/firmware/export/config/iriverh10_5gb.h
@@ -89,7 +89,7 @@
 /* WM8731 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner */
 #define CONFIG_TUNER TEA5767
@@ -102,7 +102,7 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 #define BATTERY_CAPACITY_DEFAULT 820 /* default battery capacity */
 #define BATTERY_CAPACITY_MIN 700  /* min. capacity selectable */
diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h
index 24d1a2451e..44b8988a1b 100644
--- a/firmware/export/config/iriverh120.h
+++ b/firmware/export/config/iriverh120.h
@@ -104,7 +104,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 #define CONFIG_TUNER TEA5767
 #define CONFIG_TUNER_XTAL 32768
diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config/iriverh300.h
index d21566f814..c4224d03c6 100644
--- a/firmware/export/config/iriverh300.h
+++ b/firmware/export/config/iriverh300.h
@@ -100,7 +100,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 #define CONFIG_TUNER TEA5767
 #define CONFIG_TUNER_XTAL 32768
diff --git a/firmware/export/config/logikdax.h b/firmware/export/config/logikdax.h
index 7d8a51f872..05f24daed1 100644
--- a/firmware/export/config/logikdax.h
+++ b/firmware/export/config/logikdax.h
@@ -79,7 +79,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x10000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
diff --git a/firmware/export/config/meizum3.h b/firmware/export/config/meizum3.h
index 58f141c4cb..7cba1c7e7f 100644
--- a/firmware/export/config/meizum3.h
+++ b/firmware/export/config/meizum3.h
@@ -76,7 +76,7 @@
 
 #define CONFIG_KEYPAD MEIZU_M3_PAD
 
-//#define AB_REPEAT_ENABLE 1
+//#define AB_REPEAT_ENABLE
 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this if you do software codec */
diff --git a/firmware/export/config/meizum6sl.h b/firmware/export/config/meizum6sl.h
index d18a34de1d..28c0fc0286 100644
--- a/firmware/export/config/meizum6sl.h
+++ b/firmware/export/config/meizum6sl.h
@@ -76,7 +76,7 @@
 
 #define CONFIG_KEYPAD MEIZU_M6SL_PAD
 
-//#define AB_REPEAT_ENABLE 1
+//#define AB_REPEAT_ENABLE
 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this if you do software codec */
diff --git a/firmware/export/config/meizum6sp.h b/firmware/export/config/meizum6sp.h
index 11716f6ecd..f88be0420c 100644
--- a/firmware/export/config/meizum6sp.h
+++ b/firmware/export/config/meizum6sp.h
@@ -82,7 +82,7 @@
 
 #define CONFIG_KEYPAD MEIZU_M6SP_PAD
 
-//#define AB_REPEAT_ENABLE 1
+//#define AB_REPEAT_ENABLE
 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this if you do software codec */
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h
index 8c707b54b3..e490174dd7 100644
--- a/firmware/export/config/mrobe100.h
+++ b/firmware/export/config/mrobe100.h
@@ -91,7 +91,7 @@
 #define HAVE_WM8751
 #define CODEC_SRCTRL_44100HZ     (0x40|(0x11 << 1)|1)
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* define this if you have a disk storage, i.e. something
    that needs spinups and can cause skips when shaked */
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h
index 31e6c89219..d32871cec0 100644
--- a/firmware/export/config/samsungyh820.h
+++ b/firmware/export/config/samsungyh820.h
@@ -126,7 +126,7 @@
 /* AK4537 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 #define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */
 #define BATTERY_CAPACITY_MIN 1500  /* min. capacity selectable */
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h
index c841b20995..f59c575fe7 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config/samsungyh920.h
@@ -133,7 +133,7 @@
 /* AK4537 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 #define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */
 #define BATTERY_CAPACITY_MIN 1500  /* min. capacity selectable */
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h
index e962172af8..71377488aa 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config/samsungyh925.h
@@ -130,7 +130,7 @@
 /* AK4537 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 #define BATTERY_CAPACITY_DEFAULT 900 /* default battery capacity */
 #define BATTERY_CAPACITY_MIN 500  /* min. capacity selectable */
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config/samsungyps3.h
index 0eba4a27d5..3062d5c58e 100644
--- a/firmware/export/config/samsungyps3.h
+++ b/firmware/export/config/samsungyps3.h
@@ -80,7 +80,7 @@
 /* We have headphone detection */
 #define HAVE_HEADPHONE_DETECTION
 
-//#define AB_REPEAT_ENABLE 1
+//#define AB_REPEAT_ENABLE
 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this if you do software codec */
diff --git a/firmware/export/config/sansac100.h b/firmware/export/config/sansac100.h
index fc298b01d8..e61e42639c 100644
--- a/firmware/export/config/sansac100.h
+++ b/firmware/export/config/sansac100.h
@@ -68,7 +68,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x50000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config/sansac200.h
index 3240af43f2..18456203bb 100644
--- a/firmware/export/config/sansac200.h
+++ b/firmware/export/config/sansac200.h
@@ -112,7 +112,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner */
 #define CONFIG_TUNER LV24020LP
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h
index 5115e91915..aa9ccbe6b3 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config/sansac200v2.h
@@ -109,7 +109,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x14000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner - suspected to be the SI4702 */
 #define CONFIG_TUNER SI4700
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h
index e0f1e2bd4e..3ef6e2649d 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config/sansaclip.h
@@ -113,7 +113,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x10000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner */
 #define CONFIG_TUNER SI4700 /* in fact SI4702 but let's hope it's compatible */
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index c52d803402..8d6ffac9b5 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -120,7 +120,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner */
 #define CONFIG_TUNER (SI4700|RDA5802) /* in fact SI4702 */
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index eb6fb6c737..ad960c3051 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -116,7 +116,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner */
 #define CONFIG_TUNER SI4700 /* in fact SI4702 */
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h
index 501e9eac37..94e9e5b690 100644
--- a/firmware/export/config/sansae200.h
+++ b/firmware/export/config/sansae200.h
@@ -105,7 +105,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner */
 #define CONFIG_TUNER LV24020LP
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h
index f8a66ee05e..ef9c007a58 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config/sansae200v2.h
@@ -103,7 +103,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner - suspected to be the SI4702 */
 #define CONFIG_TUNER SI4700
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h
index 7b7cdb0284..3e1e6c5a66 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@@ -109,7 +109,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner - suspected to be the SI4702 */
 #define CONFIG_TUNER SI4700
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
index b56c8a57e1..78d5b3b33e 100644
--- a/firmware/export/config/sansafuzev2.h
+++ b/firmware/export/config/sansafuzev2.h
@@ -118,7 +118,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* FM Tuner - suspected to be the SI4702 */
 #define CONFIG_TUNER SI4700
diff --git a/firmware/export/config/sansam200.h b/firmware/export/config/sansam200.h
index 25b56a8115..c5eade88e9 100644
--- a/firmware/export/config/sansam200.h
+++ b/firmware/export/config/sansam200.h
@@ -76,7 +76,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x10000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this if you do software codec */
 #define CONFIG_CODEC SWCODEC
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h
index c25a9046ee..88679c1a78 100644
--- a/firmware/export/config/sansam200v4.h
+++ b/firmware/export/config/sansam200v4.h
@@ -81,7 +81,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x10000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 #define CONFIG_TUNER TEA5767
 #define CONFIG_TUNER_XTAL 32768
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config/sansaview.h
index 0752b6c61d..b0317f3e0d 100644
--- a/firmware/export/config/sansaview.h
+++ b/firmware/export/config/sansaview.h
@@ -99,7 +99,7 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x80000
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h
index bda08c8a3e..355c5ed5cf 100644
--- a/firmware/export/config/tatungtpj1022.h
+++ b/firmware/export/config/tatungtpj1022.h
@@ -68,7 +68,7 @@
 /* Define this if you have the WM8731 audio codec */
 #define HAVE_WM8731
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 
 /* define this if you have a disk storage, i.e. something
    that needs spinups and can cause skips when shaked */
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h
index 4475908487..50ffde135b 100644
--- a/firmware/export/config/vibe500.h
+++ b/firmware/export/config/vibe500.h
@@ -104,7 +104,7 @@
 /* WM8731 has no tone controls, so we use the software ones */
 #define HAVE_SW_TONE_CONTROLS
 
-#define AB_REPEAT_ENABLE 1
+#define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
 /* Define this for LCD backlight available */