1 files changed, 14 insertions, 50 deletions

diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 076b0defd7..92873223d9 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -6,61 +6,25 @@ This is a fully featured analogue and digital clock plugin.
 \subsubsection{Key configuration}
 
 \begin{btnmap}
-    \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD%
-        ,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
     & Cycle through modes \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-        ,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp{} / \ButtonDown}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
-      {\ButtonScrollFwd{} / \ButtonScrollBack}
-    \opt{SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} / \ButtonPlus}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginUp{} / \PluginDown
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Cycle through skins \\
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-      {\ButtonMenu}
-    \opt{SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonDown}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{COWON_D2_PAD}{\ButtonMenu{} or \TouchTopLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Main Menu \\
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-      ,SANSA_FUZE_PAD}
-      {\ButtonSelect}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
     & Start / Stop Counter \\
-    \opt{RECORDER_PAD_PAD}{Long \ButtonPlay}%
-    \opt{IRIVER_H10_PAD}{Long \ButtonRew}%
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_FUZE_PAD}
-      {Long \ButtonSelect}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or long \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{Long \ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelectRepeat
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelectRepeat}
     & Reset Counter \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu + \ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& }
-    & Save Settings (if enabled) and Exit \\
 \end{btnmap}
 
 \textbf{Clock Menu}