diff --git a/examples/gnome-example-panel.desktop.in.in b/examples/gnome-example-panel.desktop.in.in
index b933c01c2..9ea8fa76b 100644
--- a/examples/gnome-example-panel.desktop.in.in
+++ b/examples/gnome-example-panel.desktop.in.in
@@ -6,6 +6,9 @@ Icon=application-x-executable
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;
+# The X-GNOME-Settings-Panel is necessary to show in the main shell UI
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;
 OnlyShowIn=GNOME;
 X-GNOME-Settings-Panel=example-panel
+# Translators: those are keywords for the example control-center panel
+_X-GNOME-Keywords=Foo;Bar;Baz;
diff --git a/panels/background/gnome-background-panel.desktop.in.in b/panels/background/gnome-background-panel.desktop.in.in
index 2aef88460..43f3cf59d 100644
--- a/panels/background/gnome-background-panel.desktop.in.in
+++ b/panels/background/gnome-background-panel.desktop.in.in
@@ -9,3 +9,5 @@ StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;
 OnlyShowIn=GNOME;
 X-GNOME-Settings-Panel=background
+# Translators: those are keywords for the background control-center panel
+_X-GNOME-Keywords=Wallpaper;Screen;
diff --git a/panels/datetime/gnome-datetime-panel.desktop.in.in b/panels/datetime/gnome-datetime-panel.desktop.in.in
index db9d2d654..71a79ab56 100644
--- a/panels/datetime/gnome-datetime-panel.desktop.in.in
+++ b/panels/datetime/gnome-datetime-panel.desktop.in.in
@@ -9,3 +9,5 @@ StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
 OnlyShowIn=GNOME;
 X-GNOME-Settings-Panel=datetime
+# Translators: those are keywords for the date and time control-center panel
+_X-GNOME-Keywords=Clock;Timezone;Location;
diff --git a/panels/display/gnome-display-panel.desktop.in.in b/panels/display/gnome-display-panel.desktop.in.in
index aed87f6c6..6fc82ac57 100644
--- a/panels/display/gnome-display-panel.desktop.in.in
+++ b/panels/display/gnome-display-panel.desktop.in.in
@@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=Screen resolution
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=display
 # Translators: those are keywords for the display control-center panel
-_X-GNOME-Keywords=Panel;Projector;xrandr;screen;
+_X-GNOME-Keywords=Panel;Projector;xrandr;Screen;Resolution;Refresh;
diff --git a/panels/keyboard/gnome-keyboard-panel.desktop.in.in b/panels/keyboard/gnome-keyboard-panel.desktop.in.in
index 1ecf612bb..1b259c5b9 100644
--- a/panels/keyboard/gnome-keyboard-panel.desktop.in.in
+++ b/panels/keyboard/gnome-keyboard-panel.desktop.in.in
@@ -13,3 +13,5 @@ X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=keyboard
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=keyboard
+# Translators: those are keywords for the keyboard control-center panel
+_X-GNOME-Keywords=Shortcut;Repeat;Blink;
diff --git a/panels/mouse/gnome-mouse-panel.desktop.in.in b/panels/mouse/gnome-mouse-panel.desktop.in.in
index 44554849b..110ffe773 100644
--- a/panels/mouse/gnome-mouse-panel.desktop.in.in
+++ b/panels/mouse/gnome-mouse-panel.desktop.in.in
@@ -13,3 +13,5 @@ X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=mouse
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=mouse
+# Translators: those are keywords for the mouse and touchpad control-center panel
+_X-GNOME-Keywords=Trackpad;Pointer;Click;Tap;Double;Button;
diff --git a/panels/network/gnome-network-panel.desktop.in.in b/panels/network/gnome-network-panel.desktop.in.in
index b52a1b44b..0cb74b786 100644
--- a/panels/network/gnome-network-panel.desktop.in.in
+++ b/panels/network/gnome-network-panel.desktop.in.in
@@ -13,3 +13,5 @@ X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=network preferences
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=network
+# Translators: those are keywords for the network proxy control-center panel
+_X-GNOME-Keywords=Web;Location;
diff --git a/panels/region/gnome-region-panel.desktop.in.in b/panels/region/gnome-region-panel.desktop.in.in
index 09aa84cba..1d97b8a89 100644
--- a/panels/region/gnome-region-panel.desktop.in.in
+++ b/panels/region/gnome-region-panel.desktop.in.in
@@ -13,3 +13,5 @@ X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=region
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=region
+# Translators: those are keywords for the region control-center panel
+_X-GNOME-Keywords=Language;Layout;
diff --git a/panels/screen/gnome-screen-panel.desktop.in.in b/panels/screen/gnome-screen-panel.desktop.in.in
index 51b7bc060..585520dbc 100644
--- a/panels/screen/gnome-screen-panel.desktop.in.in
+++ b/panels/screen/gnome-screen-panel.desktop.in.in
@@ -13,3 +13,5 @@ X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=screen
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=screen
+# Translators: those are keywords for the brightness and lock control-center panel
+_X-GNOME-Keywords=Brightness;Lock;Dim;Blank;
diff --git a/panels/sound/data/gnome-sound-panel.desktop.in.in b/panels/sound/data/gnome-sound-panel.desktop.in.in
index af1ab074c..ec9d7d84a 100644
--- a/panels/sound/data/gnome-sound-panel.desktop.in.in
+++ b/panels/sound/data/gnome-sound-panel.desktop.in.in
@@ -13,3 +13,5 @@ X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=sound
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=sound
+# Translators: those are keywords for the sound control-center panel
+_X-GNOME-Keywords=Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;
diff --git a/panels/universal-access/gnome-universal-access-panel.desktop.in.in b/panels/universal-access/gnome-universal-access-panel.desktop.in.in
index 21a5619e9..ad60bfa90 100644
--- a/panels/universal-access/gnome-universal-access-panel.desktop.in.in
+++ b/panels/universal-access/gnome-universal-access-panel.desktop.in.in
@@ -13,3 +13,5 @@ X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=Universal Access
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=universal-access
+# Translators: those are keywords for the universal access control-center panel
+_X-GNOME-Keywords=Keyboard;Mouse;a11y;Accessibility;
diff --git a/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in b/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
index af3102f24..4dc82ba71 100644
--- a/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
+++ b/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
@@ -13,3 +13,5 @@ X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=user-accounts
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=user-accounts
+# Translators: those are keywords for the user accounts control-center panel
+_X-GNOME-Keywords=Login;Name;Fingerprint;Avatar;Logo;Face;Password;