diff --git a/CHANGELOG.md b/CHANGELOG.md
index 316d2b9..6d4950b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -320,8 +320,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - initial public release
 
 [Unreleased]: https://github.com/MightyCreak/diffuse/compare/v0.7.0...HEAD
-[0.7.0]: https://github.com/MightyCreak/diffuse/compare/v0.7.0...v0.6.0
-[0.6.0]: https://github.com/MightyCreak/diffuse/compare/v0.6.0...v0.5.0
+[0.7.0]: https://github.com/MightyCreak/diffuse/compare/v0.6.0...v0.7.0
+[0.6.0]: https://github.com/MightyCreak/diffuse/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/MightyCreak/diffuse/compare/v0.4.8...v0.5.0
 [0.4.8]: https://github.com/MightyCreak/diffuse/compare/v0.4.7...v0.4.8
 [0.4.7]: https://github.com/MightyCreak/diffuse/compare/v0.4.6...v0.4.7
diff --git a/data/io.github.mightycreak.Diffuse.metainfo.xml.in b/data/io.github.mightycreak.Diffuse.metainfo.xml.in
index 00e3ed9..0841d45 100644
--- a/data/io.github.mightycreak.Diffuse.metainfo.xml.in
+++ b/data/io.github.mightycreak.Diffuse.metainfo.xml.in
@@ -21,16 +21,57 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="0.7.0" date="2021-11-16">
+      <description>
+        <p>
+          With this release, the main end-user change is the <strong>new
+          icon</strong>. The rest is mainly maintenance improvements with a
+          much more standard folder structure and starting to modularize the
+          code. This is an ongoing effort as there is still a lot to do, but
+          hopefully this would motivate some to contribute ;)
+        </p>
+        <p>
+          An important note though: the application ID has changed and is now
+          io.github.mightycreak.Diffuse.
+        </p>
+        <p>Added:</p>
+        <ul>
+          <li>New icon and in SVG now</li>
+          <li>Started to modularize the code</li>
+        </ul>
+        <p>Changed:</p>
+        <ul>
+          <li>
+            Changed AppID to io.github.mightycreak.Diffuse (as explained in <a
+            href="https://docs.flatpak.org/en/latest/conventions.html#application-ids">
+            Flatpak documentation</a>)
+          </li>
+          <li>Renamed directory `translations/` to `po/`</li>
+          <li>Now uses POTFILES.in to list the files to translate</li>
+          <li>
+            Translation strings are no longer sorted alphabetically, this will
+            help when there will be several files in POTFILES.in
+          </li>
+          <li>Updated the documentation and script in the `po/` directory</li>
+          <li>Add .desktop translations in .po files</li>
+        </ul>
+        <p>Fixed:</p>
+        <ul>
+          <li>Fixed some GTK deprecation warnings</li>
+        </ul>
+      </description>
+    </release>
     <release version="0.6.0" date="2020-11-29">
       <description>
         <p>
-          Mainly under the hood changes in this release, so nothing really visible to the users in this version. That
-          said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse
-          development to be a bit more active and iterative.
+          Mainly under the hood changes in this release, so nothing really
+          visible to the users in this version. That said, I figured it was a
+          long time since the last release (4 months ago) and, as promised, I
+          want Diffuse development to be a bit more active and iterative.
         </p>
         <p>
-          Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available
-          through Flathub!
+          Apart from the maintenance changes 🧰, I think the main improvement
+          is that Diffuse will soon be available through Flathub!
         </p>
         <p>Added:</p>
         <ul>
@@ -48,16 +89,20 @@
     <release version="0.5.0" date="2020-07-18">
       <description>
         <p>
-          Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!
+          Here is the v0.5.0. Unintentionally, this release happens exactly 6
+          years after the previous v0.4.8 release!
         </p>
         <p>
-          There is a lot to do on this application, and some features didn't make the release. The main one being the
-          Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python
-          scripts should work on Windows, but no executable is produced (yet) with the release.
+          There is a lot to do on this application, and some features didn't
+          make the release. The main one being the Windows installers. I think
+          6 years is too long to continue to wait until this bug is fixed. The
+          Python scripts should work on Windows, but no executable is produced
+          (yet) with the release.
         </p>
         <p>
