diff --git a/rules/base.xml.in b/rules/base.xml.in
index 8fc8c4e..5d1ac73 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4496,7 +4496,7 @@
       <option>
         <configItem>
           <name>grp:caps_switch</name>
-          <_description>CapsLock (while pressed), Alt+CapsLock does the original capslock action</_description>
+          <_description>Caps Lock (while pressed), Alt+Caps Lock does the original capslock action</_description>
         </configItem>
       </option>
       <option>
@@ -4520,19 +4520,19 @@
       <option>
         <configItem>
           <name>grp:caps_toggle</name>
-          <_description>CapsLock</_description>
+          <_description>Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:shift_caps_toggle</name>
-          <_description>Shift+CapsLock</_description>
+          <_description>Shift+Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>grp:shift_caps_switch</name>
-          <_description>CapsLock (to first layout), Shift+CapsLock (to last layout)</_description>
+          <_description>Caps Lock (to first layout), Shift+Caps Lock (to last layout)</_description>
         </configItem>
       </option>
       <option>
@@ -4550,7 +4550,7 @@
       <option>
         <configItem>
           <name>grp:alt_caps_toggle</name>
-          <_description>Alt+CapsLock</_description>
+          <_description>Alt+Caps Lock</_description>
         </configItem>
       </option>
       <option>
@@ -4732,7 +4732,7 @@
       <option>
         <configItem>
           <name>lv3:caps_switch</name>
-          <_description>CapsLock</_description>
+          <_description>Caps Lock</_description>
         </configItem>
       </option>
       <option>
@@ -4750,7 +4750,7 @@
       <option>
         <configItem>
           <name>lv3:caps_switch_latch</name>
-          <description>CapsLock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
+          <description>Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
         </configItem>
       </option>
       <option>
@@ -4775,13 +4775,13 @@
       <option>
         <configItem>
           <name>ctrl:nocaps</name>
-          <_description>Make CapsLock an additional Ctrl</_description>
+          <_description>Make Caps Lock an additional Ctrl</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>ctrl:swapcaps</name>
-          <_description>Swap Ctrl and CapsLock</_description>
+          <_description>Swap Ctrl and Caps Lock</_description>
         </configItem>
       </option>
       <option>
@@ -4824,7 +4824,7 @@
       <option>
         <configItem>
           <name>grp_led:caps</name>
-          <_description>CapsLock</_description>
+          <_description>Caps Lock</_description>
         </configItem>
       </option>
       <option>
@@ -4955,84 +4955,84 @@
 	   Otherwise "as Shift" - means using next group. -->
       <configItem>
         <name>caps</name>
-        <_description>CapsLock key behavior</_description>
+        <_description>Caps Lock key behavior</_description>
       </configItem>
       <option>
         <configItem>
           <name>caps:internal</name>
-          <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock</_description>
+          <_description>Caps Lock uses internal capitalization. Shift "pauses" Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:internal_nocancel</name>
-          <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock</_description>
+          <_description>Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shift</name>
-          <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock</_description>
+          <_description>Caps Lock acts as Shift with locking. Shift "pauses" Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shift_nocancel</name>
-          <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock</_description>
+          <_description>Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:capslock</name>
-          <_description>CapsLock toggles normal capitalization of alphabetic characters</_description>
+          <_description>Caps Lock toggles normal capitalization of alphabetic characters</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:numlock</name>
-          <_description>Make CapsLock an additional NumLock</_description>
+          <_description>Make Caps Lock an additional NumLock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:swapescape</name>
-          <_description>Swap ESC and CapsLock</_description>
+          <_description>Swap ESC and Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:escape</name>
-          <_description>Make CapsLock an additional ESC</_description>
+          <_description>Make Caps Lock an additional ESC</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:backspace</name>
-          <_description>Make CapsLock an additional Backspace</_description>
+          <_description>Make Caps Lock an additional Backspace</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:super</name>
-          <_description>Make CapsLock an additional Super</_description>
+          <_description>Make Caps Lock an additional Super</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:hyper</name>
-          <_description>Make CapsLock an additional Hyper</_description>
+          <_description>Make Caps Lock an additional Hyper</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:shiftlock</name>
-          <_description>CapsLock toggles Shift so all keys are affected</_description>
+          <_description>Caps Lock toggles Shift so all keys are affected</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>caps:none</name>
-          <_description>CapsLock is disabled</_description>
+          <_description>Caps Lock is disabled</_description>
         </configItem>
       </option>
     </group>
@@ -5142,7 +5142,7 @@
       <option>
         <configItem>
           <name>compose:caps</name>
-          <_description>CapsLock</_description>
+          <_description>Caps Lock</_description>
         </configItem>
       </option>
       <option>
@@ -5214,7 +5214,7 @@
       <option>
         <configItem>
           <name>shift:breaks_caps</name>
-          <_description>Shift cancels CapsLock</_description>
+          <_description>Shift cancels Caps Lock</_description>
         </configItem>
       </option>
       <option>
@@ -5226,13 +5226,13 @@
       <option>
         <configItem>
           <name>shift:both_capslock</name>
-          <_description>Both Shift-Keys together toggle CapsLock</_description>
+          <_description>Both Shift-Keys together toggle Caps Lock</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>shift:both_capslock_cancel</name>
-          <description>Both Shift-Keys together activate CapsLock, one Shift-Key deactivates</description>
+          <description>Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates</description>
         </configItem>
       </option>
       <option>