diff --git a/installer/ant/ant.properties b/installer/ant/ant.properties
index 58f25611..70b43c38 100644
--- a/installer/ant/ant.properties
+++ b/installer/ant/ant.properties
@@ -25,7 +25,10 @@ microsoft.application.publisher: CN=761A0D2B-9B86-4FE4-B664-18E4E0AFC3F1
 
 # Platform-specific Package Information
 mac.application.category: public.app-category.utilities
-gnome.application.categories: AudioVideo;Video;Utility;FileTools;
+deb.application.categories: AudioVideo;Video;Utility;FileTools;
+deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*;
+deb.application.class: net-filebot-Main
+deb.control.depends: openjdk-8-jre, openjfx, mediainfo, libchromaprint-tools, nautilus-actions
 
 # Links
 link.help.manpage: http://www.filebot.net/cli.html
diff --git a/installer/deb/control/control b/installer/deb/control/control
index ee2d0558..dabe3b9c 100644
--- a/installer/deb/control/control
+++ b/installer/deb/control/control
@@ -7,3 +7,4 @@ Description: @{package.synopsis}
 Homepage: @{package.homepage}
 Section: utils
 Priority: extra
+Suggests: @{deb.control.depends}
diff --git a/installer/deb/share/applications/filebot.desktop b/installer/deb/share/applications/filebot.desktop
index df224853..369a2f81 100644
--- a/installer/deb/share/applications/filebot.desktop
+++ b/installer/deb/share/applications/filebot.desktop
@@ -2,13 +2,13 @@
 Type=Application
 Name=@{application.name}
 Comment=@{package.synopsis}