-          Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the
-          latest commits from upstream (which were never released).
+          Other than that, Diffuse v0.5.0 is now officially compatible with
+          Python 3 and GTK 3! And it is synced to the latest commits from
+          upstream (which were never released).
         </p>
         <p>
           The next version will not take 6 years, I promise you! 😄
diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/data/usr/share/gnome/help/diffuse/C/diffuse.xml
index 6be4657..6b67c8b 100644
--- a/data/usr/share/gnome/help/diffuse/C/diffuse.xml
+++ b/data/usr/share/gnome/help/diffuse/C/diffuse.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.6.0">
-  <!ENTITY app-year "2006-2020">
-  <!ENTITY manual-year "2009-2020">
+  <!ENTITY app-version "0.7.0">
+  <!ENTITY app-year "2006-2021">
+  <!ENTITY manual-year "2009-2021">
 ]>
 <book id="index" lang="en">
   <title><application>&app;</application> User's Manual</title>
@@ -603,7 +603,7 @@
           </listitem>
         </varlistentry>
       </variablelist>
-    </sect1> 
+    </sect1>
 
     <sect1 id="resources-keybindings">
       <title>Key Bindings</title>
@@ -1547,8 +1547,8 @@
             </listitem>
           </varlistentry>
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-colours">
       <title>Colours</title>
@@ -1702,8 +1702,8 @@
           </varlistentry>
 
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-floats">
       <title>Floating Point Values</title>
@@ -1777,8 +1777,8 @@
           </varlistentry>
 
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-syntax-highlighting">
       <title>Syntax Highlighting</title>
@@ -1851,7 +1851,7 @@
         </varlistentry>
 
       </variablelist>
-    </sect1> 
+    </sect1>
   </chapter>
 
   <chapter id="files">
diff --git a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml b/data/usr/share/gnome/help/diffuse/cs/diffuse.xml
index 9696b39..3d5b96c 100644
--- a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml
+++ b/data/usr/share/gnome/help/diffuse/cs/diffuse.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.6.0">
-  <!ENTITY app-year "2006-2020">
-  <!ENTITY manual-year "2009-2020">
+  <!ENTITY app-version "0.7.0">
+  <!ENTITY app-year "2006-2021">
+  <!ENTITY manual-year "2009-2021">
 ]>
 <book id="index" lang="cs">
   <title>Uživatelská příručka programu <application>&app;</application></title>
@@ -373,7 +373,7 @@
           </listitem>
         </varlistentry>
       </variablelist>
-    </sect1> 
+    </sect1>
 
     <sect1 id="resources-keybindings">
       <title>Přiřazení klávesových zkratek</title>
@@ -1278,8 +1278,8 @@
             </listitem>
           </varlistentry>
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-colours">
       <title>Barvy</title>
@@ -1429,8 +1429,8 @@
           </varlistentry>
 
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-floats">
       <title>Hodnoty s plovoucí desetinnou čárkou</title>
@@ -1500,8 +1500,8 @@
           </varlistentry>
 
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-syntax-highlighting">
       <title>Zvýraznění syntaxe</title>
@@ -1537,7 +1537,7 @@
         </varlistentry>
 
       </variablelist>
-    </sect1> 
+    </sect1>
   </chapter>
 
   <chapter id="files">
diff --git a/data/usr/share/gnome/help/diffuse/it/diffuse.xml b/data/usr/share/gnome/help/diffuse/it/diffuse.xml
index f149961..88f73e2 100644
--- a/data/usr/share/gnome/help/diffuse/it/diffuse.xml
+++ b/data/usr/share/gnome/help/diffuse/it/diffuse.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.6.0">
-  <!ENTITY app-year "2006-2020">
-  <!ENTITY manual-year "2009-2020">
+  <!ENTITY app-version "0.7.0">
+  <!ENTITY app-year "2006-2021">
+  <!ENTITY manual-year "2009-2021">
 ]>
 <book id="index" lang="it">
   <title>Manuale utente di <application>&app;</application></title>
@@ -358,7 +358,7 @@
           </listitem>
         </varlistentry>
       </variablelist>
