From 830251a5458ddb0d6f4d9366a9baa94de4e34fbb Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 3 Nov 2023 19:57:15 -0500
Subject: [PATCH] Cleanup spaces in config macros

---
 addons/ace_interact/ace_arsenal_stats.hpp     |   2 +-
 addons/sys_bf888s/bf888s_RadioDialog.hpp      |  12 +-
 .../vic3/vic3_ffcs_intercomDialog.hpp         |  22 +--
 addons/sys_prc117f/DialogDefines.hpp          | 178 ++++++++---------
 addons/sys_prc117f/menus/script_menus.hpp     |   6 +-
 addons/sys_prc117f/prc117f_RadioDialog.hpp    |  68 +++----
 addons/sys_prc148/CfgVehicles.hpp             |   4 +-
 addons/sys_prc148/prc148_RadioDialog.hpp      | 146 +++++++-------
 addons/sys_prc152/DialogDefines.hpp           | 182 +++++++++---------
 addons/sys_prc152/menus/script_menus.hpp      |   6 +-
 addons/sys_prc152/prc152_RadioDialog.hpp      |  66 +++----
 .../radio/fnc_handleMultipleTransmissions.sqf |   2 +-
 addons/sys_prc343/prc343_RadioDialog.hpp      |  16 +-
 addons/sys_prc77/prc77_RadioDialog.hpp        |  44 ++---
 addons/sys_sem52sl/sem52sl_RadioDialog.hpp    |  32 +--
 addons/sys_sem70/sem70_RadioDialog.hpp        |  72 +++----
 16 files changed, 429 insertions(+), 429 deletions(-)

