diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1b81689..eb8e3647 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/)
 	install(FILES ui/pixmaps/application-x-xopt.svg
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/)
-	install(FILES ui/pixmaps/application-x-xoj.svg
+	install(FILES ui/pixmaps/application-x-xojpp.svg
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/)
 
 	install(FILES ui/pixmaps/gnome-mime-application-x-xopp.svg
@@ -213,11 +213,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	install(FILES ui/pixmaps/gnome-mime-application-x-xopt.svg
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/)
 
-	install(FILES desktop/xournal.xml
+	install(FILES desktop/xournalpp.xml
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mime/packages)
 	install(FILES desktop/xournalpp.desktop
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-	install(FILES desktop/x-xoj.desktop
+	install(FILES desktop/x-xojpp.desktop
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mimelnk/application)
 	install(FILES desktop/x-xopp.desktop
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mimelnk/application)
diff --git a/desktop/x-xoj.desktop b/desktop/x-xoj.desktop
deleted file mode 100644
index 2b8f3586..00000000
--- a/desktop/x-xoj.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=MimeType
-MimeType=application/x-xoj
-Icon=xopp
-Patterns=*.xoj;*.XOJ;*.Xoj;
-
-Comment=Xournal note file
-Comment[ca]=Fitxers de nota del Xournal
-Comment[cs]=Poznámky Xournalu
-Comment[de]=Xournal Dokument
-Comment[fr]=Fichier Xournal
-Comment[pl]=Notatnik Xournala
diff --git a/desktop/x-xojpp.desktop b/desktop/x-xojpp.desktop
new file mode 100644
index 00000000..df51ea54
--- /dev/null
+++ b/desktop/x-xojpp.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=MimeType
+MimeType=application/x-xojpp
+Icon=xopp
+Patterns=*.xoj;*.XOJ;*.Xoj;
+
+Comment=Xournal note file
+Comment[de]=Xournal Dokument
+Name[de_DE]=x-xojpp.desktop
diff --git a/desktop/xournalpp.desktop b/desktop/xournalpp.desktop
index 0ffaa5ed..45b8d287 100644
--- a/desktop/xournalpp.desktop
+++ b/desktop/xournalpp.desktop
@@ -18,6 +18,6 @@ Comment[pl]=Notatki odręczne
 Exec=xournalpp %f
 Terminal=false
 StartupNotify=true
-MimeType=application/x-xoj;application/x-xopp;application/x-xopt;application/pdf;
+MimeType=application/x-xoj;application/x-xojpp;application/x-xopp;application/x-xopt;application/pdf;
 Icon=xournalpp
 Categories=GNOME;GTK;Utility;TextEditor;
diff --git a/desktop/xournalpp.thumbnailer b/desktop/xournalpp.thumbnailer
index 168c4830..598b8806 100644
--- a/desktop/xournalpp.thumbnailer
+++ b/desktop/xournalpp.thumbnailer
@@ -1,4 +1,4 @@
 [Thumbnailer Entry]
 Exec=/usr/local/bin/xournal-thumbnailer %i %o
-MimeType=application/x-xoj;application/x-xopp;
+MimeType=application/x-xoj;application/x-xojpp;application/x-xopp;
 
diff --git a/desktop/xournal.xml b/desktop/xournalpp.xml
similarity index 91%
rename from desktop/xournal.xml
rename to desktop/xournalpp.xml
index 055ffc86..adfd49c4 100644
--- a/desktop/xournal.xml
+++ b/desktop/xournalpp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-	<mime-type type="application/x-xoj">
+	<mime-type type="application/x-xojpp">
 		<comment>Xournal note file</comment>
 		<glob pattern="*.xoj"/>
 	</mime-type>
diff --git a/ui/pixmaps/application-x-xoj.svg b/ui/pixmaps/application-x-xojpp.svg
similarity index 100%
rename from ui/pixmaps/application-x-xoj.svg
rename to ui/pixmaps/application-x-xojpp.svg
diff --git a/windows-setup/xournalpp.nsi b/windows-setup/xournalpp.nsi
index 750436c2..6a881313 100644
--- a/windows-setup/xournalpp.nsi
+++ b/windows-setup/xournalpp.nsi
@@ -102,23 +102,28 @@ Section "Assign .xopp files" SecFileXopp
 	${registerExtension} "$INSTDIR\bin\xournalpp.exe" ".xopp" "Xournal++ file"
 SectionEnd
 
+Section "Assign .xoj files" SecFileXopt
+	${registerExtension} "$INSTDIR\bin\xournalpp.exe" ".xopt" "Xournal++ Template Files"
+SectionEnd
+
 Section "Assign .xoj files" SecFileXoj
 	${registerExtension} "$INSTDIR\bin\xournalpp.exe" ".xoj" "Xournal file"
 SectionEnd
 
-
 ;--------------------------------
 ;Descriptions
 
 	;Language strings
 	LangString DESC_SecXournalpp ${LANG_ENGLISH} "Xournal++ executable"
 	LangString DESC_SecFileXopp ${LANG_ENGLISH} "Open .xopp files with Xournal++"
+	LangString DESC_SecFileXopt ${LANG_ENGLISH} "Open .xopt files with Xournal++"
 	LangString DESC_SecFileXoj ${LANG_ENGLISH} "Open .xoj files with Xournal++"
 
 	;Assign language strings to sections
 	!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 		!insertmacro MUI_DESCRIPTION_TEXT ${SecXournalpp} $(DESC_SecXournalpp)
 		!insertmacro MUI_DESCRIPTION_TEXT ${SecFileXopp} $(DESC_SecFileXopp)
+		!insertmacro MUI_DESCRIPTION_TEXT ${SecFileXopt} $(DESC_SecFileXopt)
 		!insertmacro MUI_DESCRIPTION_TEXT ${SecFileXoj} $(DESC_SecFileXoj)
 	!insertmacro MUI_FUNCTION_DESCRIPTION_END