-    </sect1> 
+    </sect1>
 
     <sect1 id="resources-keybindings">
       <title>Keybinding</title>
@@ -1263,8 +1263,8 @@
             </listitem>
           </varlistentry>
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-colours">
       <title>Colori</title>
@@ -1414,8 +1414,8 @@
           </varlistentry>
 
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-floats">
       <title>Valori a virgola mobile</title>
@@ -1485,8 +1485,8 @@
           </varlistentry>
 
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-syntax-highlighting">
       <title>Riconoscimento della sintassi</title>
@@ -1522,7 +1522,7 @@
         </varlistentry>
 
       </variablelist>
-    </sect1> 
+    </sect1>
   </chapter>
 
   <chapter id="files">
diff --git a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml b/data/usr/share/gnome/help/diffuse/ru/diffuse.xml
index 40f6d5f..a507b4a 100644
--- a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml
+++ b/data/usr/share/gnome/help/diffuse/ru/diffuse.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.6.0">
-  <!ENTITY app-year "2006-2020">
-  <!ENTITY manual-year "2009-2020">
+  <!ENTITY app-version "0.7.0">
+  <!ENTITY app-year "2006-2021">
+  <!ENTITY manual-year "2009-2021">
 ]>
 <book id="index" lang="ru">
   <title>Руководство Пользователя <application>&app;</application></title>
@@ -61,7 +61,7 @@
         распространять программу и/или изменять ее в соответствии с
         <citetitle>GNU General Public License</citetitle>, как опубликовано
         Free Software Foundation; либо версия 2 лицензии, либо (по вашему
-        выбору) любая более поздняя версия. 
+        выбору) любая более поздняя версия.
       </para>
       <para>
         Программа <application>&app;</application> распространяется в надежде, что она будет полезна, но
@@ -75,7 +75,7 @@
         копию <citetitle>GNU General Public License</citetitle> от Free
         Software Foundation, посетив
         <ulink type="http" url="http://www.fsf.org/">их web-сайт</ulink> или
-        написав по адресу: 
+        написав по адресу:
         <address>
           Free Software Foundation, Inc.
           <street>51 Franklin St</street>, Fifth Floor,
@@ -110,7 +110,7 @@
         <para>
           Если опция справки определена, только параметр должен быть указан в
           командной строке. Программа <application>&app;</application> немедленно закроется после
-          отображения справочной информации. 
+          отображения справочной информации.
         </para>
 
         <variablelist>
@@ -170,7 +170,7 @@
               <para>
                 Открыть отдельные вкладки сравнения файлов для всех файлов,
                 затрагиваемых фиксацией <replaceable>rev</replaceable> из
-                остающихся путей, определенных в параметрах командной строки. 
+                остающихся путей, определенных в параметрах командной строки.
               </para>
             </listitem>
           </varlistentry>
@@ -208,7 +208,7 @@
               <para>
                 Открыть отдельные вкладки сравнения файлов для всех
                 модифицированных файлов из остающихся путей, определенных в
-                параметрах командной строки. 
+                параметрах командной строки.
               </para>
             </listitem>
           </varlistentry>
@@ -269,7 +269,7 @@
 
         <para>
           Опции отображения, определенные в параметрах командной строки, имеют
-          приоритет над сохраненными значениями предпочтений. 
+          приоритет над сохраненными значениями предпочтений.
         </para>
 
         <variablelist>
@@ -340,7 +340,7 @@
     <para>
       Программа <application>&app;</application> отображает файлы бок о бок, вставляя разрывы для
       выравнивания подобных строк текста. Различия выделяются отличным цветом
-      фона. 
+      фона.
     </para>
 
     <sect1 id="file-comparison-summary">
@@ -502,7 +502,7 @@
         Ревизия по умолчанию файла будет использоваться для сравнения, если
         только один файл будет определен.  Например, чтобы отобразить 2-оконное
         слияние между ревизией по умолчанию <filename>foo.C</filename> и
-        локальным файлом <filename>foo.C</filename>: 
+        локальным файлом <filename>foo.C</filename>:
       </para>
 
       <para>
