diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt
index 2b5fccbf..e9a6372c 100644
--- a/kcontrol/input/CMakeLists.txt
+++ b/kcontrol/input/CMakeLists.txt
@@ -97,11 +97,24 @@ if (X11_Xfixes_FOUND)
    target_link_libraries(kcm_cursortheme ${X11_Xfixes_LIB})
 endif (X11_Xfixes_FOUND)
 
-install(TARGETS kcm_cursortheme  DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
-
+install(
+    TARGETS kcm_cursortheme
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
+)
 
 ########### install files ###############
 
-install( FILES mouse.desktop  DESTINATION  ${KDE4_SERVICES_INSTALL_DIR} )
-install( FILES cursortheme.desktop  DESTINATION  ${KDE4_SERVICES_INSTALL_DIR} )
+install(
+    FILES mouse.desktop
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
+)
 
+install(
+    FILES cursortheme.desktop
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES mouse_new.desktop
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/solid/actions
+)
diff --git a/kcontrol/input/mouse_new.desktop b/kcontrol/input/mouse_new.desktop
new file mode 100644
index 00000000..58ae4941
--- /dev/null
+++ b/kcontrol/input/mouse_new.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+X-KDE-Solid-Predicate=Input.inputType == 'Mouse'
+Type=Service
+Actions=configure;
+
+[Desktop Action configure]
+Name=Configure the mouse
+Exec=kcmshell4 mouse
+Icon=preferences-desktop-mouse
diff --git a/kcontrol/joystick/CMakeLists.txt b/kcontrol/joystick/CMakeLists.txt
index c9dfe49e..e7f3a8a8 100644
--- a/kcontrol/joystick/CMakeLists.txt
+++ b/kcontrol/joystick/CMakeLists.txt
@@ -27,3 +27,8 @@ install(
     FILES joystick.desktop
     DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
+
+install(
+    FILES joystick_new.desktop
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/solid/actions
+)
diff --git a/kcontrol/joystick/joystick_new.desktop b/kcontrol/joystick/joystick_new.desktop
new file mode 100644
index 00000000..712f4eb6
--- /dev/null
+++ b/kcontrol/joystick/joystick_new.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+X-KDE-Solid-Predicate=Input.inputType == 'Joystick'
+Type=Service
+Actions=configure;
+
+[Desktop Action configure]
+Name=Configure the joystick
+Exec=kcmshell4 joystick
+Icon=preferences-desktop-gaming
diff --git a/kcontrol/keyboard/CMakeLists.txt b/kcontrol/keyboard/CMakeLists.txt
index 712bd65e..2eb95dea 100644
--- a/kcontrol/keyboard/CMakeLists.txt
+++ b/kcontrol/keyboard/CMakeLists.txt
@@ -22,3 +22,8 @@ install(
     FILES kcm_keyboard.desktop
     DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
+
+install(
+    FILES keyboard_new.desktop
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/solid/actions
+)
diff --git a/kcontrol/keyboard/keyboard_new.desktop b/kcontrol/keyboard/keyboard_new.desktop
new file mode 100644
index 00000000..2ee3d503
--- /dev/null
+++ b/kcontrol/keyboard/keyboard_new.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+X-KDE-Solid-Predicate=Input.inputType == 'Keyboard'
+Type=Service
+Actions=configure;
+
+[Desktop Action configure]
+Name=Configure the keyboard
+Exec=kcmshell4 kcm_keyboard
+Icon=preferences-desktop-keyboard