diff --git a/makepot b/makepot
index 5f9f759..68724e9 100755
--- a/makepot
+++ b/makepot
@@ -1,29 +1,12 @@
 #!/bin/bash
 
-intltool-extract --type=gettext/glade usr/lib/linuxmint/mintMenu/mintMenu.glade
-intltool-extract --type=gettext/glade usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
-intltool-extract --type=gettext/glade usr/lib/linuxmint/mintMenu/plugins/applications.glade
-intltool-extract --type=gettext/glade usr/lib/linuxmint/mintMenu/plugins/places.glade
-intltool-extract --type=gettext/glade usr/lib/linuxmint/mintMenu/plugins/recent.glade
-intltool-extract --type=gettext/glade usr/lib/linuxmint/mintMenu/plugins/system_management.glade
-
-xgettext --language=Python --keyword=_ --keyword=N_ --output=mintmenu.pot \
-    usr/lib/linuxmint/mintMenu/mintMenu.py \
-    usr/lib/linuxmint/mintMenu/mintMenu.glade.h \
-    usr/lib/linuxmint/mintMenu/mintMenuConfig.py \
-    usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h \
-    usr/lib/linuxmint/mintMenu/keybinding.py \
-    usr/lib/linuxmint/mintMenu/plugins/applications.py \
-    usr/lib/linuxmint/mintMenu/plugins/applications.glade.h \
-    usr/lib/linuxmint/mintMenu/plugins/recent.py \
-    usr/lib/linuxmint/mintMenu/plugins/recent.glade.h \
-    usr/lib/linuxmint/mintMenu/plugins/recentHelper.py \
-    usr/lib/linuxmint/mintMenu/plugins/places.py \
-    usr/lib/linuxmint/mintMenu/plugins/places.glade.h \
-    usr/lib/linuxmint/mintMenu/plugins/system_management.py \
-    usr/lib/linuxmint/mintMenu/plugins/system_management.glade.h
-
-rm -rf usr/lib/linuxmint/mintMenu/*.glade.h
-rm -rf usr/lib/linuxmint/mintMenu/plugins/*.glade.h
+intltool-extract --type=gettext/glade usr/share/linuxmint/mintmenu/applications.ui
+intltool-extract --type=gettext/glade usr/share/linuxmint/mintmenu/main.ui
+intltool-extract --type=gettext/glade usr/share/linuxmint/mintmenu/places.ui
+intltool-extract --type=gettext/glade usr/share/linuxmint/mintmenu/preferences.ui
+intltool-extract --type=gettext/glade usr/share/linuxmint/mintmenu/recent.ui
+intltool-extract --type=gettext/glade usr/share/linuxmint/mintmenu/system.ui
 
+xgettext --language=Python --keyword=_ --keyword=N_ --output=mintmenu.pot usr/lib/linuxmint/mintMenu/*.py usr/share/linuxmint/mintmenu/*.ui.h
 
+rm -rf usr/share/linuxmint/mintmenu/*.ui.h
diff --git a/mintmenu.pot b/mintmenu.pot
index 8d3cecc..1b7c586 100644
--- a/mintmenu.pot
+++ b/mintmenu.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-14 17:24+0100\n"
+"POT-Creation-Date: 2019-05-20 14:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,313 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:31
-msgid "Menu"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:175
-msgid "Couldn't load plugin:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:249
-msgid "Couldn't initialize plugin"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:662
-msgid "Advanced MATE Menu"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:770
-msgid "Preferences"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:773
-msgid "Edit menu"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:776
-msgid "Reload plugins"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:779
-msgid "About"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:35
-msgid "Menu preferences"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:38
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:1
-msgid "Edit Place"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:39
-msgid "New Place"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:40
-msgid "Select a folder"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:78
-msgid "Images"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:195
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:2
-msgid "Name"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:196
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:3
-msgid "Path"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:210
-msgid "Desktop theme"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:346
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:377
-msgid "Name:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:347
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:378
-msgid "Path:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:4
-msgid "Default"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:5
-msgid "Show button icon"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:6
-msgid "Button text:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:7
-msgid "Button icon:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:8
-msgid "Keyboard shortcut:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:9
-msgid "Main button"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:10
-msgid "Show applications plugin"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:11
-msgid "Show system plugin"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:12
-msgid "Show places plugin"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:13
-msgid "Show recently used applications and documents plugin"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:14
-msgid "Show tooltips"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:15
-msgid "Plugins"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:16
-msgid "Headings:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:17
-msgid "Background:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:18
-msgid "Theme:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:19
-msgid "Use custom colors"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:20
-msgid "Colors"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:21
-msgid "Show application comments"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:22
-msgid "Show category icons"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:23
-msgid "Hover"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:24
-msgid "Hover delay (seconds):"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:25
-msgid "Icon size:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:26
-msgid "Search command:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:27
-msgid "Search for packages to install"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:28
-msgid "Remember the last category or search"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:29
-msgid "Enable Internet search"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:30
-msgid "Show search bar on top"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:31
-#: usr/lib/linuxmint/mintMenu/plugins/applications.glade.h:3
-#: usr/lib/linuxmint/mintMenu/plugins/recent.glade.h:1
-msgid "Applications"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:32
-msgid "Number of columns:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:33
-msgid "Swap name and generic name"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:34
-msgid "Always start with favorites pane"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:35
-#: usr/lib/linuxmint/mintMenu/plugins/applications.glade.h:1
-msgid "Favorites"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:36
-msgid "Height:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:37
-msgid "0"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:38
-msgid "Allow Scrollbar"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:39
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:140
-msgid "Computer"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:40
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:147
-msgid "Home Folder"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:41
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:157
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:159
-msgid "Network"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:42
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:178
-msgid "Desktop"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:43
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:185
-msgid "Trash"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:44
-msgid "Toggle Default Places:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:45
-msgid "Show GTK bookmarks"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:46
-msgid "Custom Places:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:47
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:43
-msgid "Places"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:48
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:154
-msgid "Software Manager"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:49
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:161
-msgid "Package Manager"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:50
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:168
-msgid "Control Center"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:51
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:175
-msgid "Terminal"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:52
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:185
-msgid "Lock Screen"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:53
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:192
-msgid "Logout"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:54
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:199
-msgid "Quit"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:55
-msgid "Toggle Default Items:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.glade.h:56
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:38
-msgid "System"
-msgstr ""
-
 #: usr/lib/linuxmint/mintMenu/keybinding.py:168
 msgid "Click to set a new accelerator key for opening and closing the menu.  "
 msgstr ""
@@ -344,212 +37,355 @@ msgstr ""
 msgid "<not set>"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:619
-#, python-format
-msgid "Search DuckDuckGo for %s"
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:34
+msgid "Menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:621
-#, python-format
-msgid "Search Wikipedia for %s"
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:178
+msgid "Couldn't load plugin:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:624
-#, python-format
-msgid "Lookup %s in Dictionary"
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:253
+msgid "Couldn't initialize plugin"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:626
-#, python-format
-msgid "Search Computer for %s"
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:661
+msgid "Advanced MATE Menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:684
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:726
-#, python-format
-msgid "Install package '%s'"
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:768
+msgid "Preferences"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:830
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:901
-msgid "Add to desktop"
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:771
+msgid "Edit menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:831
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:902
-msgid "Add to panel"
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:774
+msgid "Reload plugins"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:833
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:879
-msgid "Insert space"
+#: usr/lib/linuxmint/mintMenu/mintMenu.py:777
+msgid "About"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:834
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:880
-msgid "Insert separator"
+#: usr/lib/linuxmint/mintMenu/preferences.py:24
+msgid "Custom Place"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:836
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:905
-msgid "Launch when I log in"
+#: usr/lib/linuxmint/mintMenu/preferences.py:35
+msgid "Name:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:838
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:907
-msgid "Launch"
+#: usr/lib/linuxmint/mintMenu/preferences.py:39
+msgid "Select a folder"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:839
-msgid "Remove from favorites"
+#: usr/lib/linuxmint/mintMenu/preferences.py:41
+msgid "Folder:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:841
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:911
-msgid "Edit properties"
+#: usr/lib/linuxmint/mintMenu/preferences.py:60
+msgid "Menu preferences"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:878
-msgid "Remove"
+#: usr/lib/linuxmint/mintMenu/preferences.py:67
+msgid "Menu button"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:904
-msgid "Show in my favorites"
+#: usr/lib/linuxmint/mintMenu/preferences.py:67
+msgid "Applet button in the panel"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:908
-msgid "Uninstall"
+#: usr/lib/linuxmint/mintMenu/preferences.py:68
+msgid "Show button icon"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:909
-msgid "Delete from menu"
+#: usr/lib/linuxmint/mintMenu/preferences.py:69
+msgid "Button text"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:974
-msgid "Search DuckDuckGo"
+#: usr/lib/linuxmint/mintMenu/preferences.py:70
+msgid "Button icon"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:975
-msgid "Search Wikipedia"
+#: usr/lib/linuxmint/mintMenu/preferences.py:75
+msgid "Keyboard shortcut"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:977
-msgid "Search Dictionary"
+#: usr/lib/linuxmint/mintMenu/preferences.py:81
+msgid "Options"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:978
-msgid "Search Computer"
+#: usr/lib/linuxmint/mintMenu/preferences.py:81
+msgid "General applet options"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:980
-msgid "Find Software"
+#: usr/lib/linuxmint/mintMenu/preferences.py:82
+msgid "Show system management"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:981
-msgid "Find Tutorials"
+#: usr/lib/linuxmint/mintMenu/preferences.py:85
+msgid "Show places"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:982
-msgid "Find Hardware"
+#: usr/lib/linuxmint/mintMenu/preferences.py:88
+msgid "Show recently used documents and applications"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:983
-msgid "Find Ideas"
+#: usr/lib/linuxmint/mintMenu/preferences.py:92
+msgid "Show tooltips"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:984
-msgid "Find Users"
+#: usr/lib/linuxmint/mintMenu/preferences.py:96
+msgid "Colors"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1390
-msgid ""
-"Couldn't save favorites. Check if you have write access to ~/.linuxmint/"
-"mintMenu"
+#: usr/lib/linuxmint/mintMenu/preferences.py:96
+msgid "Custom colors and theme"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1607
-msgid "All"
+#: usr/lib/linuxmint/mintMenu/preferences.py:97
+msgid "Use custom colors"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1609
-msgid "Show all applications"
+#: usr/lib/linuxmint/mintMenu/preferences.py:98
+msgid "Headings"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.glade.h:2
+#: usr/lib/linuxmint/mintMenu/preferences.py:99
+msgid "Background"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:101
+msgid "Desktop theme"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:111
+msgid "Theme:"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:113
+msgid "Icon sizes"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:113
+msgid "The size of the icons"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:114
+#: usr/share/linuxmint/mintmenu/applications.ui.h:1
+#: usr/share/linuxmint/mintmenu/preferences.ui.h:4
+msgid "Favorites"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:115
+#: usr/share/linuxmint/mintmenu/applications.ui.h:3
+#: usr/share/linuxmint/mintmenu/preferences.ui.h:3
+#: usr/share/linuxmint/mintmenu/recent.ui.h:1
+msgid "Applications"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:116
+#: usr/share/linuxmint/mintmenu/preferences.ui.h:5
+msgid "System"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:117
+#: usr/share/linuxmint/mintmenu/preferences.ui.h:6
+msgid "Places"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:122
+#: usr/lib/linuxmint/mintMenu/preferences.py:140
+#: usr/lib/linuxmint/mintMenu/preferences.py:148
+#: usr/lib/linuxmint/mintMenu/preferences.py:164
+msgid "Layout"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:122
+#: usr/lib/linuxmint/mintMenu/preferences.py:140
+#: usr/lib/linuxmint/mintMenu/preferences.py:148
+#: usr/lib/linuxmint/mintMenu/preferences.py:164
+msgid "Section layout"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:123
+msgid "Show search bar on top"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:124
+msgid "Show applications comments"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:126
+msgid "Categories"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:126
+msgid "Applications categories"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:127
+msgid "Show category icons"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:128
+msgid "Switch categories on hover"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:129
+msgid "Hover delay"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:129
+msgid "milliseconds"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:131
+msgid "Search"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:131
+msgid "Search options"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:132
+msgid "Search for packages to install"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:133
+msgid "Remember the last category or search"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:134
+msgid "Enable Internet search"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:135
+msgid "Search command"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:141
+msgid "Number of columns"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:142
+msgid "Swap name and generic name"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:143
+msgid "Show favorites when the menu is open"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:149
+#: usr/lib/linuxmint/mintMenu/preferences.py:165
+msgid "Custom height"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:150
+#: usr/lib/linuxmint/mintMenu/preferences.py:166
+msgid "Height"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:152
+#: usr/lib/linuxmint/mintMenu/preferences.py:168
+msgid "Items"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:152
+#: usr/lib/linuxmint/mintMenu/preferences.py:168
+msgid "Toggle default items"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:153
+msgid "Software Manager"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:154
+msgid "Package Manager"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:155
+msgid "Control Center"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:156
+msgid "Terminal"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:157
+msgid "Lock Screen"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:158
+msgid "Logout"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:159
+msgid "Quit"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:169
+msgid "Computer"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:170
+msgid "Home Folder"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:171
+msgid "Network"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:172
+msgid "Desktop"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:173
+msgid "Trash"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:174
+msgid "GTK Bookmarks"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:176
+msgid "Custom places"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:176
+msgid "You can add your own places in the menu"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:191
+msgid "Name"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/preferences.py:192
+msgid "Path"
+msgstr ""
+
+#: usr/share/linuxmint/mintmenu/applications.ui.h:2
 msgid "All applications"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.glade.h:4
+#: usr/share/linuxmint/mintmenu/applications.ui.h:4
 msgid "Show additional search options"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/recent.py:34
-msgid "Recently used"
+#: usr/share/linuxmint/mintmenu/preferences.ui.h:1
+msgid "General"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/recent.py:179
-msgid "The file or location could not be opened."
+#: usr/share/linuxmint/mintmenu/preferences.ui.h:2
+msgid "Appearance"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/recent.glade.h:2
+#: usr/share/linuxmint/mintmenu/preferences.ui.h:7
+msgid "Default"
+msgstr ""
+
+#: usr/share/linuxmint/mintmenu/recent.ui.h:2
 msgid "Documents"
 msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/recentHelper.py:40
-msgid ""
-"Couldn't save recent apps. Check if you have write access to ~/.linuxmint/"
-"mintMenu"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:144
-msgid ""
-"Browse all local and remote disks and folders accessible from this computer"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:151
-msgid "Open your personal folder"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:163
-msgid "Browse bookmarked and local network locations"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:182
-msgid "Browse items placed on the desktop"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:192
-msgid "Browse deleted files"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:241
-msgid "Empty trash"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:158
-msgid "Browse and install available software"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:165
-msgid "Install, remove and upgrade software packages"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:172
-msgid "Configure your system"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:182
-msgid "Use the command line"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:189
-msgid "Requires password to unlock"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:196
-msgid "Log out or switch user"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:203
-msgid "Shutdown, restart, suspend or hibernate"
-msgstr ""
diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py
index 73dee25..8357646 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenu.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python2
 
+import locale
 import gc
 import gettext
 import os
@@ -27,6 +28,8 @@ setproctitle.setproctitle('mintmenu')
 
 # i18n
 gettext.install("mintmenu", "/usr/share/linuxmint/locale")
+locale.bindtextdomain("mintmenu", "/usr/share/linuxmint/locale")
+locale.textdomain("mintmenu")
 
 NAME = _("Menu")
 PATH = os.path.abspath(os.path.dirname(sys.argv[0]))
@@ -52,9 +55,9 @@ class MainWindow(object):
         self.icon = "/usr/lib/linuxmint/mintMenu/visualisation-logo.png"
 
         self.toggle = toggleButton
-        # Load UI file and extract widgets
         builder = Gtk.Builder()
-        builder.add_from_file(os.path.join(self.path, "mintMenu.glade"))
+        builder.set_translation_domain("mintmenu")
+        builder.add_from_file("/usr/share/linuxmint/mintmenu/main.ui")
         self.window     = builder.get_object("mainWindow")
         self.paneholder = builder.get_object("paneholder")
 
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index cacaca9..b67da19 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -3,6 +3,7 @@
 import cgi
 import filecmp
 import gettext
+import locale
 import os
 import subprocess
 import threading
@@ -21,6 +22,9 @@ from plugins.easygsettings import EasyGSettings
 
 # i18n
 gettext.install("mintmenu", "/usr/share/linuxmint/locale")
+locale.bindtextdomain("mintmenu", "/usr/share/linuxmint/locale")
+locale.textdomain("mintmenu")
+
 home = os.path.expanduser("~")
 
 class PackageDescriptor():
@@ -168,8 +172,8 @@ class pluginclass(object):
             self.lang = lang.split("_")[0]
 
         self.builder = Gtk.Builder()
-        # The Glade file for the plugin
-        self.builder.add_from_file (os.path.join(os.path.dirname(__file__), "applications.glade"))
+        self.builder.set_translation_domain("mintmenu")
+        self.builder.add_from_file("/usr/share/linuxmint/mintmenu/applications.ui")
 
         # Read GLADE file
         self.main_box = self.builder.get_object("main_box")
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py
index a1f795f..26d1e47 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/places.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/places.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python2
 
+import locale
 import gettext
 import os
 import string
@@ -17,6 +18,9 @@ from plugins.execute import Execute
 
 # i18n
 gettext.install("mintmenu", "/usr/share/linuxmint/locale")
+locale.bindtextdomain("mintmenu", "/usr/share/linuxmint/locale")
+locale.textdomain("mintmenu")
+
 home = os.path.expanduser("~")
 
 class pluginclass(object):
@@ -29,7 +33,8 @@ class pluginclass(object):
 
         # Read UI file
         builder = Gtk.Builder()
-        builder.add_from_file(os.path.join(os.path.dirname(__file__), "places.glade"))
+        builder.set_translation_domain("mintmenu")
+        builder.add_from_file("/usr/share/linuxmint/mintmenu/places.ui")
 
         self.placesBtnHolder    = builder.get_object("places_button_holder")
         self.editableBtnHolder  = builder.get_object("editable_button_holder")
diff --git a/usr/lib/linuxmint/mintMenu/plugins/recent.py b/usr/lib/linuxmint/mintMenu/plugins/recent.py
index 245e85f..8daec5d 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/recent.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/recent.py
@@ -2,6 +2,8 @@
 
 import os
 import subprocess
+import gettext
+import locale
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -11,6 +13,10 @@ import plugins.recentHelper as RecentHelper
 from plugins.easygsettings import EasyGSettings
 from plugins.execute import Execute
 
+# i18n
+gettext.install("mintmenu", "/usr/share/linuxmint/locale")
+locale.bindtextdomain("mintmenu", "/usr/share/linuxmint/locale")
+locale.textdomain("mintmenu")
 
 class pluginclass:
     """ This is the main class for the plugin.
@@ -24,8 +30,8 @@ class pluginclass:
         self.de = de
 
         self.builder = Gtk.Builder()
-        #The Glade file for the plugin
-        self.builder.add_from_file(os.path.join(os.path.dirname(__file__), "recent.glade"))
+        self.builder.set_translation_domain("mintmenu")
+        self.builder.add_from_file("/usr/share/linuxmint/mintmenu/recent.ui")
 
         #Set 'window' property for the plugin (Must be the root widget)
         self.window = self.builder.get_object("window1")
diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.py b/usr/lib/linuxmint/mintMenu/plugins/system_management.py
index e2052f2..d8d6c51 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/system_management.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/system_management.py
@@ -2,6 +2,7 @@
 
 import gettext
 import os
+import locale
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -13,6 +14,8 @@ from plugins.execute import Execute
 
 # i18n
 gettext.install("mintmenu", "/usr/share/linuxmint/locale")
+locale.bindtextdomain("mintmenu", "/usr/share/linuxmint/locale")
+locale.textdomain("mintmenu")
 
 class pluginclass(object):
 
@@ -23,7 +26,8 @@ class pluginclass(object):
         self.de = de
 
         self.builder = Gtk.Builder()
-        self.builder.add_from_file(os.path.join(os.path.dirname(__file__), "system_management.glade"))
+        self.builder.set_translation_domain("mintmenu")
+        self.builder.add_from_file("/usr/share/linuxmint/mintmenu/system.ui")
 
         self.systemBtnHolder    = self.builder.get_object("system_button_holder")
         self.editableBtnHolder  = self.builder.get_object("editable_button_holder")
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.glade b/usr/share/linuxmint/mintmenu/applications.ui
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/applications.glade
rename to usr/share/linuxmint/mintmenu/applications.ui
diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.glade b/usr/share/linuxmint/mintmenu/main.ui
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/mintMenu.glade
rename to usr/share/linuxmint/mintmenu/main.ui
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.glade b/usr/share/linuxmint/mintmenu/places.ui
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/places.glade
rename to usr/share/linuxmint/mintmenu/places.ui
diff --git a/usr/lib/linuxmint/mintMenu/plugins/recent.glade b/usr/share/linuxmint/mintmenu/recent.ui
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/recent.glade
rename to usr/share/linuxmint/mintmenu/recent.ui
diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.glade b/usr/share/linuxmint/mintmenu/system.ui
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/system_management.glade
rename to usr/share/linuxmint/mintmenu/system.ui