@@ -520,7 +520,7 @@
         Локальный файл будет использоваться для сравнения, если только одна
         ревизия файла будет определена.Например, чтобы отобразить 2-оконное
         слияние между ревизией 123 <filename>foo.C</filename> и локальным
-        файлом <filename>foo.C</filename>: 
+        файлом <filename>foo.C</filename>:
       </para>
 
       <para>
@@ -615,7 +615,7 @@
           </listitem>
         </varlistentry>
       </variablelist>
-    </sect1> 
+    </sect1>
 
     <sect1 id="resources-keybindings">
       <title>Привязки Клавиш</title>
@@ -1553,8 +1553,8 @@
             </listitem>
           </varlistentry>
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-colours">
       <title>Цвета</title>
@@ -1566,7 +1566,7 @@
             <para>
               Объявить цветовой ресурс, называемый
               <replaceable>name</replaceable>. Отдельные компоненты цвета
-              должны быть выражены как значение между 0 и 1. 
+              должны быть выражены как значение между 0 и 1.
             </para>
           </listitem>
         </varlistentry>
@@ -1708,8 +1708,8 @@
           </varlistentry>
 
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-floats">
       <title>Значения с Плавающей Точкой</title>
@@ -1783,8 +1783,8 @@
           </varlistentry>
 
         </variablelist>
-      </sect2> 
-    </sect1> 
+      </sect2>
+    </sect1>
 
     <sect1 id="resources-syntax-highlighting">
       <title>Подсветка Синтаксиса</title>
@@ -1861,7 +1861,7 @@
         </varlistentry>
 
       </variablelist>
-    </sect1> 
+    </sect1>
   </chapter>
 
   <chapter id="files">
diff --git a/data/usr/share/omf/diffuse/diffuse-C.omf b/data/usr/share/omf/diffuse/diffuse-C.omf
index ef6d24f..5085741 100644
--- a/data/usr/share/omf/diffuse/diffuse-C.omf
+++ b/data/usr/share/omf/diffuse/diffuse-C.omf
@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Diffuse User's Manual</title>
-    <date>2020-11-29</date>
-    <version identifier="0.6.0" date="2020-11-29"/>
+    <date>2021-11-16</date>
+    <version identifier="0.7.0" date="2021-11-16"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse is a graphical tool for merging and comparing text files.</description>
     <type>manual</type>
diff --git a/data/usr/share/omf/diffuse/diffuse-cs.omf b/data/usr/share/omf/diffuse/diffuse-cs.omf
index a5de87d..13cd13e 100644
--- a/data/usr/share/omf/diffuse/diffuse-cs.omf
+++ b/data/usr/share/omf/diffuse/diffuse-cs.omf
@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Uživatelská příručka programu Diffuse</title>
-    <date>2020-11-29</date>
-    <version identifier="0.6.0" date="2020-11-29"/>
+    <date>2021-11-16</date>
+    <version identifier="0.7.0" date="2021-11-16"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse je grafický nástroj pro slučování a porovnávání textových souborů.</description>
     <type>manual</type>
diff --git a/data/usr/share/omf/diffuse/diffuse-it.omf b/data/usr/share/omf/diffuse/diffuse-it.omf
index 8bb55bc..26cf3fa 100644
--- a/data/usr/share/omf/diffuse/diffuse-it.omf
+++ b/data/usr/share/omf/diffuse/diffuse-it.omf
@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Manuale utente di Diffuse</title>
-    <date>2020-11-29</date>
-    <version identifier="0.6.0" date="2020-11-29"/>
+    <date>2021-11-16</date>
+    <version identifier="0.7.0" date="2021-11-16"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.</description>
     <type>manual</type>
diff --git a/data/usr/share/omf/diffuse/diffuse-ru.omf b/data/usr/share/omf/diffuse/diffuse-ru.omf
index 68e1236..d032b71 100644
--- a/data/usr/share/omf/diffuse/diffuse-ru.omf
+++ b/data/usr/share/omf/diffuse/diffuse-ru.omf
@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Руководство Пользователя Diffuse</title>
-    <date>2020-11-29</date>
-    <version identifier="0.6.0" date="2020-11-29"/>
+    <date>2021-11-16</date>
+    <version identifier="0.7.0" date="2021-11-16"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
     <type>manual</type>
