diff -Nru ubuntustudio-menu-0.23/debian/changelog ubuntustudio-menu-0.25/debian/changelog
--- ubuntustudio-menu-0.23/debian/changelog	2016-03-21 15:59:02.000000000 +0000
+++ ubuntustudio-menu-0.25/debian/changelog	2016-04-11 17:17:45.000000000 +0000
@@ -1,3 +1,17 @@
+ubuntustudio-menu (0.25) xenial; urgency=medium
+
+  [ Krytarik Raido ]
+  * Fix Ubuntu Studio menu items up a bit.
+
+ -- Kaj Ailomaa <zequence@mousike.me>  Mon, 11 Apr 2016 19:17:40 +0200
+
+ubuntustudio-menu (0.24) xenial; urgency=medium
+
+  * Exclude non-Q16 desktop file & display Q16 one in utilities.
+    Avoids two entries being displayed in menu (LP: #1549732)
+
+ -- Ross Gammon <rossgammon@mail.dk>  Tue, 22 Mar 2016 19:53:31 +0100
+
 ubuntustudio-menu (0.23) xenial; urgency=medium
 
   * Corrected package description in debian/control
diff -Nru ubuntustudio-menu-0.23/etc/xdg/menus/applications-merged/studio.menu ubuntustudio-menu-0.25/etc/xdg/menus/applications-merged/studio.menu
--- ubuntustudio-menu-0.23/etc/xdg/menus/applications-merged/studio.menu	2016-03-21 14:52:59.000000000 +0000
+++ ubuntustudio-menu-0.25/etc/xdg/menus/applications-merged/studio.menu	2016-04-11 11:07:21.000000000 +0000
@@ -72,7 +72,8 @@
             <Filename>entangle.desktop</Filename>
             <Filename>font-manager.desktop</Filename>
             <Filename>ristretto.desktop</Filename>
-            <Filename>display.im6.desktop</Filename>
+            <Filename>display-im6.q16.desktop</Filename>
+            <Filename>display-im6.desktop</Filename>
           </Not>
 
          </And>
@@ -104,7 +105,7 @@
 	        <Category>Utilities</Category>
 	    </And>
             <Filename>agave.desktop</Filename>
-            <Filename>display.im6.desktop</Filename>
+            <Filename>display-im6.q16.desktop</Filename>
             <Filename>font-manager.desktop</Filename>
 	</Include>
      </Menu> <!-- End graphic utilities -->
diff -Nru ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-contribute.desktop ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-contribute.desktop
--- ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-contribute.desktop	1970-01-01 00:00:00.000000000 +0000
+++ ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-contribute.desktop	2016-04-11 11:07:21.000000000 +0000
@@ -0,0 +1,52 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+StartupNotify=false
+Terminal=false
+Keywords=Info;Information;Ubuntustudio;Contribute;Dev;
+Exec=xdg-open http://ubuntustudio.org/contribute/
+Icon=ubuntustudio-logo
+Name=Contribute to Ubuntu Studio
+Name[cs]=Přispět Ubuntu Studio
+Name[de]=Sich an Ubuntu Studio beteiligen
+Name[en_AU]=Contribute to Ubuntu Studio
+Name[en_GB]=Contribute to Ubuntu Studio
+Name[es]=Colaborar con Ubuntu Studio
+Name[fi]=Osallistu Ubuntu Studion kehittämiseen
+Name[fr]=Contribuer à Ubuntu Studio
+Name[gl]=Colabore co Ubuntu Studio
+Name[hu]=Közreműködés a Ubuntu Studioban
+Name[is]=Leggðu Ubuntu Studio lið
+Name[ja]=Ubuntu Studioに貢献する
+Name[lt]=Talkinti Ubuntu Studio
+Name[ml]=സുബുണ്ടുവിലേക്ക് സംഭാവന ചെയ്യൂ
+Name[nl]=Werk mee aan Ubuntu Studio
+Name[oc]=Contribuir a Ubuntu Studio
+Name[pl]=Pomoc dla Ubuntu Studio
+Name[pt]=Contribuir para o Ubuntu Studio
+Name[pt_BR]=Contribuir com o Ubuntu Studio
+Name[ru]=Окажите помощь Ubuntu Studio
+Name[sk]=Prispejte do Ubuntu Studio
+Name[sr]=Допринесите Иксубунтуу
+Comment=Read how you can make Ubuntu Studio better!
+Comment[cs]=Přečtěte si, jak můžete pomoci Ubuntu Studio!
+Comment[de]=Lesen, wie Sie Ubuntu Studio besser machen können!
+Comment[en_AU]=Read how you can make Ubuntu Studio better!
+Comment[en_GB]=Read how you can make Ubuntu Studio better!
+Comment[es]=Lea cómo puede ayudar a mejorar Ubuntu Studio!
+Comment[fi]=Lue kuinka voit tehdä Ubuntu Studiosta paremman!
+Comment[fr]=Lire comment améliorer Ubuntu Studio !
+Comment[gl]=Aprenda sobre como mellorar o Ubuntu Studio!
+Comment[hu]=Ismerje meg, hogyan teheti jobbá a Ubuntu Studiot!
+Comment[is]=Lestu hvernig þú getur bætt Ubuntu Studio!
+Comment[ja]=Ubuntu Studioをよりよくするためにあなたにできることをお読みください!
+Comment[lt]=Skaitykite kaip jūs galite padaryti Ubuntu Studio geresne!
+Comment[ml]=എങ്ങനെ സുബുണ്ടു മികച്ചതാക്കാമെന്ന് വായിച്ചറിയൂ!
+Comment[nl]=Lees hoe u Ubuntu Studio beter kunt maken!
+Comment[pl]=Dowiedz się jak możesz uczynić Ubuntu Studio lepszym!
+Comment[pt]=Leia como pode tornar o Ubuntu Studio melhor!
+Comment[pt_BR]=Leia como você pode fazer o Ubuntu Studio melhor!
+Comment[ru]=Узнайте, как вы можете помочь Ubuntu Studio!
+Comment[sk]=Prečítajte si ako môžete spraviť Ubuntu Studio lepším!
+Comment[sr]=Прочитајте како можете Иксубунту да учините бољим!
+Categories=System;Documentation;
diff -Nru ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-forum.desktop ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-forum.desktop
--- ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-forum.desktop	2016-03-21 14:52:59.000000000 +0000
+++ ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-forum.desktop	2016-04-11 11:07:21.000000000 +0000
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Exec=xdg-open http://ubuntuforums.org/forumdisplay.php?f=335
-Icon=system-help
 StartupNotify=false
-Name=Ubuntu Studio Forum
-Comment=Go to the Ubuntu Studio Forum
-Keywords=Info;Information;Ubuntustudio;Forum;
 Terminal=false
+Keywords=Info;Information;Ubuntustudio;Forum;
+Exec=xdg-open http://ubuntuforums.org/forumdisplay.php?f=335
+Icon=system-users
+Name=Ubuntu Studio Forum
+Comment=Visit the Ubuntu Studio forum.
 Categories=System;Documentation;
diff -Nru ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-help.desktop ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-help.desktop
--- ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-help.desktop	2016-03-21 14:52:59.000000000 +0000
+++ ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-help.desktop	2016-04-11 11:07:21.000000000 +0000
@@ -6,58 +6,58 @@
 Keywords=Info;Information;Ubuntustudio;Help;
 Exec=xdg-open https://help.ubuntu.com/community/UbuntuStudio
 Icon=system-help
-Name=Help and Documentation
-Name[ca]=Ajuda
-Name[da]=Hjælp
-Name[de]=Hilfe
-Name[el]=Βοήθεια
-Name[es]=Ayuda
-Name[eu]=Laguntza
-Name[fi]=Ohje
-Name[fr]=Aide
-Name[gl]=Axuda
-Name[he]=עזרה
-Name[hr]=Pomoć
-Name[hu]=Súgó
-Name[id]=Bantuan
-Name[it]=Aiuto
-Name[ja]=ヘルプ
-Name[kk]=Көмек
-Name[nl]=Hulp
-Name[pt]=Ajuda
-Name[pt_BR]=Ajuda
-Name[ru]=Справка
-Name[sk]=Pomocník
-Name[sv]=Hjälp
-Name[ug]=يادەم
-Name[uk]=Допомога
-Name[zh_CN]=帮助
-Name[zh_TW]=幫助
-Comment=Help and Documentation for using UbuntuStudio
-Comment[ca]=Ajuda de UbuntuStudio
-Comment[da]=Hjælp til brug af UbuntuStudio
-Comment[de]=Hilfe zur Nutzung von UbuntuStudio
-Comment[el]=Βοήθεια για τη χρήση του UbuntuStudio
-Comment[es]=Ayuda usando UbuntuStudio
-Comment[eu]=Lagundu UbuntuStudio erabiltzen
-Comment[fi]=Ohjeita UbuntuStudio:n käyttöön
-Comment[fr]=Aide UbuntuStudio
-Comment[gl]=Axuda sobre o uso de UbuntuStudio
-Comment[he]=עזרה בשימוש ב־UbuntuStudio
-Comment[hr]=Pomoć pri  korištenju UbuntuStudio
-Comment[hu]=Segítség az UbuntuStudio használatához
-Comment[id]=Bantuan menggunakan UbuntuStudio
-Comment[it]=Aiuto per l'utilizzo di UbuntuStudio
-Comment[ja]=UbuntuStudio の使用に関するヘルプです
-Comment[kk]=UbuntuStudio қолдану көмегі
-Comment[nl]=Hulp bij het gebruik van UbuntuStudio
-Comment[pt]=Ajuda de utilização UbuntuStudio
-Comment[pt_BR]=Ajuda usando UbuntuStudio
-Comment[ru]=Справка по использованию UbuntuStudio
-Comment[sk]=Pomocník pre používanie UbuntuStudio
-Comment[sv]=Hjälp hur man använder UbuntuStudio
-Comment[ug]=UbuntuStudio ياردەملىرى
-Comment[uk]=Допомога про використання UbuntuStudio
-Comment[zh_CN]=使用 UbuntuStudio 的帮助
-Comment[zh_TW]=幫助您使用 UbuntuStudio
+Name=Ubuntu Studio Help
+Name[ca]=Ajuda de Ubuntu Studio
+Name[da]=Hjælp af Ubuntu Studio
+Name[de]=Ubuntu Studio-Hilfe
+Name[el]=Βοήθεια του Ubuntu Studio
+Name[es]=Ayuda de Ubuntu Studio
+Name[eu]=Ubuntu Studio Laguntza
+Name[fi]=Ohjeita Ubuntu Studion
+Name[fr]=Aide d'Ubuntu Studio
+Name[gl]=Axuda de Ubuntu Studio
+Name[he]=עזרהUbuntu Studio
+Name[hr]=Pomoć Ubuntu Studio
+Name[hu]=Súgó Ubuntu Studio
+Name[id]=Bantuan Ubuntu Studio
+Name[it]=Aiuto di Ubuntu Studio
+Name[ja]=Ubuntu Studioヘルプ
+Name[kk]=Ubuntu Studio Көмек
+Name[nl]=Hulp van Ubuntu Studio
+Name[pt]=Ajuda de Ubuntu Studio
+Name[pt_BR]=Ajuda de Ubuntu Studio
+Name[ru]=Справка Ubuntu Studio
+Name[sk]=Pomocník Ubuntu Studio
+Name[sv]=Hjälp av Ubuntu Studio
+Name[ug]=Ubuntu Studio يادەم
+Name[uk]=Допомога Ubuntu Studio
+Name[zh_CN]=帮助 Ubuntu Studio
+Name[zh_TW]=幫助 Ubuntu Studio
+Comment=Help using Ubuntu Studio
+Comment[ca]=Ajuda de Ubuntu Studio
+Comment[da]=Hjælp til brug af Ubuntu Studio
+Comment[de]=Hilfe zur Nutzung von Ubuntu Studio
+Comment[el]=Βοήθεια για τη χρήση του Ubuntu Studio
+Comment[es]=Ayuda usando Ubuntu Studio
+Comment[eu]=Lagundu Ubuntu Studio erabiltzen
+Comment[fi]=Ohjeita Ubuntu Studion käyttöön
+Comment[fr]=Aide Ubuntu Studio
+Comment[gl]=Axuda sobre o uso de Ubuntu Studio
+Comment[he]=עזרה בשימוש ב־Ubuntu Studio
+Comment[hr]=Pomoć pri korištenju Ubuntu Studio
+Comment[hu]=Segítség az Ubuntu Studio használatához
+Comment[id]=Bantuan menggunakan Ubuntu Studio
+Comment[it]=Aiuto per l'utilizzo di Ubuntu Studio
+Comment[ja]=Ubuntu Studio の使用に関するヘルプです
+Comment[kk]=Ubuntu Studio қолдану көмегі
+Comment[nl]=Hulp bij het gebruik van Ubuntu Studio
+Comment[pt]=Ajuda de utilização Ubuntu Studio
+Comment[pt_BR]=Ajuda usando Ubuntu Studio
+Comment[ru]=Справка по использованию Ubuntu Studio
+Comment[sk]=Pomocník pre používanie Ubuntu Studio
+Comment[sv]=Hjälp hur man använder Ubuntu Studio
+Comment[ug]=Ubuntu Studio ياردەملىرى
+Comment[uk]=Допомога про використання Ubuntu Studio
+Comment[zh_CN]=使用 Ubuntu Studio 的帮助
+Comment[zh_TW]=幫助您使用 Ubuntu Studio
 Categories=System;Documentation;
diff -Nru ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-irc.desktop ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-irc.desktop
--- ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-irc.desktop	2016-03-21 15:47:37.000000000 +0000
+++ ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-irc.desktop	2016-04-11 11:07:21.000000000 +0000
@@ -1,23 +1,11 @@
 [Desktop Entry]
-Name=UbuntuStudio IRC
-Name[zh_TW]=網路清談
-Comment[de]=IRC-Client
-Comment[es]=Aplicación de IRC
-Comment[fi]=IRC-sovellus
-Comment[fr]=Client IRC
-Comment[hu]=IRC-kliens
-Comment[lt]=IRC klientas
-Comment[no]=IRC-klient
-Comment[pt_BR]=Cliente de IRC
-Comment[sl]=Odjemalec IRC
-Comment[sv]=IRC-klient
-Comment[ro]=Client de IRC
-Comment[zh_TW]=X-Chat 聊天程式
-Comment=UbuntuStudio's IRC support channel
+Version=1.0
 Type=Application
 StartupNotify=false
 Terminal=false
-Keywords=Info;Information;Irc;Ubuntustudio;
+Keywords=Info;Information;Ubuntustudio;Irc;
 Exec=xdg-open http://webchat.freenode.net/?channels=ubuntustudio\&nick=studio-user...\&prompt=1
-Icon=ubuntustudio-logo
+Icon=applications-chat
+Name=Ubuntu Studio IRC
+Comment=Visit the Ubuntu Studio IRC channel.
 Categories=System;Documentation;
diff -Nru ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-list.desktop ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-list.desktop
--- ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-list.desktop	2016-03-21 14:52:59.000000000 +0000
+++ ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-list.desktop	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-StartupNotify=false
-Terminal=false
-Keywords=Info;Information;Ubuntustudio;Email;
-Exec=xdg-open https://lists.ubuntu.com/mailman/listinfo/ubuntu-studio-users
-Icon=system-help
-Name=ubuntustudio mail list page
-Comment=join the UbuntuStudio mail list
-Categories=System;Documentation;
diff -Nru ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-list-dev.desktop ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-list-dev.desktop
--- ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-list-dev.desktop	2016-03-21 14:52:59.000000000 +0000
+++ ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-list-dev.desktop	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-StartupNotify=false
-Terminal=false
-Keywords=Info;Information;Ubuntustudio;Email;Contribute;Dev;
-Exec=xdg-open https://lists.ubuntu.com/mailman/listinfo/ubuntu-studio-devel
-Icon=ubuntustudio-logo
-Name=Ubuntu Studio You can help
-Comment=Join the Ubuntu Studio Team
-Categories=System;Documentation;
diff -Nru ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-mail.desktop ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-mail.desktop
--- ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-mail.desktop	1970-01-01 00:00:00.000000000 +0000
+++ ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-mail.desktop	2016-04-11 11:07:21.000000000 +0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+StartupNotify=false
+Terminal=false
+Keywords=Info;Information;Ubuntustudio;Email;
+Exec=xdg-open https://lists.ubuntu.com/mailman/listinfo/ubuntu-studio-users
+Icon=applications-mail
+Name=Ubuntu Studio Mailing List
+Comment=Join the Ubuntu Studio mailing list.
+Categories=System;Documentation;
diff -Nru ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-web.desktop ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-web.desktop
--- ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-web.desktop	2016-03-21 14:52:59.000000000 +0000
+++ ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-web.desktop	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-StartupNotify=false
-Terminal=false
-Keywords=Info;Information;Ubuntustudio;Help;Home;
-Exec=xdg-open http://ubuntustudio.org/
-Icon=ubuntustudio-logo
-Name=ubuntustudio.org
-Comment=Ubuntu Studio Home Page
-Categories=System;Documentation;
diff -Nru ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-website.desktop ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-website.desktop
--- ubuntustudio-menu-0.23/usr/share/applications/ubuntustudio-website.desktop	1970-01-01 00:00:00.000000000 +0000
+++ ubuntustudio-menu-0.25/usr/share/applications/ubuntustudio-website.desktop	2016-04-11 11:07:21.000000000 +0000
@@ -0,0 +1,52 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+StartupNotify=false
+Terminal=false
+Keywords=Info;Information;Ubuntustudio;Website;
+Exec=xdg-open http://ubuntustudio.org/
+Icon=ubuntustudio-logo
+Name=Ubuntu Studio Website
+Name[cs]=Webová stránka Ubuntu Studio
+Name[de]=Ubuntu Studio-Internetseite
+Name[en_AU]=Ubuntu Studio Website
+Name[en_GB]=Ubuntu Studio Website
+Name[es]=Sitio web de Ubuntu Studio
+Name[fi]=Ubuntu Studion verkkosivusto
+Name[fr]=Site internet de Ubuntu Studio
+Name[gl]=Sitio web do Ubuntu Studio
+Name[hu]=A Ubuntu Studio weboldala
+Name[is]=Vefsíða Ubuntu Studio
+Name[ja]=Ubuntu Studioのウェブサイト
+Name[lt]=Ubuntu Studio svetainė
+Name[ml]=സുബുണ്ടു വെബ്സൈറ്റ്
+Name[nl]=Webpagina van Ubuntu Studio
+Name[oc]=Site web de Ubuntu Studio
+Name[pl]=Strona internetowa Ubuntu Studio
+Name[pt]=Site do Ubuntu Studio
+Name[pt_BR]=Ubuntu Studio Website
+Name[ru]=Сайт Ubuntu Studio
+Name[sk]=Webová stránka Ubuntu Studio
+Name[sr]=Веб сајт Иксубунтуа
+Comment=Learn more about Ubuntu Studio on our website.
+Comment[cs]=Zjistětš více o Ubuntu Studio na našich webových stránkách.
+Comment[de]=Mehr über Ubuntu Studio auf unserer Internetseite erfahren.
+Comment[en_AU]=Learn more about Ubuntu Studio on our website.
+Comment[en_GB]=Learn more about Ubuntu Studio on our website.
+Comment[es]=Aprenda más sobre Ubuntu Studio en nuestro sitio web.
+Comment[fi]=Lue lisää Ubuntu Studiosta verkkosivustollamme.
+Comment[fr]=En savoir plus sur Ubuntu Studio sur notre site internet.
+Comment[gl]=Aprenda máis sobre o Ubuntu Studio no noso sitio web.
+Comment[hu]=Tudjon meg többet a Ubuntu Studioról a weboldalunkon
+Comment[is]=Lærðu meira um Ubuntu Studio á vefsíðunni okkar.
+Comment[lt]=Sužinokite daugiau apie Ubuntu Studio mūsų svetainėje
+Comment[ml]=സുബുണ്ടുവിനെ കുറിച്ച് കൂടുതല്‍ വിവരങ്ങള്‍ ഞങ്ങളുടെ വെബ്സൈറ്റില്‍
+Comment[nl]=Kom meer te weten over Ubuntu Studio op onze webpagina.
+Comment[oc]=Aprenètz-ne mai sus Ubuntu Studio sus nòstre site web.
+Comment[pl]=Dowiedz się więcej o Ubuntu Studio na naszej stronie internetowej.
+Comment[pt]=Saiba mais sobre o Ubuntu Studio no nosso site.
+Comment[pt_BR]=Aprenda mais sobre o Ubuntu Studio em nosso website.
+Comment[ru]=Узнайте больше о Ubuntu Studio на нашем сайте.
+Comment[sk]=Viac informácií o Ubuntu Studio získate na jeho webových stránkach.
+Comment[sr]=Научите нешто више о Иксубунтуу на нашем веб сајту.
+Categories=System;Documentation;