diff --git a/src/openvr/ivrinput.cpp b/src/openvr/ivrinput.cpp
index ea9fb16..49261ef 100644
--- a/src/openvr/ivrinput.cpp
+++ b/src/openvr/ivrinput.cpp
@@ -100,9 +100,10 @@ Wrong action names may not result in direct error messages, but just features
 mystically not working.
 */
 SteamIVRInput::SteamIVRInput()
-    : m_manifest(), m_mainSet( action_sets::haptic ),
+    : m_manifest(), m_haptics( action_sets::haptic ),
       m_music( action_sets::music ), m_motion( action_sets::motion ),
-      m_misc( action_sets::misc ), m_nextTrack( action_keys::nextTrack ),
+      m_misc( action_sets::misc ), m_system( action_sets::system ),
+      m_nextTrack( action_keys::nextTrack ),
       m_previousTrack( action_keys::previousTrack ),
       m_pausePlayTrack( action_keys::pausePlayTrack ),
       m_stopTrack( action_keys::stopTrack ),
@@ -145,10 +146,11 @@ SteamIVRInput::SteamIVRInput()
       m_addRightHapticClick( action_keys::addRightHapticClick ),
       m_proxSensor( action_keys::proxSensor ),
       m_leftHand( input_keys::leftHand ), m_rightHand( input_keys::rightHand ),
-      m_sets( { m_mainSet.activeActionSet(),
+      m_sets( { m_haptics.activeActionSet(),
                 m_music.activeActionSet(),
                 m_motion.activeActionSet(),
-                m_misc.activeActionSet() } )
+                m_misc.activeActionSet(),
+                m_system.activeActionSet() } )
 {
 }
 /*!
diff --git a/src/openvr/ivrinput.h b/src/openvr/ivrinput.h
index f289170..13c00d7 100644
--- a/src/openvr/ivrinput.h
+++ b/src/openvr/ivrinput.h
@@ -59,9 +59,9 @@ namespace action_keys
     constexpr auto hapticsLeft = "/actions/haptic/out/HapticsLeft";
     constexpr auto hapticsRight = "/actions/haptic/out/HapticsRight";
     constexpr auto proxSensor = "/actions/haptic/in/ProxSensor";
-    constexpr auto addLeftHapticClick = "/actions/haptic/in/AddLeftHapticClick";
+    constexpr auto addLeftHapticClick = "/actions/system/in/AddLeftHapticClick";
     constexpr auto addRightHapticClick
-        = "/actions/haptic/in/AddRightHapticClick";
+        = "/actions/system/in/AddRightHapticClick";
 
     constexpr auto chaperoneToggle = "/actions/misc/in/ChaperoneToggle";
 
@@ -81,11 +81,12 @@ Keys for different action sets
 */
 namespace action_sets
 {
-    constexpr auto numberOfSets = 4;
+    constexpr auto numberOfSets = 5;
     constexpr auto haptic = "/actions/haptic";
     constexpr auto music = "/actions/music";
     constexpr auto misc = "/actions/misc";
     constexpr auto motion = "/actions/motion";
+    constexpr auto system = "/actions/system";
 } // namespace action_sets
 
 using ActiveActionSets
@@ -184,10 +185,11 @@ public:
 private:
     Manifest m_manifest;
 
-    ActionSet m_mainSet;
+    ActionSet m_haptics;
     ActionSet m_music;
     ActionSet m_motion;
     ActionSet m_misc;
+    ActionSet m_system;
 
     // Music player bindings
     DigitalAction m_nextTrack;
diff --git a/src/package_files/action_manifest.json b/src/package_files/action_manifest.json
index 1cfd79f..c30d954 100644
--- a/src/package_files/action_manifest.json
+++ b/src/package_files/action_manifest.json
@@ -52,12 +52,12 @@
       "type": "vibration"
     },
     {
-      "name": "/actions/haptic/in/AddLeftHapticClick",
+      "name": "/actions/system/in/AddLeftHapticClick",
       "requirement": "optional",
       "type": "boolean"
     },
     {
-      "name": "/actions/haptic/in/AddRightHapticClick",
+      "name": "/actions/system/in/AddRightHapticClick",
       "requirement": "optional",
       "type": "boolean"
     },
@@ -222,8 +222,13 @@
     },
     {
       "name": "/actions/haptic",
+      "usage": "hidden"
+    },
+	{
+      "name": "/actions/system",
       "usage": "leftright"
     }
+
   ],
   "localization" : [
    {
@@ -233,6 +238,7 @@
         "/actions/music" : "Music",
         "/actions/misc" : "Misc",
         "/actions/motion" : "Motion",
+		"/actions/system" : "System",
 
         "/actions/music/in/NextTrack" : "Play Next Track",
         "/actions/music/in/PreviousTrack" : "Play Previous Track",
@@ -241,8 +247,8 @@
 
         "/actions/haptic/out/HapticsLeft" : "Haptics Left",
         "/actions/haptic/out/HapticsRight" : " Haptics Right",
-        "/actions/haptic/in/AddLeftHapticClick" : " Add Left Haptic Click",
-        "/actions/haptic/in/AddRightHapticClick" : " Add Right Haptic Click",
+        "/actions/system/in/AddLeftHapticClick" : " Add Left Haptic Click",
+        "/actions/system/in/AddRightHapticClick" : " Add Right Haptic Click",
 		
         "/actions/motion/in/LeftHandSpaceTurn" : "Left Hand Space Turn",
         "/actions/motion/in/RightHandSpaceTurn" : "Right Hand Space Turn",
diff --git a/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_knuckles.json b/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_knuckles.json
index bea9024..c3a6fb1 100644
--- a/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_knuckles.json
+++ b/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_knuckles.json
@@ -26,9 +26,6 @@
             }
          ]
       },
-      "/actions/main" : {
-         "sources" : []
-      },
       "/actions/misc" : {
          "sources" : [
             {
diff --git a/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_touch.json b/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_touch.json
index e8f1a7f..454dd74 100644
--- a/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_touch.json
+++ b/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_touch.json
@@ -26,9 +26,6 @@
             }
          ]
       },
-      "/actions/main" : {
-         "sources" : []
-      },
       "/actions/misc" : {
          "sources" : [
             {
diff --git a/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_vive_controller.json b/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_vive_controller.json
index 31ceb03..9157dd3 100644
--- a/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_vive_controller.json
+++ b/src/package_files/default_action_manifests/ovras-team.advancedsettings_default_vive_controller.json
@@ -26,9 +26,6 @@
             }
          ]
       },
-      "/actions/main" : {
-         "sources" : []
-      },
       "/actions/misc" : {
          "sources" : [
             {