diff --git a/io.github.mightycreak.Diffuse.yml b/io.github.mightycreak.Diffuse.yml
index 8bc70ba..0fdea81 100644
--- a/io.github.mightycreak.Diffuse.yml
+++ b/io.github.mightycreak.Diffuse.yml
@@ -18,9 +18,3 @@ modules:
     sources:
       - type: dir
         path: .
-    #   - type: git
-    #     url: file:///home/creak/dev/diffuse
-    #     branch: split-code-into-modules
-    #   - type: git
-    #     url: https://github.com/MightyCreak/diffuse
-    #     branch: v0.6.0
diff --git a/utils/book2manual.xsl b/utils/book2manual.xsl
index 2aba708..4e2459d 100644
--- a/utils/book2manual.xsl
+++ b/utils/book2manual.xsl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE xsl:stylesheet [
  <!ENTITY app "Diffuse">
- <!ENTITY app-version "0.6.0">
+ <!ENTITY app-version "0.7.0">
  <!ENTITY app-cmd "diffuse">
- <!ENTITY date "2020-11-29">
+ <!ENTITY date "2021-11-16">
 ]>
 <!--
   template for translating Diffuse's help documentation to a manual page
@@ -94,7 +94,7 @@
               </refsect2>
             </xsl:for-each>
           </refsect1>
-        </xsl:if> 
+        </xsl:if>
       </xsl:for-each>
 
       <refsect1>
diff --git a/windows-installer/build.py b/windows-installer/build.py
index 9feece3..b450949 100755
--- a/windows-installer/build.py
+++ b/windows-installer/build.py
@@ -25,7 +25,7 @@ import platform
 import subprocess
 import sys
 
-VERSION='0.6.0'
+VERSION='0.7.0'
 PACKAGE='1'
 PLATFORM='win' + ''.join([ c for c in platform.architecture()[0] if c.isdigit() ])
 INSTALLER='diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM)