diff --git a/addons/ace_interact/ace_arsenal_stats.hpp b/addons/ace_interact/ace_arsenal_stats.hpp
index 4cfcff8da..6c8a3024e 100644
--- a/addons/ace_interact/ace_arsenal_stats.hpp
+++ b/addons/ace_interact/ace_arsenal_stats.hpp
@@ -2,7 +2,7 @@
     class statBase;
     class GVAR(frequencyRange): statBase {
         scope = 2;
-        stats[] = {QEGVAR(arsenalStats,frequencyMin), QEGVAR(arsenalStats,frequencyMax)};
+        stats[] = {QEGVAR(arsenalStats,frequencyMin),QEGVAR(arsenalStats,frequencyMax)};
         displayName= CSTRING(arsenalStats_frequencyRange);
         showText = 1;
         textStatement = QUOTE(call FUNC(arsenalStats_frequencyRange));
diff --git a/addons/sys_bf888s/bf888s_RadioDialog.hpp b/addons/sys_bf888s/bf888s_RadioDialog.hpp
index 583825817..41ad6dd9f 100644
--- a/addons/sys_bf888s/bf888s_RadioDialog.hpp
+++ b/addons/sys_bf888s/bf888s_RadioDialog.hpp
@@ -1,9 +1,9 @@
 #define CODE_SPACING    0.0245
 
 #define CONTROL_SetRelativePos(xpos,ypos) x = H_OFFSET + (xpos * 0.001); y = H_OFFSET + (ypos * 0.001);
-#define CONTROL_SetDimensions(width, height) w = width * 0.001; h = height * 0.001;
+#define CONTROL_SetDimensions(width,height) w = width * 0.001; h = height * 0.001;
 
-#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
+#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
 #define END_CONTROL        };
 
 #define NEW_SCALE 0.85
@@ -38,7 +38,7 @@ class BF888S_RadioDialog {
         text = QPATHTOF(Data\static\bf888s_ui_backplate.paa);
     };
     class controls {
-        BEGIN_CONTROL(ChannelKnob, BF888S_RscPicture, 106)
+        BEGIN_CONTROL(ChannelKnob,BF888S_RscPicture,106)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -47,7 +47,7 @@ class BF888S_RadioDialog {
         END_CONTROL
 
         // x 1048, y 927
-        BEGIN_CONTROL(ChannelKnobButton, BF888S_RscButton, 201)
+        BEGIN_CONTROL(ChannelKnobButton,BF888S_RscButton,201)
             x = QUOTE((((((0.410+0.085)-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.38-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE(SCALE*0.04*SafeZoneH);
@@ -58,7 +58,7 @@ class BF888S_RadioDialog {
             toolTip = ECSTRING(sys_radio,ui_ChangeChannel);
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnob, BF888S_RscPicture, 107)
+        BEGIN_CONTROL(VolumeKnob,BF888S_RscPicture,107)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -67,7 +67,7 @@ class BF888S_RadioDialog {
         END_CONTROL
 
         // x 1186, y 922
-        BEGIN_CONTROL(VolumeKnobButton, BF888S_RscButton, 202)
+        BEGIN_CONTROL(VolumeKnobButton,BF888S_RscButton,202)
             x = QUOTE((((((0.450+0.085)-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.38-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE(SCALE*0.04*SafeZoneH);
diff --git a/addons/sys_intercom/vic3/vic3_ffcs_intercomDialog.hpp b/addons/sys_intercom/vic3/vic3_ffcs_intercomDialog.hpp
index b23e33143..9c96e3bf9 100644
--- a/addons/sys_intercom/vic3/vic3_ffcs_intercomDialog.hpp
+++ b/addons/sys_intercom/vic3/vic3_ffcs_intercomDialog.hpp
@@ -1,9 +1,9 @@
 #define CODE_SPACING 0.0245
 
 #define CONTROL_SetRelativePos(xpos,ypos) x = H_OFFSET + (xpos * 0.001); y = H_OFFSET + (ypos * 0.001);
-#define CONTROL_SetDimensions(width, height) w = width * 0.001; h = height * 0.001;
+#define CONTROL_SetDimensions(width,height) w = width * 0.001; h = height * 0.001;
 
-#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
+#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
 #define END_CONTROL };
 
 #define NEW_SCALE 1.4
@@ -18,7 +18,7 @@ class VIC3FFCS_IntercomDialog {
     objects[] = {};
 
     class controls {
-        BEGIN_CONTROL(Vic3ffcsBackground, VIC3FFCS_RscPicture, 100)
+        BEGIN_CONTROL(Vic3ffcsBackground,VIC3FFCS_RscPicture,100)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -26,7 +26,7 @@ class VIC3FFCS_IntercomDialog {
             text = QPATHTOF(vic3\data\ui\vic3_ffcs.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(IntercomKnob, VIC3FFCS_RscPicture, 101)
+        BEGIN_CONTROL(IntercomKnob,VIC3FFCS_RscPicture,101)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -34,7 +34,7 @@ class VIC3FFCS_IntercomDialog {
             text = QPATHTOF(vic3\data\knobs\intercom\intercom_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(MonitorKnob, VIC3FFCS_RscPicture, 102)
+        BEGIN_CONTROL(MonitorKnob,VIC3FFCS_RscPicture,102)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -42,7 +42,7 @@ class VIC3FFCS_IntercomDialog {
             text = QPATHTOF(vic3\data\knobs\monitor\monitor_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnob, VIC3FFCS_RscPicture, 103)
+        BEGIN_CONTROL(VolumeKnob,VIC3FFCS_RscPicture,103)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -50,7 +50,7 @@ class VIC3FFCS_IntercomDialog {
             text = QPATHTOF(vic3\data\knobs\volume\volume_10.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(WorkKnob, VIC3FFCS_RscPicture, 104)
+        BEGIN_CONTROL(WorkKnob,VIC3FFCS_RscPicture,104)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/6 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -59,7 +59,7 @@ class VIC3FFCS_IntercomDialog {
         END_CONTROL
 
         // Do the buttons last so they come on top.
-        BEGIN_CONTROL(IntercomKnobButton, VIC3FFCS_RscButton, 201)
+        BEGIN_CONTROL(IntercomKnobButton,VIC3FFCS_RscButton,201)
             x = QUOTE(((((0.466-0.45)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
             y = QUOTE(((((0.595-0.61)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH);
@@ -69,7 +69,7 @@ class VIC3FFCS_IntercomDialog {
             toolTip = QUOTE(Change intercom activation);
         END_CONTROL
 
-        BEGIN_CONTROL(MonitorKnobButton, VIC3FFCS_RscButton, 202)
+        BEGIN_CONTROL(MonitorKnobButton,VIC3FFCS_RscButton,202)
             x = QUOTE(((((0.466-0.45)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
             y = QUOTE(((((0.595-0.745)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH);
@@ -79,7 +79,7 @@ class VIC3FFCS_IntercomDialog {
             toolTip = QUOTE(Change monitored radio);
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnobButton, VIC3FFCS_RscButton, 203)
+        BEGIN_CONTROL(VolumeKnobButton,VIC3FFCS_RscButton,203)
             x = QUOTE(((((0.466-0.597)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
             y = QUOTE(((((0.595-0.61)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH * 4/3);
@@ -89,7 +89,7 @@ class VIC3FFCS_IntercomDialog {
             toolTip = ECSTRING(sys_radio,ui_ChangeVolume);
         END_CONTROL
 
-        BEGIN_CONTROL(WorkKnobButton, VIC3FFCS_RscButton, 204)
+        BEGIN_CONTROL(WorkKnobButton,VIC3FFCS_RscButton,204)
             x = QUOTE(((((0.466-0.597)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
             y = QUOTE(((((0.595-0.745)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH * 4/3);
diff --git a/addons/sys_prc117f/DialogDefines.hpp b/addons/sys_prc117f/DialogDefines.hpp
index 22c0654c4..4593e8000 100644
--- a/addons/sys_prc117f/DialogDefines.hpp
+++ b/addons/sys_prc117f/DialogDefines.hpp
@@ -15,7 +15,7 @@
 #define CONTROL_SetRelativePos(xpos,ypos) x = QUOTE(H_OFFSET + (xpos * 0.001)); y = QUOTE(H_OFFSET + (ypos * 0.001));
 #define CONTROL_SetDimensions(width,height) w = QUOTE(width * 0.001); h = QUOTE(height * 0.001);
 
-#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
+#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
 #define END_CONTROL        };
 
 /*#define ROW_SMALL_X                0.223
@@ -87,7 +87,7 @@
 
 //colorBackground[] = {44/255,49/255,41/255,0};
 #define TEXT_ROW_ELEMENT(CONTROL_ID,WIDTH,HEIGHT,TEXT_X,TEXT_OFFSETX,OFFSET_NUMX,TEXT_Y,TEXT_OFFSETY,OFFSET_NUMY,FONT_SIZE)\
-    BEGIN_CONTROL(CONTROL_ID, Prc117f_RscText, CONTROL_ID)\
+    BEGIN_CONTROL(CONTROL_ID,Prc117f_RscText,CONTROL_ID)\
         x = QUOTE(((TEXT_X) * safeZoneW) + ((TEXT_OFFSETX*safeZoneW) * OFFSET_NUMX) + safeZoneX);\
         y = QUOTE(((TEXT_Y) * safeZoneW) + ((TEXT_OFFSETY*safeZoneW) * OFFSET_NUMY) + safeZoneX);\
         w = QUOTE(WIDTH*SafeZoneW);\
@@ -98,96 +98,96 @@
         text = "";\
     END_CONTROL
 
-#define TEXT_ROW_SMALL(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 12, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 13, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 14, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 15, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 16, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 17, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 18, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 19, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 20, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,022), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 21, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,023), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 22, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,024), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 23, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,025), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 24, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,026), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 25, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,027), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 26, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,028), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 27, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,029), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 28, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,030), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 29, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,031), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 30, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,032), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 31, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,033), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 32, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)
+#define TEXT_ROW_SMALL(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,12,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,13,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,14,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,15,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,16,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,17,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,18,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,19,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,20,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,022),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,21,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,023),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,22,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,024),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,23,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,025),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,24,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,026),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,25,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,027),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,26,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,028),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,27,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,029),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,28,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,030),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,29,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,031),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,30,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,032),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,31,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,033),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,32,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)
 
-#define TEXT_ROW_LARGE(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 12, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 13, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 14, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 15, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 16, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 17, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 18, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 19, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 20, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,022), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 21, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,023), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 22, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)
+#define TEXT_ROW_LARGE(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,12,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,13,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,14,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,15,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,16,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,17,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,18,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,19,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,20,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,022),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,21,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,023),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,22,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)
 
-#define TEXT_ROW_XLARGE(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 12, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 13, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 14, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)
+#define TEXT_ROW_XLARGE(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,12,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,13,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,14,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)
 
-#define TEXT_ROW_XXLARGE(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)
+#define TEXT_ROW_XXLARGE(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)
 
 #define CT_STATIC 0
 #define CT_BUTTON 1
diff --git a/addons/sys_prc117f/menus/script_menus.hpp b/addons/sys_prc117f/menus/script_menus.hpp
index c2ac7f21c..4a2c94645 100644
--- a/addons/sys_prc117f/menus/script_menus.hpp
+++ b/addons/sys_prc117f/menus/script_menus.hpp
@@ -28,7 +28,7 @@
 #define MENU_TYPE(x) (x select 3)
 #define MENU_SUBMENUS(x) (x select 4)
 
-#define MENU_SUBMENUS_ITEM(menu, index) (MENU_SUBMENUS(menu) select index)
+#define MENU_SUBMENUS_ITEM(menu,index) (MENU_SUBMENUS(menu) select index)
 
 #define MENU_ACTION_EVENTS(menu) (menu select 5)
 #define MENU_ACTION_ONENTRY(menu) ((menu select 5) select 0)
@@ -44,9 +44,9 @@
 
 #define ADD_MENU(menuObj) HASH_SET(GVAR(Menus),MENU_ID(menuObj),menuObj)
 
-#define MENU_SET_PARENT_ID(submenu, menu) submenu pushBack MENU_ID(menu)
+#define MENU_SET_PARENT_ID(submenu,menu) submenu pushBack MENU_ID(menu)
 #define MENU_PARENT_ID(menu) (menu select ((count menu)-1))
-#define MENU_PARENT(menu) (HASH_GET(GVAR(Menus), MENU_PARENT_ID(menu)))
+#define MENU_PARENT(menu) (HASH_GET(GVAR(Menus),MENU_PARENT_ID(menu)))
 
 #define ALIGN_LEFT 1
 #define ALIGN_RIGHT 2
diff --git a/addons/sys_prc117f/prc117f_RadioDialog.hpp b/addons/sys_prc117f/prc117f_RadioDialog.hpp
index d843122be..532607f3b 100644
--- a/addons/sys_prc117f/prc117f_RadioDialog.hpp
+++ b/addons/sys_prc117f/prc117f_RadioDialog.hpp
@@ -22,7 +22,7 @@ class Prc117f_RadioDialog {
     };
     class controls {
 
-        BEGIN_CONTROL(DisplayBackground, Prc117f_RscBackground, 99990)
+        BEGIN_CONTROL(DisplayBackground,Prc117f_RscBackground,99990)
             style = 0x800;
             x = QUOTE(((0.33 * safeZoneW) + safeZoneX));
             y = QUOTE(((0.392 * safeZoneW) + safeZoneX));
@@ -152,23 +152,23 @@ class Prc117f_RadioDialog {
 
 
 
-        TEXT_ROW_LARGE(21, ROW_LARGE_X, ROW_LARGE_Y, 0, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE)
-        TEXT_ROW_LARGE(22, ROW_LARGE_X, ROW_LARGE_Y, 1, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE)
-        TEXT_ROW_LARGE(23, ROW_LARGE_X, ROW_LARGE_Y, 2, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE)
-        TEXT_ROW_LARGE(24, ROW_LARGE_X, ROW_LARGE_Y, 3, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE)
+        TEXT_ROW_LARGE(21,ROW_LARGE_X,ROW_LARGE_Y,0,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE)
+        TEXT_ROW_LARGE(22,ROW_LARGE_X,ROW_LARGE_Y,1,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE)
+        TEXT_ROW_LARGE(23,ROW_LARGE_X,ROW_LARGE_Y,2,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE)
+        TEXT_ROW_LARGE(24,ROW_LARGE_X,ROW_LARGE_Y,3,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE)
 
-        TEXT_ROW_XLARGE(31, ROW_XLARGE_X, ROW_XLARGE_Y, 0, ROW_XLARGE_W, ROW_XLARGE_H, ROW_XLARGE_OFFX, ROW_XLARGE_OFFY, ROW_XLARGE_FONT_SIZE)
-        TEXT_ROW_XLARGE(32, ROW_XLARGE_X, ROW_XLARGE_Y, 1, ROW_XLARGE_W, ROW_XLARGE_H, ROW_XLARGE_OFFX, ROW_XLARGE_OFFY, ROW_XLARGE_FONT_SIZE)
+        TEXT_ROW_XLARGE(31,ROW_XLARGE_X,ROW_XLARGE_Y,0,ROW_XLARGE_W,ROW_XLARGE_H,ROW_XLARGE_OFFX,ROW_XLARGE_OFFY,ROW_XLARGE_FONT_SIZE)
+        TEXT_ROW_XLARGE(32,ROW_XLARGE_X,ROW_XLARGE_Y,1,ROW_XLARGE_W,ROW_XLARGE_H,ROW_XLARGE_OFFX,ROW_XLARGE_OFFY,ROW_XLARGE_FONT_SIZE)
 
-        TEXT_ROW_XXLARGE(41, ROW_XXLARGE_X, ROW_XXLARGE_Y, 0, ROW_XXLARGE_W, ROW_XXLARGE_H, ROW_XXLARGE_OFFX, ROW_XXLARGE_OFFY, ROW_XXLARGE_FONT_SIZE)
+        TEXT_ROW_XXLARGE(41,ROW_XXLARGE_X,ROW_XXLARGE_Y,0,ROW_XXLARGE_W,ROW_XXLARGE_H,ROW_XXLARGE_OFFX,ROW_XXLARGE_OFFY,ROW_XXLARGE_FONT_SIZE)
 
-        TEXT_ROW_SMALL(11, ROW_SMALL_X, ROW_SMALL_Y, 0, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
-        TEXT_ROW_SMALL(12, ROW_SMALL_X, ROW_SMALL_Y, 1, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
-        TEXT_ROW_SMALL(13, ROW_SMALL_X, ROW_SMALL_Y, 2, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
-        TEXT_ROW_SMALL(14, ROW_SMALL_X, ROW_SMALL_Y, 3, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
-        TEXT_ROW_SMALL(15, ROW_SMALL_X, ROW_SMALL_Y, 4, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(11,ROW_SMALL_X,ROW_SMALL_Y,0,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(12,ROW_SMALL_X,ROW_SMALL_Y,1,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(13,ROW_SMALL_X,ROW_SMALL_Y,2,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(14,ROW_SMALL_X,ROW_SMALL_Y,3,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(15,ROW_SMALL_X,ROW_SMALL_Y,4,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
 
-        BEGIN_CONTROL(MODE_ICON, Prc117f_RscPicture, 99901)
+        BEGIN_CONTROL(MODE_ICON,Prc117f_RscPicture,99901)
             x = QUOTE(SafeZoneX);
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*SafeZoneW);
@@ -177,7 +177,7 @@ class Prc117f_RadioDialog {
             text = QPATHTOF(Data\knobs\switch\prc117f_ui_swtch1_01.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(MODE_KNOB, Prc117f_RscButton, "99902+222")
+        BEGIN_CONTROL(MODE_KNOB,Prc117f_RscButton,"99902+222")
             x = QUOTE((0.53 * safeZoneW) + safeZoneX);
             y = QUOTE((0.525 * safeZoneW) + safeZoneX);
             w = QUOTE(0.068235*SafeZoneW);
@@ -190,7 +190,7 @@ class Prc117f_RadioDialog {
 
 
 
-        BEGIN_CONTROL(BUTTON_ICON, Prc117f_RscPicture, 1000)
+        BEGIN_CONTROL(BUTTON_ICON,Prc117f_RscPicture,1000)
             x = QUOTE(SafeZoneX);
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*SafeZoneW);
@@ -199,7 +199,7 @@ class Prc117f_RadioDialog {
             text = QPATHTOF(Data\knobs\prc117f_ui_keys_default.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_ZERO, Prc117f_RscButton, "99902+100")
+        BEGIN_CONTROL(BUTTON_ZERO,Prc117f_RscButton,"99902+100")
             BUTTON_GRID(0,0);
             BUTTONSIZE;
             text = "";
@@ -208,7 +208,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['0'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_ONE, Prc117f_RscButton, "99902+101")
+        BEGIN_CONTROL(BUTTON_ONE,Prc117f_RscButton,"99902+101")
             BUTTON_GRID(1,0);
             BUTTONSIZE;
             text = "";
@@ -217,7 +217,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['1'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_TWO, Prc117f_RscButton, "99902+102")
+        BEGIN_CONTROL(BUTTON_TWO,Prc117f_RscButton,"99902+102")
             BUTTON_GRID(2,0);
             BUTTONSIZE;
             text = "";
@@ -226,7 +226,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['2'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_THREE, Prc117f_RscButton, "99902+103")
+        BEGIN_CONTROL(BUTTON_THREE,Prc117f_RscButton,"99902+103")
             BUTTON_GRID(3,0);
             BUTTONSIZE;
             text = "";
@@ -235,7 +235,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['3'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_FOUR, Prc117f_RscButton, "99902+104")
+        BEGIN_CONTROL(BUTTON_FOUR,Prc117f_RscButton,"99902+104")
             BUTTON_GRID(1,1);
             BUTTONSIZE;
             text = "";
@@ -244,7 +244,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['4'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_FIVE, Prc117f_RscButton, "99902+105")
+        BEGIN_CONTROL(BUTTON_FIVE,Prc117f_RscButton,"99902+105")
             BUTTON_GRID(2,1);
             BUTTONSIZE;
             text = "";
@@ -253,7 +253,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['5'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_SIX, Prc117f_RscButton, "99902+106")
+        BEGIN_CONTROL(BUTTON_SIX,Prc117f_RscButton,"99902+106")
             BUTTON_GRID(3,1);
             BUTTONSIZE;
             text = "";
@@ -262,7 +262,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['6'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_SEVEN, Prc117f_RscButton, "99902+107")
+        BEGIN_CONTROL(BUTTON_SEVEN,Prc117f_RscButton,"99902+107")
             BUTTON_GRID(1,2);
             BUTTONSIZE;
             text = "";
@@ -271,7 +271,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['7'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_EIGHT, Prc117f_RscButton, "99902+108")
+        BEGIN_CONTROL(BUTTON_EIGHT,Prc117f_RscButton,"99902+108")
             BUTTON_GRID(2,2);
             BUTTONSIZE;
             text = "";
@@ -280,7 +280,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['8'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_NINE, Prc117f_RscButton, "99902+109")
+        BEGIN_CONTROL(BUTTON_NINE,Prc117f_RscButton,"99902+109")
             BUTTON_GRID(3,2);
             BUTTONSIZE;
             text = "";
@@ -289,7 +289,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['9'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_VOLUME_UP, Prc117f_RscButton, "99902+110")
+        BEGIN_CONTROL(BUTTON_VOLUME_UP,Prc117f_RscButton,"99902+110")
             BUTTON_GRID(0,1);
             BUTTONSIZE;
             text = "";
@@ -298,7 +298,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['VOLUME_UP'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_VOLUME_DOWN, Prc117f_RscButton, "99902+111")
+        BEGIN_CONTROL(BUTTON_VOLUME_DOWN,Prc117f_RscButton,"99902+111")
             BUTTON_GRID(0,2);
             BUTTONSIZE;
             text = "";
@@ -307,7 +307,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['VOLUME_DOWN'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_LEFT, Prc117f_RscButton, "99902+112")
+        BEGIN_CONTROL(BUTTON_LEFT,Prc117f_RscButton,"99902+112")
             BUTTON_GRID(4,0);
             BUTTONSIZE;
             text = "";
@@ -316,7 +316,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['LEFT'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_RIGHT, Prc117f_RscButton, "99902+113")
+        BEGIN_CONTROL(BUTTON_RIGHT,Prc117f_RscButton,"99902+113")
             BUTTON_GRID(5,0);
             BUTTONSIZE;
             text = "";
@@ -325,7 +325,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['RIGHT'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_CLR, Prc117f_RscButton, "99902+114")
+        BEGIN_CONTROL(BUTTON_CLR,Prc117f_RscButton,"99902+114")
             BUTTON_GRID(4,1);
             BUTTONSIZE;
             text = "";
@@ -334,7 +334,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['CLR'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_ENT, Prc117f_RscButton, "99902+115")
+        BEGIN_CONTROL(BUTTON_ENT,Prc117f_RscButton,"99902+115")
             BUTTON_GRID(4,2);
             BUTTONSIZE;
             text = "";
@@ -343,7 +343,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['ENT'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_PRE_UP, Prc117f_RscButton, "99902+116")
+        BEGIN_CONTROL(BUTTON_PRE_UP,Prc117f_RscButton,"99902+116")
             BUTTON_GRID(5,1);
             BUTTONSIZE;
             text = "";
@@ -352,7 +352,7 @@ class Prc117f_RadioDialog {
             onMouseButtonUp = QUOTE((['PRE_UP'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_PRE_DOWN, Prc117f_RscButton, "99902+117")
+        BEGIN_CONTROL(BUTTON_PRE_DOWN,Prc117f_RscButton,"99902+117")
             BUTTON_GRID(5,2);
             BUTTONSIZE;
             text = "";
diff --git a/addons/sys_prc148/CfgVehicles.hpp b/addons/sys_prc148/CfgVehicles.hpp
index 39e7274c2..bf5c7d57e 100644
--- a/addons/sys_prc148/CfgVehicles.hpp
+++ b/addons/sys_prc148/CfgVehicles.hpp
@@ -2,8 +2,8 @@ class CfgVehicles {
     class ACRE_RadioBox_Base;
     class ACRE_RadioBox: ACRE_RadioBox_Base {
         class TransportWeapons {
-            MACRO_ADDWEAPON(ACRE_PRC148, 50);
-            MACRO_ADDWEAPON(ACRE_PRC148_UHF, 50);
+            MACRO_ADDWEAPON(ACRE_PRC148,50);
+            MACRO_ADDWEAPON(ACRE_PRC148_UHF,50);
         };
     };
 };
diff --git a/addons/sys_prc148/prc148_RadioDialog.hpp b/addons/sys_prc148/prc148_RadioDialog.hpp
index 1ec1b343d..426f4a4df 100644
--- a/addons/sys_prc148/prc148_RadioDialog.hpp
+++ b/addons/sys_prc148/prc148_RadioDialog.hpp
@@ -6,9 +6,9 @@
 #define CODE_SPACING    0.0245
 
 #define CONTROL_SetRelativePos(xpos,ypos) x = QUOTE(H_OFFSET + (xpos * 0.001)); y = QUOTE(H_OFFSET + (ypos * 0.001));
-#define CONTROL_SetDimensions(width, height) w = QUOTE(width * 0.001); QUOTE(h = height * 0.001);
+#define CONTROL_SetDimensions(width,height) w = QUOTE(width * 0.001); QUOTE(h = height * 0.001);
 
-#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
+#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
 #define END_CONTROL        };
 
 #define BUTTON_W     0.037
@@ -48,7 +48,7 @@
 #define COMBINE(x,y) x##y
 
 #define TEXT_ROW_ELEMENT(CONTROL_ID,WIDTH,HEIGHT,TEXT_X,TEXT_OFFSETX,OFFSET_NUMX,TEXT_Y,TEXT_OFFSETY,OFFSET_NUMY,FONT_SIZE,FONT_FACE)\
-    BEGIN_CONTROL(CONTROL_ID, Prc148_RscText, CONTROL_ID)\
+    BEGIN_CONTROL(CONTROL_ID,Prc148_RscText,CONTROL_ID)\
         x = QUOTE(((((TEXT_X - 0.5)*SCALE)+0.5)* safeZoneH ) + ((TEXT_OFFSETX*safeZoneH * SCALE) * OFFSET_NUMX) + (safeZoneY));\
         y = QUOTE(((((TEXT_Y - 0.5)*SCALE)+0.5)* safeZoneH ) + ((TEXT_OFFSETY*safeZoneH * SCALE) * OFFSET_NUMY) + (safeZoneY));\
         w = QUOTE(SCALE*WIDTH*SafeZoneH);\
@@ -62,53 +62,53 @@
 
 
 
-#define TEXT_ROW_SMALL(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 12, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 13, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 14, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 15, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 16, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 17, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 18, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 19, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 20, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,022), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 21, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,023), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 22, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,024), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 23, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,025), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 24, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)
-
-
-#define TEXT_ROW_LARGE(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 12, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 13, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 14, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 15, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 16, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 17, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE, FONT_FACE)
+#define TEXT_ROW_SMALL(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,12,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,13,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,14,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,15,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,16,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,17,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,18,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,19,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,20,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,022),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,21,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,023),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,22,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,024),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,23,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,025),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,24,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)
+
+
+#define TEXT_ROW_LARGE(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,12,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,13,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,14,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,15,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,16,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,17,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE,FONT_FACE)
 
 
 
@@ -141,7 +141,7 @@ class PRC148_RadioDialog {
 
     class controls {
 
-        BEGIN_CONTROL(ChannelKnobImage, Prc148_RscPicture, 99902)
+        BEGIN_CONTROL(ChannelKnobImage,Prc148_RscPicture,99902)
             x = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             y = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -150,7 +150,7 @@ class PRC148_RadioDialog {
             text = QPATHTOF(Data\knobs\channel\prc148_ui_chan_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnobImage, Prc148_RscPicture, 99903)
+        BEGIN_CONTROL(VolumeKnobImage,Prc148_RscPicture,99903)
             x = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             y = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -159,7 +159,7 @@ class PRC148_RadioDialog {
             text = QPATHTOF(Data\knobs\volume\prc148_ui_vol_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(FrontPanel, Prc148_RscPicture, 99910)
+        BEGIN_CONTROL(FrontPanel,Prc148_RscPicture,99910)
             x = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             y = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -168,7 +168,7 @@ class PRC148_RadioDialog {
             text = QPATHTOF(Data\static\prc148_ui_backplate.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(Display, Prc148_RscPicture, 99911)
+        BEGIN_CONTROL(Display,Prc148_RscPicture,99911)
             x = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             y = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -177,7 +177,7 @@ class PRC148_RadioDialog {
             text = QPATHTOF(Data\static\prc148_ui_display.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(KeypadImage, Prc148_RscPicture, 99901)
+        BEGIN_CONTROL(KeypadImage,Prc148_RscPicture,99901)
             x = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             y = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -188,17 +188,17 @@ class PRC148_RadioDialog {
 
 
         // EtelkaNarrowMediumPro broke with 1.72 hotfix, can revert back to that font if fixed (following 9 uses of PuristaSemibold)
-        TEXT_ROW_SMALL(54, ROW_SMALL_X, ROW_SMALL_Y, 0, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE, "PuristaSemibold")
-        TEXT_ROW_SMALL(55, ROW_SMALL_X, ROW_SMALL_Y, 1, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE, "PuristaSemibold")
-        TEXT_ROW_SMALL(56, ROW_SMALL_X, ROW_SMALL_Y, 2, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE, "PuristaSemibold")
-        TEXT_ROW_SMALL(57, ROW_SMALL_X, ROW_SMALL_Y, 3, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE, "PuristaSemibold")
-        TEXT_ROW_SMALL(58, ROW_SMALL_X, ROW_SMALL_Y, 4, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE, "PuristaSemibold")
+        TEXT_ROW_SMALL(54,ROW_SMALL_X,ROW_SMALL_Y,0,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE,"PuristaSemibold")
+        TEXT_ROW_SMALL(55,ROW_SMALL_X,ROW_SMALL_Y,1,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE,"PuristaSemibold")
+        TEXT_ROW_SMALL(56,ROW_SMALL_X,ROW_SMALL_Y,2,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE,"PuristaSemibold")
+        TEXT_ROW_SMALL(57,ROW_SMALL_X,ROW_SMALL_Y,3,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE,"PuristaSemibold")
+        TEXT_ROW_SMALL(58,ROW_SMALL_X,ROW_SMALL_Y,4,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE,"PuristaSemibold")
 
 
-        TEXT_ROW_LARGE(50, ROW_LARGE_X, ROW_LARGE_Y, 0, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE, "PuristaSemibold")
-        TEXT_ROW_LARGE(51, ROW_LARGE_X, ROW_LARGE_Y, 1, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE, "PuristaSemibold")
-        TEXT_ROW_LARGE(52, ROW_LARGE_X, ROW_LARGE_Y, 2, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE, "PuristaSemibold")
-        TEXT_ROW_LARGE(53, ROW_LARGE_X, ROW_LARGE_Y, 3, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE, "PuristaSemibold")
+        TEXT_ROW_LARGE(50,ROW_LARGE_X,ROW_LARGE_Y,0,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE,"PuristaSemibold")
+        TEXT_ROW_LARGE(51,ROW_LARGE_X,ROW_LARGE_Y,1,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE,"PuristaSemibold")
+        TEXT_ROW_LARGE(52,ROW_LARGE_X,ROW_LARGE_Y,2,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE,"PuristaSemibold")
+        TEXT_ROW_LARGE(53,ROW_LARGE_X,ROW_LARGE_Y,3,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE,"PuristaSemibold")
 
 
         class BatteryImage: Prc148_RscPicture {
@@ -260,49 +260,49 @@ class PRC148_RadioDialog {
             text = "";
         };
 
-        BEGIN_CONTROL(BUTTON_MODE, Prc148_RscButton, "12010+104")
+        BEGIN_CONTROL(BUTTON_MODE,Prc148_RscButton,"12010+104")
             BUTTON_GRID(0,0);
             BUTTONSIZE;
             text = "";
             onMouseButtonUp = QUOTE((['MODE'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_GR, Prc148_RscButton, "12010+105")
+        BEGIN_CONTROL(BUTTON_GR,Prc148_RscButton,"12010+105")
             BUTTON_GRID(1,0);
             BUTTONSIZE;
             text = "";
             onMouseButtonUp = QUOTE((['GR'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_DOWN, Prc148_RscButton, "12010+106")
+        BEGIN_CONTROL(BUTTON_DOWN,Prc148_RscButton,"12010+106")
             BUTTON_GRID(0,1);
             BUTTONSIZE;
             text = "";
             onMouseButtonUp = QUOTE((['DOWN'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_UP, Prc148_RscButton, "12010+107")
+        BEGIN_CONTROL(BUTTON_UP,Prc148_RscButton,"12010+107")
             BUTTON_GRID(1,1);
             BUTTONSIZE;
             text = "";
             onMouseButtonUp = QUOTE((['UP'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_ESC, Prc148_RscButton, "12010+108")
+        BEGIN_CONTROL(BUTTON_ESC,Prc148_RscButton,"12010+108")
             BUTTON_GRID(2,0);
             BUTTONSIZE;
             text = "";
             onMouseButtonUp = QUOTE((['ESC'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_ENT, Prc148_RscButton, "12010+109")
+        BEGIN_CONTROL(BUTTON_ENT,Prc148_RscButton,"12010+109")
             BUTTON_GRID(2,1);
             BUTTONSIZE;
             text = "";
             onMouseButtonUp = QUOTE((['ENT'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_ALT, Prc148_RscButton, "12010+110")
+        BEGIN_CONTROL(BUTTON_ALT,Prc148_RscButton,"12010+110")
             BUTTON_GRID(0,2);
             w = QUOTE(SCALE*0.029*SafeZoneH);
             h = QUOTE(SCALE*0.037*SafeZoneH);
@@ -310,7 +310,7 @@ class PRC148_RadioDialog {
             onMouseButtonUp = QUOTE(['ALT'] call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_VOLUME, Prc148_RscButton, "12010+201")
+        BEGIN_CONTROL(BUTTON_VOLUME,Prc148_RscButton,"12010+201")
             x = QUOTE(((((0.41-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.1-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE(SCALE*0.0435*SafeZoneH);
@@ -332,7 +332,7 @@ class PRC148_RadioDialog {
             toolTip = QUOTE(Current volume: 100%);
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_CHANNEL, Prc148_RscButton, "12010+202")
+        BEGIN_CONTROL(BUTTON_CHANNEL,Prc148_RscButton,"12010+202")
             x = QUOTE(((((0.480-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.1-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE(SCALE*0.0435*SafeZoneH);
diff --git a/addons/sys_prc152/DialogDefines.hpp b/addons/sys_prc152/DialogDefines.hpp
index ce0e96846..8f5762949 100644
--- a/addons/sys_prc152/DialogDefines.hpp
+++ b/addons/sys_prc152/DialogDefines.hpp
@@ -20,9 +20,9 @@
                             y = QUOTE(((((BUTTON_Y - 0.5)*SCALE)+0.5) * safeZoneH) + (((BUTTON_OFFY*safeZoneH* SCALE) + (BUTTON_H*safeZoneH* SCALE)) * BY) + safeZoneY)
 
 #define CONTROL_SetRelativePos(xpos,ypos) x = QUOTE(H_OFFSET + (xpos * 0.001)); y = QUOTE(H_OFFSET + (ypos * 0.001));
-#define CONTROL_SetDimensions(width, height) w = QUOTE(width * 0.001); h = QUOTE(height * 0.001);
+#define CONTROL_SetDimensions(width,height) w = QUOTE(width * 0.001); h = QUOTE(height * 0.001);
 
-#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
+#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
 #define END_CONTROL        };
 
 #define ROW_SMALL_X            0.436
@@ -61,7 +61,7 @@
 
 //colorBackground[] = {44/255,49/255,41/255,0};
 #define TEXT_ROW_ELEMENT(CONTROL_ID,WIDTH,HEIGHT,TEXT_X,TEXT_OFFSETX,OFFSET_NUMX,TEXT_Y,TEXT_OFFSETY,OFFSET_NUMY,FONT_SIZE)\
-    BEGIN_CONTROL(CONTROL_ID, Prc152_RscText, CONTROL_ID)\
+    BEGIN_CONTROL(CONTROL_ID,Prc152_RscText,CONTROL_ID)\
         x = QUOTE(((((TEXT_X - 0.5)*SCALE)+0.5)* safeZoneH ) + ((TEXT_OFFSETX*safeZoneH * SCALE) * OFFSET_NUMX) + (safeZoneY));\
         y = QUOTE(((((TEXT_Y - 0.5)*SCALE)+0.5)* safeZoneH ) + ((TEXT_OFFSETY*safeZoneH * SCALE) * OFFSET_NUMY) + (safeZoneY));\
         w = QUOTE(SCALE*WIDTH*safeZoneH);\
@@ -72,94 +72,94 @@
         text = "";\
     END_CONTROL
 
-#define TEXT_ROW_SMALL(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 12, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 13, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 14, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 15, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 16, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 17, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 18, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 19, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 20, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,022), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 21, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,023), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 22, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,024), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 23, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,025), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 24, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,026), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 25, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,027), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 26, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,028), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 27, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,029), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 28, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,030), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 29, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,031), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 30, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,032), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 31, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,033), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 32, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)
-
-#define TEXT_ROW_LARGE(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 12, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 13, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 14, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 15, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 16, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 17, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 18, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 19, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 20, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)
-
-#define TEXT_ROW_XLARGE(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 12, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 13, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 14, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)
-
-#define TEXT_ROW_XXLARGE(ROW_ID, ROW_X, ROW_Y, ROW_NUMBER, ROW_W, ROW_H, ROW_OFFSETX, ROW_OFFSETY, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 0, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 1, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 2, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 3, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 4, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 5, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 6, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 7, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 8, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 9, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 10, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)\
-    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012), ROW_W, ROW_H, ROW_X, ROW_OFFSETX, 11, ROW_Y, ROW_OFFSETY, ROW_NUMBER, FONT_SIZE)
+#define TEXT_ROW_SMALL(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,12,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,13,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,14,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,15,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,16,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,17,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,18,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,19,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,20,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,022),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,21,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,023),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,22,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,024),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,23,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,025),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,24,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,026),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,25,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,027),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,26,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,028),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,27,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,029),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,28,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,030),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,29,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,031),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,30,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,032),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,31,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,033),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,32,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)
+
+#define TEXT_ROW_LARGE(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,12,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,13,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,14,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,016),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,15,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,017),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,16,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,018),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,17,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,019),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,18,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,020),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,19,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,021),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,20,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)
+
+#define TEXT_ROW_XLARGE(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,013),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,12,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,014),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,13,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,015),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,14,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)
+
+#define TEXT_ROW_XXLARGE(ROW_ID,ROW_X,ROW_Y,ROW_NUMBER,ROW_W,ROW_H,ROW_OFFSETX,ROW_OFFSETY,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,001),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,0,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,002),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,1,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,003),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,2,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,004),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,3,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,005),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,4,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,006),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,5,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,007),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,6,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,008),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,7,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,009),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,8,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,010),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,9,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,011),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,10,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)\
+    TEXT_ROW_ELEMENT(COMBINE(ROW_ID,012),ROW_W,ROW_H,ROW_X,ROW_OFFSETX,11,ROW_Y,ROW_OFFSETY,ROW_NUMBER,FONT_SIZE)
 
 #define CT_STATIC 0
 #define CT_BUTTON 1
diff --git a/addons/sys_prc152/menus/script_menus.hpp b/addons/sys_prc152/menus/script_menus.hpp
index 3b7b637cc..ef459344c 100644
--- a/addons/sys_prc152/menus/script_menus.hpp
+++ b/addons/sys_prc152/menus/script_menus.hpp
@@ -28,7 +28,7 @@
 #define MENU_TYPE(x) (x select 3)
 #define MENU_SUBMENUS(x) (x select 4)
 
-#define MENU_SUBMENUS_ITEM(menu, index) (MENU_SUBMENUS(menu) select index)
+#define MENU_SUBMENUS_ITEM(menu,index) (MENU_SUBMENUS(menu) select index)
 
 #define MENU_ACTION_EVENTS(menu) (menu select 5)
 #define MENU_ACTION_ONENTRY(menu) ((menu select 5) select 0)
@@ -44,9 +44,9 @@
 
 #define ADD_MENU(menuObj) HASH_SET(GVAR(Menus),MENU_ID(menuObj),menuObj)
 
-#define MENU_SET_PARENT_ID(submenu, menu) submenu pushBack MENU_ID(menu)
+#define MENU_SET_PARENT_ID(submenu,menu) submenu pushBack MENU_ID(menu)
 #define MENU_PARENT_ID(menu) (menu select ((count menu)-1))
-#define MENU_PARENT(menu) (HASH_GET(GVAR(Menus), MENU_PARENT_ID(menu)))
+#define MENU_PARENT(menu) (HASH_GET(GVAR(Menus),MENU_PARENT_ID(menu)))
 
 #define ALIGN_LEFT 1
 #define ALIGN_RIGHT 2
diff --git a/addons/sys_prc152/prc152_RadioDialog.hpp b/addons/sys_prc152/prc152_RadioDialog.hpp
index c6e3588d9..174e7d0c9 100644
--- a/addons/sys_prc152/prc152_RadioDialog.hpp
+++ b/addons/sys_prc152/prc152_RadioDialog.hpp
@@ -155,23 +155,23 @@ class Prc152_RadioDialog {
             colorText[] = { 0, 0, 0, 1 };
         };
 
-        TEXT_ROW_LARGE(21, ROW_LARGE_X, ROW_LARGE_Y, 0, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE)
-        TEXT_ROW_LARGE(22, ROW_LARGE_X, ROW_LARGE_Y, 1, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE)
-        TEXT_ROW_LARGE(23, ROW_LARGE_X, ROW_LARGE_Y, 2, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE)
-        TEXT_ROW_LARGE(24, ROW_LARGE_X, ROW_LARGE_Y, 3, ROW_LARGE_W, ROW_LARGE_H, ROW_LARGE_OFFX, ROW_LARGE_OFFY, ROW_LARGE_FONT_SIZE)
+        TEXT_ROW_LARGE(21,ROW_LARGE_X,ROW_LARGE_Y,0,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE)
+        TEXT_ROW_LARGE(22,ROW_LARGE_X,ROW_LARGE_Y,1,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE)
+        TEXT_ROW_LARGE(23,ROW_LARGE_X,ROW_LARGE_Y,2,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE)
+        TEXT_ROW_LARGE(24,ROW_LARGE_X,ROW_LARGE_Y,3,ROW_LARGE_W,ROW_LARGE_H,ROW_LARGE_OFFX,ROW_LARGE_OFFY,ROW_LARGE_FONT_SIZE)
 
-        TEXT_ROW_XLARGE(31, ROW_XLARGE_X, ROW_XLARGE_Y, 0, ROW_XLARGE_W, ROW_XLARGE_H, ROW_XLARGE_OFFX, ROW_XLARGE_OFFY, ROW_XLARGE_FONT_SIZE)
-        TEXT_ROW_XLARGE(32, ROW_XLARGE_X, ROW_XLARGE_Y, 1, ROW_XLARGE_W, ROW_XLARGE_H, ROW_XLARGE_OFFX, ROW_XLARGE_OFFY, ROW_XLARGE_FONT_SIZE)
+        TEXT_ROW_XLARGE(31,ROW_XLARGE_X,ROW_XLARGE_Y,0,ROW_XLARGE_W,ROW_XLARGE_H,ROW_XLARGE_OFFX,ROW_XLARGE_OFFY,ROW_XLARGE_FONT_SIZE)
+        TEXT_ROW_XLARGE(32,ROW_XLARGE_X,ROW_XLARGE_Y,1,ROW_XLARGE_W,ROW_XLARGE_H,ROW_XLARGE_OFFX,ROW_XLARGE_OFFY,ROW_XLARGE_FONT_SIZE)
 
-        TEXT_ROW_XXLARGE(41, ROW_XXLARGE_X, ROW_XXLARGE_Y, 0, ROW_XXLARGE_W, ROW_XXLARGE_H, ROW_XXLARGE_OFFX, ROW_XXLARGE_OFFY, ROW_XXLARGE_FONT_SIZE)
+        TEXT_ROW_XXLARGE(41,ROW_XXLARGE_X,ROW_XXLARGE_Y,0,ROW_XXLARGE_W,ROW_XXLARGE_H,ROW_XXLARGE_OFFX,ROW_XXLARGE_OFFY,ROW_XXLARGE_FONT_SIZE)
 
-        TEXT_ROW_SMALL(11, ROW_SMALL_X, ROW_SMALL_Y, 0, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
-        TEXT_ROW_SMALL(12, ROW_SMALL_X, ROW_SMALL_Y, 1, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
-        TEXT_ROW_SMALL(13, ROW_SMALL_X, ROW_SMALL_Y, 2, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
-        TEXT_ROW_SMALL(14, ROW_SMALL_X, ROW_SMALL_Y, 3, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
-        TEXT_ROW_SMALL(15, ROW_SMALL_X, ROW_SMALL_Y, 4, ROW_SMALL_W, ROW_SMALL_H, ROW_SMALL_OFFX, ROW_SMALL_OFFY, ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(11,ROW_SMALL_X,ROW_SMALL_Y,0,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(12,ROW_SMALL_X,ROW_SMALL_Y,1,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(13,ROW_SMALL_X,ROW_SMALL_Y,2,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(14,ROW_SMALL_X,ROW_SMALL_Y,3,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
+        TEXT_ROW_SMALL(15,ROW_SMALL_X,ROW_SMALL_Y,4,ROW_SMALL_W,ROW_SMALL_H,ROW_SMALL_OFFX,ROW_SMALL_OFFY,ROW_SMALL_FONT_SIZE)
 
-        BEGIN_CONTROL(CIPHER_ICON, Prc152_RscPicture, 99907)
+        BEGIN_CONTROL(CIPHER_ICON,Prc152_RscPicture,99907)
             x = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             y = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -180,7 +180,7 @@ class Prc152_RadioDialog {
             text = QPATHTOF(Data\Knobs\functionknob\prc152c_ui_swtch_0.paa);
         END_CONTROL
 
-        /*BEGIN_CONTROL(CHIPHER_KNOB, Prc152_RscButton, 222)
+        /*BEGIN_CONTROL(CHIPHER_KNOB,Prc152_RscButton,222)
             x = QUOTE((0.53 * safeZoneH) + safeZoneY);
             y = QUOTE((0.525 * safeZoneH) + safeZoneY);
             w = QUOTE(0.068235*safeZoneH);
@@ -191,7 +191,7 @@ class Prc152_RadioDialog {
             //onMouseButtonUp = QUOTE((['MODE_KNOB'] + _this) call FUNC(onButtonPress));
         END_CONTROL*/
 
-        BEGIN_CONTROL(BUTTON_ICON, Prc152_RscPicture, 1000)
+        BEGIN_CONTROL(BUTTON_ICON,Prc152_RscPicture,1000)
             x = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             y = QUOTE((0.5-(NEW_SCALE*(safeZoneH)/2)));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -200,7 +200,7 @@ class Prc152_RadioDialog {
             text = QPATHTOF(Data\Knobs\keypad\prc152c_ui_default.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_ONE, Prc152_RscButton, "99902+101")
+        BEGIN_CONTROL(BUTTON_ONE,Prc152_RscButton,"99902+101")
             BUTTON_GRID(0,0);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -209,7 +209,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['1'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_TWO, Prc152_RscButton, "99902+102")
+        BEGIN_CONTROL(BUTTON_TWO,Prc152_RscButton,"99902+102")
             BUTTON_GRID(1,0);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -218,7 +218,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['2'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_THREE, Prc152_RscButton, "99902+103")
+        BEGIN_CONTROL(BUTTON_THREE,Prc152_RscButton,"99902+103")
             BUTTON_GRID(2,0);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -227,7 +227,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['3'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_FOUR, Prc152_RscButton, "99902+104")
+        BEGIN_CONTROL(BUTTON_FOUR,Prc152_RscButton,"99902+104")
             BUTTON_GRID(0,1);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -236,7 +236,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['4'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_FIVE, Prc152_RscButton, "99902+105")
+        BEGIN_CONTROL(BUTTON_FIVE,Prc152_RscButton,"99902+105")
             BUTTON_GRID(1,1);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -245,7 +245,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['5'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_SIX, Prc152_RscButton, "99902+106")
+        BEGIN_CONTROL(BUTTON_SIX,Prc152_RscButton,"99902+106")
             BUTTON_GRID(2,1);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -254,7 +254,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['6'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_SEVEN, Prc152_RscButton, "99902+107")
+        BEGIN_CONTROL(BUTTON_SEVEN,Prc152_RscButton,"99902+107")
             BUTTON_GRID(0,2);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -263,7 +263,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['7'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_EIGHT, Prc152_RscButton, "99902+108")
+        BEGIN_CONTROL(BUTTON_EIGHT,Prc152_RscButton,"99902+108")
             BUTTON_GRID(1,2);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -272,7 +272,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['8'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_NINE, Prc152_RscButton, "99902+109")
+        BEGIN_CONTROL(BUTTON_NINE,Prc152_RscButton,"99902+109")
             BUTTON_GRID(2,2);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -281,7 +281,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['9'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_ZERO, Prc152_RscButton, "99902+100")
+        BEGIN_CONTROL(BUTTON_ZERO,Prc152_RscButton,"99902+100")
             BUTTON_GRID(0,3);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -290,7 +290,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['0'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_CLR, Prc152_RscButton, "99902+110")
+        BEGIN_CONTROL(BUTTON_CLR,Prc152_RscButton,"99902+110")
             BUTTON_GRID(3,0);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -299,7 +299,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['CLR'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_ENT, Prc152_RscButton, "99902+111")
+        BEGIN_CONTROL(BUTTON_ENT,Prc152_RscButton,"99902+111")
             BUTTON_GRID(3,1);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -308,7 +308,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['ENT'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_PRE_UP, Prc152_RscButton, "99902+112")
+        BEGIN_CONTROL(BUTTON_PRE_UP,Prc152_RscButton,"99902+112")
             BUTTON_GRID(3,2);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -317,7 +317,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['PRE_UP'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_PRE_DOWN, Prc152_RscButton, "99902+113")
+        BEGIN_CONTROL(BUTTON_PRE_DOWN,Prc152_RscButton,"99902+113")
             BUTTON_GRID(3,3);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -326,7 +326,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['PRE_DOWN'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_LEFT, Prc152_RscButton, "99902+114")
+        BEGIN_CONTROL(BUTTON_LEFT,Prc152_RscButton,"99902+114")
             BUTTON_GRID(1,3);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -335,7 +335,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['LEFT'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BUTTON_RIGHT, Prc152_RscButton, "99902+115")
+        BEGIN_CONTROL(BUTTON_RIGHT,Prc152_RscButton,"99902+115")
             BUTTON_GRID(2,3);
             BUTTONSIZE;
             sizeEx = 0.014;
@@ -344,7 +344,7 @@ class Prc152_RadioDialog {
             onMouseButtonUp = QUOTE((['RIGHT'] + _this) call FUNC(onButtonPress));
         END_CONTROL
 
-        BEGIN_CONTROL(KNOB_BUTTON, Prc152_RscButton, "99902+116")
+        BEGIN_CONTROL(KNOB_BUTTON,Prc152_RscButton,"99902+116")
             x = QUOTE(((((0.47-0.5)*SCALE)+0.5) * safeZoneH) + safeZoneY);
             y = QUOTE(((((0.16-0.5)*SCALE)+0.5) * safeZoneH)  + safeZoneY);
             w = QUOTE(SCALE*0.05*safeZoneH);
@@ -358,7 +358,7 @@ class Prc152_RadioDialog {
         END_CONTROL
 
 
-        BEGIN_CONTROL(BUTTON_VOLUME, Prc152_RscButton, "99902+117")
+        BEGIN_CONTROL(BUTTON_VOLUME,Prc152_RscButton,"99902+117")
             x = QUOTE(((((0.40-0.5)*SCALE)+0.5) * safeZoneH) + safeZoneY);
             y = QUOTE(((((0.30-0.5)*SCALE)+0.5) * safeZoneH)  + safeZoneY);
             w = QUOTE(SCALE*0.015*safeZoneH);
diff --git a/addons/sys_prc152/radio/fnc_handleMultipleTransmissions.sqf b/addons/sys_prc152/radio/fnc_handleMultipleTransmissions.sqf
index 09eb7eb5b..9d8f8b1d0 100644
--- a/addons/sys_prc152/radio/fnc_handleMultipleTransmissions.sqf
+++ b/addons/sys_prc152/radio/fnc_handleMultipleTransmissions.sqf
@@ -80,7 +80,7 @@ if (_transmissionsChanged) then {
             _signalData params ["_signalPercent"];
             if (_signalData isEqualTo [0, -992]) then {_areAllRadiosInitialized = false;};
 
-            PUSH(_sorted, [ARR_2(_signalPercent, _forEachIndex)]);
+            PUSH(_sorted, [ARR_2(_signalPercent,_forEachIndex)]);
             PUSH(_transmissions, _txId);
         } forEach _radios;
         _sorted sort false; // descending order
diff --git a/addons/sys_prc343/prc343_RadioDialog.hpp b/addons/sys_prc343/prc343_RadioDialog.hpp
index 8d5faf755..35b23f574 100644
--- a/addons/sys_prc343/prc343_RadioDialog.hpp
+++ b/addons/sys_prc343/prc343_RadioDialog.hpp
@@ -1,9 +1,9 @@
 #define CODE_SPACING    0.0245
 
 #define CONTROL_SetRelativePos(xpos,ypos) x = H_OFFSET + (xpos * 0.001); y = H_OFFSET + (ypos * 0.001);
-#define CONTROL_SetDimensions(width, height) w = width * 0.001; h = height * 0.001;
+#define CONTROL_SetDimensions(width,height) w = width * 0.001; h = height * 0.001;
 
-#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
+#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
 #define END_CONTROL        };
 
 #define NEW_SCALE 0.85
@@ -38,7 +38,7 @@ class PRC343_RadioDialog {
         text = QPATHTOF(Data\static\prc343_ui_backplate.paa);
     };
     class controls {
-        BEGIN_CONTROL(ChannelKnob, Prc343_RscPicture, 106)
+        BEGIN_CONTROL(ChannelKnob,Prc343_RscPicture,106)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -46,7 +46,7 @@ class PRC343_RadioDialog {
             text = QPATHTOF(Data\knobs\channel\prc343_ui_pre_1.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(ChannelKnobButton, Prc343_RscButton, 201)
+        BEGIN_CONTROL(ChannelKnobButton,Prc343_RscButton,201)
             x = QUOTE((((((0.416+0.085)-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.28-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE(SCALE*0.072*SafeZoneH);
@@ -57,7 +57,7 @@ class PRC343_RadioDialog {
             toolTip = ECSTRING(sys_radio,ui_ChangeChannel);
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnob, Prc343_RscPicture, 107)
+        BEGIN_CONTROL(VolumeKnob,Prc343_RscPicture,107)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -65,7 +65,7 @@ class PRC343_RadioDialog {
             text = QPATHTOF(Data\knobs\volume\prc343_ui_vol_5.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnobButton, Prc343_RscButton, 202)
+        BEGIN_CONTROL(VolumeKnobButton,Prc343_RscButton,202)
             x = QUOTE(((((0.416-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.28-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE(SCALE*0.072*SafeZoneH);
@@ -76,7 +76,7 @@ class PRC343_RadioDialog {
             toolTip = ECSTRING(sys_radio,ui_ChangeVolume);
         END_CONTROL
 
-        BEGIN_CONTROL(PTTHandleButton, Prc343_RscButton, 203)
+        BEGIN_CONTROL(PTTHandleButton,Prc343_RscButton,203)
             x = QUOTE(((((0.255-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.377-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE(SCALE*0.07*SafeZoneH);
@@ -87,7 +87,7 @@ class PRC343_RadioDialog {
             toolTip = QUOTE(Detach Handle);
         END_CONTROL
 
-        BEGIN_CONTROL(ChannelBlockButton, Prc343_RscButton, 204)
+        BEGIN_CONTROL(ChannelBlockButton,Prc343_RscButton,204)
             x = QUOTE(((((0.515-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.6-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE(SCALE*0.03*SafeZoneH);
diff --git a/addons/sys_prc77/prc77_RadioDialog.hpp b/addons/sys_prc77/prc77_RadioDialog.hpp
index 9a21c41ac..c7bf21b05 100644
--- a/addons/sys_prc77/prc77_RadioDialog.hpp
+++ b/addons/sys_prc77/prc77_RadioDialog.hpp
@@ -1,9 +1,9 @@
 #define CODE_SPACING    0.0245
 
 #define CONTROL_SetRelativePos(xpos,ypos) x = H_OFFSET + (xpos * 0.001); y = H_OFFSET + (ypos * 0.001);
-#define CONTROL_SetDimensions(width, height) w = width * 0.001; h = height * 0.001;
+#define CONTROL_SetDimensions(width,height) w = width * 0.001; h = height * 0.001;
 
-#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
+#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
 #define END_CONTROL        };
 
 class PRC77_RadioDialog {
@@ -28,7 +28,7 @@ class PRC77_RadioDialog {
         text = "";
     };
     class controls {
-        BEGIN_CONTROL(DialBackground, Prc77_RscPicture, 201)
+        BEGIN_CONTROL(DialBackground,Prc77_RscPicture,201)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -36,7 +36,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\dials\PRC77_dial_background.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(MHzDial, Prc77_RscPicture, 202)
+        BEGIN_CONTROL(MHzDial,Prc77_RscPicture,202)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -44,7 +44,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\dials\prc77_ui_disc_MHz_100.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(kHzDial, Prc77_RscPicture, 203)
+        BEGIN_CONTROL(kHzDial,Prc77_RscPicture,203)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -52,7 +52,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\dials\prc77_ui_disc_KHz_00.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(DialSlider, Prc77_RscPicture, 204)
+        BEGIN_CONTROL(DialSlider,Prc77_RscPicture,204)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -60,7 +60,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\dials\PRC77_display_0.paa);
         END_CONTROL
 
-        /*BEGIN_CONTROL(DialCover, Prc77_RscPicture, 205)
+        /*BEGIN_CONTROL(DialCover,Prc77_RscPicture,205)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -68,7 +68,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\dials\PRC77_dial_cover.paa);
         END_CONTROL*/
 
-        BEGIN_CONTROL(FrontPlate, Prc77_RscPicture, 210)
+        BEGIN_CONTROL(FrontPlate,Prc77_RscPicture,210)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -78,7 +78,7 @@ class PRC77_RadioDialog {
             colorText[] = {1, 1, 1, 1};
         END_CONTROL
 
-        BEGIN_CONTROL(MHzDialKnob, Prc77_RscPicture, 2021)
+        BEGIN_CONTROL(MHzDialKnob,Prc77_RscPicture,2021)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -86,7 +86,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\knob\prc77_ui_knob_MHz_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(kHzDialKnob, Prc77_RscPicture, 2031)
+        BEGIN_CONTROL(kHzDialKnob,Prc77_RscPicture,2031)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -94,7 +94,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\knob\prc77_ui_knob_KHz_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(MHzTuneKnobButton, Prc77_RscButton, -1)
+        BEGIN_CONTROL(MHzTuneKnobButton,Prc77_RscButton,-1)
             x = QUOTE((0.425 * safeZoneW) + safeZoneX);
             y = QUOTE((0.44 * safeZoneW) + safeZoneX);
             w = QUOTE(0.085*SafeZoneW);
@@ -103,7 +103,7 @@ class PRC77_RadioDialog {
             onMouseButtonDown = QUOTE(_this call FUNC(onMHzTuneKnobPress));
         END_CONTROL
 
-        BEGIN_CONTROL(kHzTuneKnobButton, Prc77_RscButton, -1)
+        BEGIN_CONTROL(kHzTuneKnobButton,Prc77_RscButton,-1)
             x = QUOTE((0.585 * safeZoneW) + safeZoneX);
             y = QUOTE((0.44 * safeZoneW) + safeZoneX);
             w = QUOTE(0.085*SafeZoneW);
@@ -112,7 +112,7 @@ class PRC77_RadioDialog {
             onMouseButtonDown = QUOTE(_this call FUNC(onkHzTuneKnobPress));
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnob, Prc77_RscPicture, 108)
+        BEGIN_CONTROL(VolumeKnob,Prc77_RscPicture,108)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -120,7 +120,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\volume\PRC77_volume_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnobButton, Prc77_RscButton, -1)
+        BEGIN_CONTROL(VolumeKnobButton,Prc77_RscButton,-1)
             x = QUOTE((0.715 * safeZoneW) + safeZoneX);
             y = QUOTE((0.43 * safeZoneW) + safeZoneX);
             w = QUOTE(0.062*SafeZoneW);
@@ -129,7 +129,7 @@ class PRC77_RadioDialog {
             onMouseButtonDown = QUOTE(_this call FUNC(onVolumeKnobPress));
         END_CONTROL
 
-        BEGIN_CONTROL(BandSelectorKnob, Prc77_RscPicture, 109)
+        BEGIN_CONTROL(BandSelectorKnob,Prc77_RscPicture,109)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -137,7 +137,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\band\PRC77_bandselector_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(BandSelectorKnobButton, Prc77_RscButton, -1)
+        BEGIN_CONTROL(BandSelectorKnobButton,Prc77_RscButton,-1)
             x = QUOTE((0.33 * safeZoneW) + safeZoneX);
             y = QUOTE((0.51 * safeZoneW) + safeZoneX);
             w = QUOTE(0.082*SafeZoneW);
@@ -146,7 +146,7 @@ class PRC77_RadioDialog {
             onMouseButtonDown = QUOTE(_this call FUNC(onBandSelectorKnobPress));
         END_CONTROL
 
-        BEGIN_CONTROL(FunctionKnob, Prc77_RscPicture, 105)
+        BEGIN_CONTROL(FunctionKnob,Prc77_RscPicture,105)
             x = "safezoneX";
             y = QUOTE((0.5-((1*safezoneW)/2)));
             w = QUOTE(1*safezoneW);
@@ -154,7 +154,7 @@ class PRC77_RadioDialog {
             text = QPATHTOF(Data\images\function\PRC77_function_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(FunctionKnobButton, Prc77_RscButton, -1)
+        BEGIN_CONTROL(FunctionKnobButton,Prc77_RscButton,-1)
             x = QUOTE((0.71 * safeZoneW) + safeZoneX);
             y = QUOTE((0.52 * safeZoneW) + safeZoneX);
             w = QUOTE(0.062*SafeZoneW);
@@ -163,7 +163,7 @@ class PRC77_RadioDialog {
             onMouseButtonDown = QUOTE(_this call FUNC(onFunctionKnobPress));
         END_CONTROL
 
-        BEGIN_CONTROL(Preset1Button, Prc77_RscButton, -1)
+        BEGIN_CONTROL(Preset1Button,Prc77_RscButton,-1)
             x = QUOTE((0.478 * safeZoneW) + safeZoneX);
             y = QUOTE((0.408 * safeZoneW) + safeZoneX);
             w = QUOTE(0.023*SafeZoneW);
@@ -173,7 +173,7 @@ class PRC77_RadioDialog {
             tooltip = QUOTE(Preset 1);
         END_CONTROL
 
-        BEGIN_CONTROL(Preset2Button, Prc77_RscButton, -1)
+        BEGIN_CONTROL(Preset2Button,Prc77_RscButton,-1)
             x = QUOTE((0.61 * safeZoneW) + safeZoneX);
             y = QUOTE((0.408 * safeZoneW) + safeZoneX);
             w = QUOTE(0.023*SafeZoneW);
@@ -182,7 +182,7 @@ class PRC77_RadioDialog {
             onMouseButtonDown = "[_this,1] call acre_sys_prc77_fnc_onPresetKnobPress";
             tooltip = QUOTE(Preset 2);
         END_CONTROL
-/*        BEGIN_CONTROL(DisplayDarken, Prc77_RscPicture, 301)
+/*        BEGIN_CONTROL(DisplayDarken,Prc77_RscPicture,301)
             x = "safezoneX";
             y = "safezoneY";
             w = "safezoneW";
@@ -192,7 +192,7 @@ class PRC77_RadioDialog {
             colorText[] = {1, 1, 1, 0};
         END_CONTROL
 
-        BEGIN_CONTROL(FrameDarken, Prc77_RscPicture, 302)
+        BEGIN_CONTROL(FrameDarken,Prc77_RscPicture,302)
             x = "safezoneX";
             y = "safezoneY";
             w = "safezoneW";
diff --git a/addons/sys_sem52sl/sem52sl_RadioDialog.hpp b/addons/sys_sem52sl/sem52sl_RadioDialog.hpp
index 65a112174..87d28fef4 100644
--- a/addons/sys_sem52sl/sem52sl_RadioDialog.hpp
+++ b/addons/sys_sem52sl/sem52sl_RadioDialog.hpp
@@ -1,9 +1,9 @@
 #define CODE_SPACING    0.0245
 
 #define CONTROL_SetRelativePos(xpos,ypos) x = H_OFFSET + (xpos * 0.001); y = H_OFFSET + (ypos * 0.001);
-#define CONTROL_SetDimensions(width, height) w = width * 0.001; h = height * 0.001;
+#define CONTROL_SetDimensions(width,height) w = width * 0.001; h = height * 0.001;
 
-#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
+#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
 #define END_CONTROL        };
 
 #define NEW_SCALE 1.8963
@@ -18,7 +18,7 @@ class SEM52SL_RadioDialog {
     objects[] = {};
     class controls {
 
-        BEGIN_CONTROL(RadioBackground, SEM52SL_RscPicture, 300)
+        BEGIN_CONTROL(RadioBackground,SEM52SL_RscPicture,300)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE*safeZoneH);
@@ -26,7 +26,7 @@ class SEM52SL_RadioDialog {
             text = QPATHTOF(data\ui\sem52slui_ca.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(Backlight, SEM52SL_RscPicture, 109)
+        BEGIN_CONTROL(Backlight,SEM52SL_RscPicture,109)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -34,7 +34,7 @@ class SEM52SL_RadioDialog {
             text = "";
         END_CONTROL
 
-        BEGIN_CONTROL(Display1, SEM52SL_RscPicture, 301)
+        BEGIN_CONTROL(Display1,SEM52SL_RscPicture,301)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -42,7 +42,7 @@ class SEM52SL_RadioDialog {
             text = "";
         END_CONTROL
 
-        BEGIN_CONTROL(Display2, SEM52SL_RscPicture, 302)
+        BEGIN_CONTROL(Display2,SEM52SL_RscPicture,302)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -50,7 +50,7 @@ class SEM52SL_RadioDialog {
             text = "";
         END_CONTROL
 
-        BEGIN_CONTROL(Display3, SEM52SL_RscPicture, 303)
+        BEGIN_CONTROL(Display3,SEM52SL_RscPicture,303)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -58,7 +58,7 @@ class SEM52SL_RadioDialog {
             text = "";
         END_CONTROL
 
-        BEGIN_CONTROL(Display4, SEM52SL_RscPicture, 304)
+        BEGIN_CONTROL(Display4,SEM52SL_RscPicture,304)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -66,7 +66,7 @@ class SEM52SL_RadioDialog {
             text = "";
         END_CONTROL
 
-        BEGIN_CONTROL(Display5, SEM52SL_RscPicture, 305)
+        BEGIN_CONTROL(Display5,SEM52SL_RscPicture,305)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -75,7 +75,7 @@ class SEM52SL_RadioDialog {
         END_CONTROL
 
 
-        BEGIN_CONTROL(ChannelKnob, SEM52SL_RscPicture, 106)
+        BEGIN_CONTROL(ChannelKnob,SEM52SL_RscPicture,106)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -83,7 +83,7 @@ class SEM52SL_RadioDialog {
             text = QPATHTOF(data\knobs\channel\ch_01.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnob, SEM52SL_RscPicture, 107)
+        BEGIN_CONTROL(VolumeKnob,SEM52SL_RscPicture,107)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -91,7 +91,7 @@ class SEM52SL_RadioDialog {
             text = QPATHTOF(Data\knobs\volume\vol_1000.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(PTTButtonImage, SEM52SL_RscPicture, 108)
+        BEGIN_CONTROL(PTTButtonImage,SEM52SL_RscPicture,108)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/2.8 * safeZoneH));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))) - (1/8 * safeZoneH));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -99,7 +99,7 @@ class SEM52SL_RadioDialog {
             text = "";
         END_CONTROL
         // Do the buttons last so they come on top.
-        BEGIN_CONTROL(ChannelKnobButton, SEM52SL_RscButton, 201)
+        BEGIN_CONTROL(ChannelKnobButton,SEM52SL_RscButton,201)
             x = QUOTE(((((0.466-0.615)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
             y = QUOTE(((((0.595-0.5)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH);
@@ -109,7 +109,7 @@ class SEM52SL_RadioDialog {
             toolTip = ECSTRING(sys_radio,ui_ChangeChannel);
         END_CONTROL
 
-        BEGIN_CONTROL(VolumeKnobButton, SEM52SL_RscButton, 202)
+        BEGIN_CONTROL(VolumeKnobButton,SEM52SL_RscButton,202)
             x = QUOTE(((((0.466-0.487)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
             y = QUOTE(((((0.595-0.5)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.35/0.8)*0.050*SafeZoneH);
@@ -119,7 +119,7 @@ class SEM52SL_RadioDialog {
             toolTip = ECSTRING(sys_radio,ui_ChangeVolume);
         END_CONTROL
 
-        BEGIN_CONTROL(PTTButton, SEM52SL_RscButton, 203)
+        BEGIN_CONTROL(PTTButton,SEM52SL_RscButton,203)
             x = QUOTE(((((0.466-0.543)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
             y = QUOTE(((((0.595-0.5)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH * 4/3);
@@ -129,7 +129,7 @@ class SEM52SL_RadioDialog {
             toolTip = QUOTE(PTT);
         END_CONTROL
 
-        BEGIN_CONTROL(AudioCableButton, SEM52SL_RscButton, 204)
+        BEGIN_CONTROL(AudioCableButton,SEM52SL_RscButton,204)
             x = QUOTE(((((0.466-0.687)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY + (1/24 * safeZoneH));
             y = QUOTE(((((0.595-0.6)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH * 4/3);
diff --git a/addons/sys_sem70/sem70_RadioDialog.hpp b/addons/sys_sem70/sem70_RadioDialog.hpp
index a88226487..c87c8d9d1 100644
--- a/addons/sys_sem70/sem70_RadioDialog.hpp
+++ b/addons/sys_sem70/sem70_RadioDialog.hpp
@@ -1,9 +1,9 @@
 #define CODE_SPACING 0.0245
 
 #define CONTROL_SetRelativePos(xpos,ypos) x = H_OFFSET + (xpos * 0.001); y = H_OFFSET + (ypos * 0.001);
-#define CONTROL_SetDimensions(width, height) w = width * 0.001; h = height * 0.001;
+#define CONTROL_SetDimensions(width,height) w = width * 0.001; h = height * 0.001;
 
-#define BEGIN_CONTROL(name, parent, idval) class name: parent { idc = idval;
+#define BEGIN_CONTROL(name,parent,idval) class name: parent { idc = idval;
 #define END_CONTROL };
 
 #define NEW_SCALE 1.4
@@ -35,7 +35,7 @@ class SEM70_RadioDialog {
     };*/
     class controls {
 
-        BEGIN_CONTROL(RadioBackground, SEM70_RscPicture, 300)
+        BEGIN_CONTROL(RadioBackground,SEM70_RscPicture,300)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -43,7 +43,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(data\ui\sem70ui_ca.paa);
         END_CONTROL
 
-        /*BEGIN_CONTROL(Backlight, SEM70_RscPicture, 109)
+        /*BEGIN_CONTROL(Backlight,SEM70_RscPicture,109)
             x=safeZoneX + safeZoneW - NEW_SCALE * SafeZoneH + 1/32 * safeZoneW;
             y=SafeZoneY + SafeZoneH - NEW_SCALE * SafeZoneH + 1/8 * safeZoneW;
             w=NEW_SCALE * SafeZoneH;
@@ -51,7 +51,7 @@ class SEM70_RadioDialog {
             text = "";
         END_CONTROL*/
 
-        BEGIN_CONTROL(Display1, SEM70_RscPicture, 301)
+        BEGIN_CONTROL(Display1,SEM70_RscPicture,301)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -59,7 +59,7 @@ class SEM70_RadioDialog {
             text = "";
         END_CONTROL
 
-        BEGIN_CONTROL(Display2, SEM70_RscPicture, 302)
+        BEGIN_CONTROL(Display2,SEM70_RscPicture,302)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -67,7 +67,7 @@ class SEM70_RadioDialog {
             text = "";
         END_CONTROL
 
-        BEGIN_CONTROL(Display3, SEM70_RscPicture, 303)
+        BEGIN_CONTROL(Display3,SEM70_RscPicture,303)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -75,7 +75,7 @@ class SEM70_RadioDialog {
             text = "";
         END_CONTROL
 
-        BEGIN_CONTROL(Display4, SEM70_RscPicture, 304)
+        BEGIN_CONTROL(Display4,SEM70_RscPicture,304)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -83,7 +83,7 @@ class SEM70_RadioDialog {
             text = "";
         END_CONTROL
 
-        BEGIN_CONTROL(Display5, SEM70_RscPicture, 305)
+        BEGIN_CONTROL(Display5,SEM70_RscPicture,305)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -92,7 +92,7 @@ class SEM70_RadioDialog {
         END_CONTROL
 
 
-        BEGIN_CONTROL(VolumeKnob, SEM70_RscPicture, 106)
+        BEGIN_CONTROL(VolumeKnob,SEM70_RscPicture,106)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -100,7 +100,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(data\knobs\volume\vol_100.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(MainKnob, SEM70_RscPicture, 107)
+        BEGIN_CONTROL(MainKnob,SEM70_RscPicture,107)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -108,7 +108,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\main\lstg_gr.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(FunctionKnob, SEM70_RscPicture, 108)
+        BEGIN_CONTROL(FunctionKnob,SEM70_RscPicture,108)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -116,7 +116,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\function\bs_hw.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(ChannelStepKnob, SEM70_RscPicture, 109)
+        BEGIN_CONTROL(ChannelStepKnob,SEM70_RscPicture,109)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -124,7 +124,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\cs\ka_25mhz.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(khzKnob, SEM70_RscPicture, 110)
+        BEGIN_CONTROL(khzKnob,SEM70_RscPicture,110)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -132,7 +132,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\khz\khz_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(mhzKnob, SEM70_RscPicture, 111)
+        BEGIN_CONTROL(mhzKnob,SEM70_RscPicture,111)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -140,7 +140,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\mhz\mhz_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(displayKnob, SEM70_RscPicture, 112)
+        BEGIN_CONTROL(displayKnob,SEM70_RscPicture,112)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -148,7 +148,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\display\anzeige_aus.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(memorySlotKnob, SEM70_RscPicture, 113)
+        BEGIN_CONTROL(memorySlotKnob,SEM70_RscPicture,113)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -156,7 +156,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\sp\sp_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(network1Knob, SEM70_RscPicture, 114)
+        BEGIN_CONTROL(network1Knob,SEM70_RscPicture,114)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -164,7 +164,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\fk\fk1_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(network2Knob, SEM70_RscPicture, 115)
+        BEGIN_CONTROL(network2Knob,SEM70_RscPicture,115)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -172,7 +172,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\fk\fk2_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(network3Knob, SEM70_RscPicture, 116)
+        BEGIN_CONTROL(network3Knob,SEM70_RscPicture,116)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -180,7 +180,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\fk\fk3_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(displayGP, SEM70_RscPicture, 117)
+        BEGIN_CONTROL(displayGP,SEM70_RscPicture,117)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -188,7 +188,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\display\gp80_display_0.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(ledBetr, SEM70_RscPicture, 118)
+        BEGIN_CONTROL(ledBetr,SEM70_RscPicture,118)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -196,7 +196,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\led\led_betr_sp_an.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(ledGer2, SEM70_RscPicture, 119)
+        BEGIN_CONTROL(ledGer2,SEM70_RscPicture,119)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -204,7 +204,7 @@ class SEM70_RadioDialog {
             text = QPATHTOF(Data\knobs\led\led_ger2_aus.paa);
         END_CONTROL
 
-        BEGIN_CONTROL(ledGer13, SEM70_RscPicture, 120)
+        BEGIN_CONTROL(ledGer13,SEM70_RscPicture,120)
             x = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             y = QUOTE(((0.5-(NEW_SCALE*(safeZoneH)/2))));
             w = QUOTE(NEW_SCALE * SafeZoneH);
@@ -216,7 +216,7 @@ class SEM70_RadioDialog {
 
 
         // Do the buttons last so they come on top.
-        BEGIN_CONTROL(VolumeButton, SEM70_RscButton, 201)
+        BEGIN_CONTROL(VolumeButton,SEM70_RscButton,201)
             x = QUOTE(((((0.416-0.25)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.72)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH);
@@ -227,7 +227,7 @@ class SEM70_RadioDialog {
             toolTip = ECSTRING(sys_radio,ui_ChangeVolume);
         END_CONTROL
 
-        BEGIN_CONTROL(MainButton, SEM70_RscButton, 202)
+        BEGIN_CONTROL(MainButton,SEM70_RscButton,202)
             x = QUOTE(((((0.416-0.615)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.72)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH);
@@ -238,7 +238,7 @@ class SEM70_RadioDialog {
             toolTip = QUOTE(Change Power);
         END_CONTROL
 
-        BEGIN_CONTROL(FunctionButton, SEM70_RscButton, 203)
+        BEGIN_CONTROL(FunctionButton,SEM70_RscButton,203)
             x = QUOTE(((((0.416-0.3)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.72)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH);
@@ -249,7 +249,7 @@ class SEM70_RadioDialog {
             toolTip = QUOTE(Change Mode);
         END_CONTROL
 
-        BEGIN_CONTROL(ChannelStepButton, SEM70_RscButton, 204)
+        BEGIN_CONTROL(ChannelStepButton,SEM70_RscButton,204)
             x = QUOTE(((((0.416-0.565)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.7)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.15/0.8)*0.050*SafeZoneH);
@@ -260,7 +260,7 @@ class SEM70_RadioDialog {
             toolTip = QUOTE(Change Frequency Spacing);
         END_CONTROL
 
-        BEGIN_CONTROL(MHzButton, SEM70_RscButton, 205)
+        BEGIN_CONTROL(MHzButton,SEM70_RscButton,205)
             x = QUOTE(((((0.416-0.515)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.72)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.05/0.8)*0.050*SafeZoneH);
@@ -271,7 +271,7 @@ class SEM70_RadioDialog {
             toolTip = QUOTE(Change MHz);
         END_CONTROL
 
-        BEGIN_CONTROL(kHzButton, SEM70_RscButton, 206)
+        BEGIN_CONTROL(kHzButton,SEM70_RscButton,206)
             x = QUOTE(((((0.416-0.35)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.72)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.05/0.8)*0.050*SafeZoneH);
@@ -282,7 +282,7 @@ class SEM70_RadioDialog {
             toolTip = QUOTE(Change kHz);
         END_CONTROL
 
-        BEGIN_CONTROL(displayButton, SEM70_RscButton, 207)
+        BEGIN_CONTROL(displayButton,SEM70_RscButton,207)
             x = QUOTE(((((0.416-0.565)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.75)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.05/0.8)*0.050*SafeZoneH);
@@ -293,7 +293,7 @@ class SEM70_RadioDialog {
             toolTip = QUOTE(Lit Display);
         END_CONTROL
 
-        BEGIN_CONTROL(memorySlotButton, SEM70_RscButton, 208)
+        BEGIN_CONTROL(memorySlotButton,SEM70_RscButton,208)
             x = QUOTE(((((0.416-0.4)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.62)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.05/0.8)*0.050*SafeZoneH);
@@ -304,7 +304,7 @@ class SEM70_RadioDialog {
             toolTip = QUOTE(Change Memory Slot);
         END_CONTROL
 
-        BEGIN_CONTROL(network1Button, SEM70_RscButton, 209)
+        BEGIN_CONTROL(network1Button,SEM70_RscButton,209)
             x = QUOTE(((((0.416-0.35)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.62)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.05/0.8)*0.050*SafeZoneH);
@@ -315,7 +315,7 @@ class SEM70_RadioDialog {
             toolTip = QUOTE(Network 1);
         END_CONTROL
 
-        BEGIN_CONTROL(network2Button, SEM70_RscButton, 210)
+        BEGIN_CONTROL(network2Button,SEM70_RscButton,210)
             x = QUOTE(((((0.416-0.3)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.62)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.05/0.8)*0.050*SafeZoneH);
@@ -326,7 +326,7 @@ class SEM70_RadioDialog {
             toolTip = QUOTE(Network 2);
         END_CONTROL
 
-        BEGIN_CONTROL(network3Button, SEM70_RscButton, 211)
+        BEGIN_CONTROL(network3Button,SEM70_RscButton,211)
             x = QUOTE(((((0.416-0.25)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             y = QUOTE(((((0.595-0.62)*(1.15/0.8))+0.5) * SafeZoneH) + SafeZoneY);
             w = QUOTE((1.05/0.8)*0.050*SafeZoneH);
@@ -351,7 +351,7 @@ class SEM70_RadioDialog {
 //        onLoad = QUOTE([(_this select 0)] call FUNC(_showVolumeKnob));
 //        class controls
 //        {
-//            BEGIN_CONTROL(volumeKnobPictureControl, SEM70_RscPicture, 1071)
+//            BEGIN_CONTROL(volumeKnobPictureControl,SEM70_RscPicture,1071)
 //                x = (((((0.416+0.057)-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY;
 //                y = ((((0.15-0.5)*SCALE)+0.5) * SafeZoneH) + SafeZoneY;
 //                w = SCALE*0.1*SafeZoneH;