-MimeType=inode/directory;video/*;audio/*;text/*;
+MimeType=@{deb.application.mimetype}
 Exec=filebot %F
 Icon=filebot
-Categories=@{gnome.application.categories}
+Categories=@{deb.application.categories}
 Actions=Rename;Subtitles;Checksum;
 StartupNotify=true
-StartupWMClass=net-filebot-Main
+StartupWMClass=@{deb.application.class}
 X-Ubuntu-Gettext-Domain=@{package.name}
 
 [Desktop Action Rename]
diff --git a/installer/deb/share/file-manager/actions/filebot-checksum.desktop b/installer/deb/share/file-manager/actions/filebot-checksum.desktop
index 7561d70f..f28c1ccd 100644
--- a/installer/deb/share/file-manager/actions/filebot-checksum.desktop
+++ b/installer/deb/share/file-manager/actions/filebot-checksum.desktop
@@ -5,5 +5,5 @@ Profiles=Media;
 
 [X-Action-Profile Media]
 Name=Checksum
-MimeTypes=inode/directory;video/*;audio/*;text/*;application/*;
+MimeTypes=@{deb.application.mimetype}
 Exec=filebot --mode SFV %F
diff --git a/installer/deb/share/file-manager/actions/filebot-import.desktop b/installer/deb/share/file-manager/actions/filebot-import.desktop
index bbb87935..e6bd7ff7 100644
--- a/installer/deb/share/file-manager/actions/filebot-import.desktop
+++ b/installer/deb/share/file-manager/actions/filebot-import.desktop
@@ -5,6 +5,6 @@ Profiles=Media;
 
 [X-Action-Profile Media]
 Name=Import to Media Library
-MimeTypes=inode/directory;video/*;audio/*;
+MimeTypes=@{deb.application.mimetype}
 ExecutionMode=DisplayOutput
 Exec=filebot -script fn:amc --output "$HOME/Media" --action duplicate -non-strict --log-file "$HOME/Media/amc.log" --def excludeList="$HOME/Media/amc.excludes" unsorted=y music=y artwork=y %F
diff --git a/installer/deb/share/file-manager/actions/filebot-rename.desktop b/installer/deb/share/file-manager/actions/filebot-rename.desktop
index 53938e2d..14d20b61 100644
--- a/installer/deb/share/file-manager/actions/filebot-rename.desktop
+++ b/installer/deb/share/file-manager/actions/filebot-rename.desktop
@@ -5,5 +5,5 @@ Profiles=Media;
 
 [X-Action-Profile Media]
 Name=Rename
-MimeTypes=inode/directory;video/*;audio/*;
+MimeTypes=@{deb.application.mimetype}
 Exec=filebot --mode Rename %F
diff --git a/installer/deb/share/file-manager/actions/filebot-subtitles.desktop b/installer/deb/share/file-manager/actions/filebot-subtitles.desktop
index 7caf5f07..9203fc37 100644
--- a/installer/deb/share/file-manager/actions/filebot-subtitles.desktop
+++ b/installer/deb/share/file-manager/actions/filebot-subtitles.desktop
@@ -5,5 +5,5 @@ Profiles=Media;
 
 [X-Action-Profile Media]
 Name=Subtitles
-MimeTypes=inode/directory;video/*;
+MimeTypes=@{deb.application.mimetype}
 Exec=filebot --mode Subtitles %F
diff --git a/installer/deb/share/file-manager/actions/menu-filebot.desktop b/installer/deb/share/file-manager/actions/menu-filebot.desktop
index 00383c3f..f9086b6c 100644
--- a/installer/deb/share/file-manager/actions/menu-filebot.desktop
+++ b/installer/deb/share/file-manager/actions/menu-filebot.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Menu
-Name=FileBot
+Name=@{application.name}
 Tooltip=Common FileBot Actions
 Icon=filebot
 ItemsList=filebot-rename;filebot-subtitles;filebot-checksum;filebot-import;
diff --git a/installer/deb/share/kservices5/ServiceMenus/filebot.desktop b/installer/deb/share/kservices5/ServiceMenus/filebot.desktop
index d0d67dce..4dbee909 100644
--- a/installer/deb/share/kservices5/ServiceMenus/filebot.desktop
+++ b/installer/deb/share/kservices5/ServiceMenus/filebot.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Service
-Name=FileBot
+Name=@{application.name}
 Icon=filebot
 ServiceTypes=KonqPopupMenu/Plugin
 Actions=Rename;Subtitles;Checksum;Import;
-MimeType=inode/directory;video/*;audio/*;text/*;
+MimeType=@{deb.application.mimetype}
 X-KDE-Priority=TopLevel
-X-KDE-Submenu=FileBot
+X-KDE-Submenu=@{application.name}
 
 [Desktop Action Rename]
 Name=Rename
diff --git a/installer/snappy/setup/gui/filebot.desktop b/installer/snappy/setup/gui/filebot.desktop
index e5c7b84f..9de1dc69 100755
--- a/installer/snappy/setup/gui/filebot.desktop
+++ b/installer/snappy/setup/gui/filebot.desktop
@@ -2,13 +2,13 @@
 Type=Application
 Name=@{application.name}
 Comment=@{package.synopsis}
-MimeType=inode/directory;video/*;audio/*;text/*;
+MimeType=@{deb.application.mimetype}
 Exec=filebot %F
 Icon=${SNAP}/meta/gui/icon.svg
-Terminal=false
+Categories=@{deb.application.categories}
+Actions=Rename;Subtitles;Checksum;
 StartupNotify=true
-Categories=@{gnome.application.categories}
-Actions=Rename;Subtitles;SFV;Filter;
+StartupWMClass=@{deb.application.class}
 X-Ubuntu-Gettext-Domain=@{package.name}
 
 [Desktop Action Rename]
@@ -21,12 +21,7 @@ Name=Subtitles
 Exec=filebot --mode Subtitles %F
 OnlyShowIn=Unity;
 
-[Desktop Action SFV]
+[Desktop Action Checksum]
 Name=Checksum
 Exec=filebot --mode SFV %F
 OnlyShowIn=Unity;
-
-[Desktop Action Filter]
-Name=Filter
-Exec=filebot --mode Filter %F
-OnlyShowIn=Unity;