diff --git a/windows-installer/diffuse.iss b/windows-installer/diffuse.iss
index 4aece97..41b268e 100644
--- a/windows-installer/diffuse.iss
+++ b/windows-installer/diffuse.iss
@@ -1,60 +1,60 @@
-; Inno Setup file for Diffuse
-;
-; Copyright (C) 2009-2014 Derrick Moser <derrick_moser@yahoo.com>
-
-[Setup]
-AppId=Diffuse
-AppName={cm:ToolName}
-AppVerName=Diffuse 0.6.0
-DefaultDirName={pf}\Diffuse
-DefaultGroupName=Diffuse
-UninstallDisplayIcon={app}\diffusew.exe
-Compression=lzma
-SolidCompression=yes
-OutputDir=.
-ShowLanguageDialog=auto
-
-[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl,.\en.isl"
-Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl,.\cs.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl,.\de.isl"
-Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,.\es.isl"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,.\it.isl"
-Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl,.\ja.isl"
-Name: "ko"; MessagesFile: "compiler:Languages\Korean.isl,.\ko.isl"
-Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl,.\pl.isl"
-Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,.\ru.isl"
-Name: "zh_CN"; MessagesFile: "compiler:Languages\ChineseSimplified.isl,.\zh_CN.isl"
-Name: "zh_TW"; MessagesFile: "compiler:Languages\ChineseTraditional.isl,.\zh_TW.isl"
-
-[Files]
-Source: "dist\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-
-[Components]
-Name: main; Description: "{cm:MainFiles}"; Types: full compact custom; Flags: fixed
-Name: shellintegration; Description: "{cm:ShellIntegration}"; Types: full
-
-[Registry]
-Root: HKCR; Subkey: "*\shell"; Flags: uninsdeletekeyifempty; Components: shellintegration
-Root: HKCR; Subkey: "*\shell\{cm:OpenWithTool}"; Flags: uninsdeletekey; Components: shellintegration
-Root: HKCR; Subkey: "*\shell\{cm:OpenWithTool}\command"; ValueType: string; ValueData: "{code:GetOpenWithCommand|dummy}"; Flags: uninsdeletekey; Components: shellintegration
-
-[Icons]
-Name: "{group}\{cm:ToolName}"; Filename: "{app}\diffusew.exe"
-Name: "{group}\{cm:UninstallTool}"; Filename: "{app}\unins000.exe"
-
-[Run]
-Filename: "{app}\add_path.exe"; Parameters: "{app}"; Flags: postinstall; Description: "{cm:AddToPath}"
-
-[UninstallRun]
-Filename: "{app}\add_path.exe"; Parameters: "/del {app}"
-
-[Code]
-function GetOpenWithCommand(dummy : String): String;
-var
-    S: String;
-begin
-    S := ExpandConstant('{app}\diffusew.exe');
-    StringChangeEx(S, '\', '\\', True);
-    Result := '"' + S + '" "%1"';
-end;
+; Inno Setup file for Diffuse
+;
+; Copyright (C) 2009-2014 Derrick Moser <derrick_moser@yahoo.com>
+
+[Setup]
+AppId=Diffuse
+AppName={cm:ToolName}
+AppVerName=Diffuse 0.7.0
+DefaultDirName={pf}\Diffuse
+DefaultGroupName=Diffuse
+UninstallDisplayIcon={app}\diffusew.exe
+Compression=lzma
+SolidCompression=yes
+OutputDir=.
+ShowLanguageDialog=auto
+
+[Languages]
+Name: "en"; MessagesFile: "compiler:Default.isl,.\en.isl"
+Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl,.\cs.isl"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl,.\de.isl"
+Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,.\es.isl"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,.\it.isl"
+Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl,.\ja.isl"
+Name: "ko"; MessagesFile: "compiler:Languages\Korean.isl,.\ko.isl"
+Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl,.\pl.isl"
+Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,.\ru.isl"
+Name: "zh_CN"; MessagesFile: "compiler:Languages\ChineseSimplified.isl,.\zh_CN.isl"
+Name: "zh_TW"; MessagesFile: "compiler:Languages\ChineseTraditional.isl,.\zh_TW.isl"
+
+[Files]
+Source: "dist\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+[Components]
+Name: main; Description: "{cm:MainFiles}"; Types: full compact custom; Flags: fixed
+Name: shellintegration; Description: "{cm:ShellIntegration}"; Types: full
+
+[Registry]
+Root: HKCR; Subkey: "*\shell"; Flags: uninsdeletekeyifempty; Components: shellintegration
+Root: HKCR; Subkey: "*\shell\{cm:OpenWithTool}"; Flags: uninsdeletekey; Components: shellintegration
+Root: HKCR; Subkey: "*\shell\{cm:OpenWithTool}\command"; ValueType: string; ValueData: "{code:GetOpenWithCommand|dummy}"; Flags: uninsdeletekey; Components: shellintegration
+
+[Icons]
+Name: "{group}\{cm:ToolName}"; Filename: "{app}\diffusew.exe"
+Name: "{group}\{cm:UninstallTool}"; Filename: "{app}\unins000.exe"
+
+[Run]
+Filename: "{app}\add_path.exe"; Parameters: "{app}"; Flags: postinstall; Description: "{cm:AddToPath}"
+
+[UninstallRun]
+Filename: "{app}\add_path.exe"; Parameters: "/del {app}"
+
+[Code]
+function GetOpenWithCommand(dummy : String): String;
+var
+    S: String;
+begin
+    S := ExpandConstant('{app}\diffusew.exe');
+    StringChangeEx(S, '\', '\\', True);
+    Result := '"' + S + '" "%1"';
+end;
diff --git a/windows-installer/diffuse.new.iss b/windows-installer/diffuse.new.iss
index 15d630b..258a9bd 100644
--- a/windows-installer/diffuse.new.iss
+++ b/windows-installer/diffuse.new.iss
@@ -4,7 +4,7 @@
 
 #define MyAppName "Diffuse Merge Tool"
 #define MyAppGroupName "Diffuse"
-#define MyAppVersion "0.6.0"
+#define MyAppVersion "0.7.0"
 #define MyAppPublisher "Diffuse Team"
 #define MyAppURL "https://github.com/MightyCreak/diffuse/"
 #define MyAppExeName "diffuse.exe"