Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/assets/cursors/bucket.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/assets/cursors/bucket.png differ
diff -Nru photoflare-1.5.7/build.sh photoflare-1.6.0/build.sh
--- photoflare-1.5.7/build.sh	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/build.sh	2019-09-17 21:28:37.000000000 +0000
@@ -5,7 +5,7 @@
 export QT_SELECT=qt5
 
 apt-get update -q
-apt-get install -y qtbase5-dev qttools5-dev-tools libgraphicsmagick++-dev
+apt-get install -y qtbase5-dev qttools5-dev-tools libgraphicsmagick++-dev libomp-dev
 
 qmake PhotoFlare.pro
 make
diff -Nru photoflare-1.5.7/debian/changelog photoflare-1.6.0/debian/changelog
--- photoflare-1.5.7/debian/changelog	2019-02-19 06:54:57.000000000 +0000
+++ photoflare-1.6.0/debian/changelog	2018-11-24 05:58:00.000000000 +0000
@@ -1,37 +1,21 @@
-photoflare (1.5.7-1) unstable; urgency=medium
+photoflare (1.6.0-1dhor~disco) disco; urgency=medium
 
-  * New upstream release.
-  * Remove ftbfs_hurd.patch: upstream applied.
-  * Bump Standards-Version: 4.3.0 (no changes needed).
+  * Added new User documentation as Github pages.
+  * Added custom cursor for Paint Bucket tool.
+  * Fixed incorrect tool being selected when you change tab.
+  * Improved aboutDialog credits layout so titles can be translated.
+  * Added Flatpak packaging manifest.
+  * Added keyboard shortcut for Select All.
+  * Improved Dock layout and Zoom settings to be translatable.
+  * Added zoom direction feature to Preferences.
+  * Added buttons to add/remove filters on batch/automate dialog.
+  * Added keyboard shortcut for original zoom. (Ctrl+0)
+  * Added OpenMP to use multiple threads for graphicsmagick filters.
 
- -- Dylan Aïssi <daissi@debian.org>  Tue, 19 Feb 2019 07:54:57 +0100
+ -- Dariusz Duma <dhor@toxic.net.pl>  Sat, 24 Nov 2018 06:58:00 +0100
 
-photoflare (1.5.6.1-1) unstable; urgency=medium
+photoflare (1.5-1dhor~xenial) xenial; urgency=medium
 
-  * New upstream release.
-  * Add patch to fix FTBFS on Hurd.
+  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 
- -- Dylan Aïssi <daissi@debian.org>  Thu, 06 Dec 2018 19:39:11 +0100
-
-photoflare (1.5.6-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Dylan Aïssi <daissi@debian.org>  Sat, 24 Nov 2018 15:25:16 +0100
-
-photoflare (1.5.5.1-1) unstable; urgency=medium
-
-  * New upstream release.
-  * Update my email address.
-  * Remove all patches: upstream applied.
-  * AppStream file and pixmaps icon are now installed by upstream.
-  * Add qt5-image-formats-plugins to Depends.
-  * Bump Standards-Version: 4.2.1 (no changes needed).
-
- -- Dylan Aïssi <daissi@debian.org>  Wed, 07 Nov 2018 07:21:33 +0100
-
-photoflare (1.5.4-1) unstable; urgency=medium
-
-  * Initial release. (Closes: #901871, LP: #1711644)
-
- -- Dylan Aïssi <bob.dybian@gmail.com>  Mon, 25 Jun 2018 18:28:05 +0200
+ -- Dariusz Duma <dhor@toxic.net.pl>  Wed, 27 Dec 2017 20:31:42 +0100
diff -Nru photoflare-1.5.7/debian/compat photoflare-1.6.0/debian/compat
--- photoflare-1.5.7/debian/compat	2019-02-19 06:54:57.000000000 +0000
+++ photoflare-1.6.0/debian/compat	2017-12-27 19:31:45.000000000 +0000
@@ -1 +1 @@
-11
+9
diff -Nru photoflare-1.5.7/debian/control photoflare-1.6.0/debian/control
--- photoflare-1.5.7/debian/control	2019-02-19 06:54:57.000000000 +0000
+++ photoflare-1.6.0/debian/control	2018-11-24 05:58:00.000000000 +0000
@@ -1,24 +1,25 @@
 Source: photoflare
-Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
-Uploaders: Dylan Aïssi <daissi@debian.org>
 Section: graphics
 Priority: optional
-Build-Depends: debhelper (>= 11),
-               libgraphicsmagick++-dev,
-               qtbase5-dev (>= 5.6),
-               qttools5-dev-tools
-Standards-Version: 4.3.0
-Vcs-Browser: https://salsa.debian.org/debian-phototools-team/photoflare
-Vcs-Git: https://salsa.debian.org/debian-phototools-team/photoflare.git
+Maintainer: Dariusz Duma <dhor@toxic.net.pl>
+Build-Depends: debhelper (>=9), 
+	qt5-default,
+	libomp-dev, 
+	libgraphicsmagick++1-dev, 
+	qt5-qmake, 
+	qt5-image-formats-plugins,
+	qttools5-dev-tools 
+Standards-Version: 4.1.4
 Homepage: http://photoflare.io/
+#Vcs-Git: git://anonscm.debian.org/collab-maint/photofiltrelx.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/photofiltrelx.git
 
 Package: photoflare
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         qt5-image-formats-plugins
-Description: Simple but powerful Image Editor
- PhotoFlare is an effort to bring quick, simple but powerful image editing to
- the masses. PhotoFlare is inspired by the image editor PhotoFiltre which is
- available only on another OS. PhotoFlare is designed for beginner users with
- the aim to give them a tool easy to learn and use.
+Conflicts: photofiltre-lx-studio
+Replaces: photofiltre-lx-studio
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Simple but powerful Cross Platform image editor
+ Simple but powerful Cross Platform image editor originally inspired by the
+ PhotoFiltre image editor on Windows.  Created with C++ 11, Qt Framework and
+ the Graphicsmagick library.
diff -Nru photoflare-1.5.7/debian/copyright photoflare-1.6.0/debian/copyright
--- photoflare-1.5.7/debian/copyright	2019-02-19 06:54:57.000000000 +0000
+++ photoflare-1.6.0/debian/copyright	2017-12-27 19:31:45.000000000 +0000
@@ -1,66 +1,38 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: PhotoFlare
-Upstream-Contact: Dylan Coakley <info at photoflare.io>
-Source: https://github.com/PhotoFlare/photoflare/
+Upstream-Name: photoflare
+Source: <url://example.com>
 
 Files: *
-Copyright: 2015-2018 Dylan Coakley
-License: GPL-3+
-
-Files: external/qt-solutions/common.pri
-       external/qt-solutions/qtsingleapplication/*
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies). Part of the Qt Solutions component.
-License: BSD-3-clause
-Comment: QtSingleApplication cannot be individually packaged. See
- https://alioth-lists.debian.net/pipermail/pkg-kde-talk/2013-June/001813.html
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: <special license>
+ <Put the license of the package here indented by 1 space>
+ <This follows the format of Description: lines in control file>
+ .
+ <Including paragraphs>
 
+# If you want to use GPL v2 or later for the /debian/* files use 
+# the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
-Copyright: 2018 Dylan Aïssi <bob.dybian@gmail.com>
-License: GPL-3+
-
-License: GPL-3+
+Copyright: 2017 dhor <dhor@toxic.net.pl>
+License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with this program. If not, see <https://www.gnu.org/licenses/>
  .
  On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-3'.
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- .
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
- .
-    Neither the name of the <ORGANIZATION> nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid picking licenses with terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
diff -Nru photoflare-1.5.7/debian/README.Debian photoflare-1.6.0/debian/README.Debian
--- photoflare-1.5.7/debian/README.Debian	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/debian/README.Debian	2017-12-27 19:31:45.000000000 +0000
@@ -0,0 +1,6 @@
+photoflare for Debian
+--------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- dhor <dhor@toxic.net.pl>  Wed, 27 Dec 2017 20:31:42 +0100
diff -Nru photoflare-1.5.7/debian/README.source photoflare-1.6.0/debian/README.source
--- photoflare-1.5.7/debian/README.source	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/debian/README.source	2017-12-27 19:31:45.000000000 +0000
@@ -0,0 +1,10 @@
+photoflare for Debian
+--------------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+ -- dhor <dhor@toxic.net.pl>  Wed, 27 Dec 2017 20:31:42 +0100
+
diff -Nru photoflare-1.5.7/debian/rules photoflare-1.6.0/debian/rules
--- photoflare-1.5.7/debian/rules	2019-02-19 06:54:57.000000000 +0000
+++ photoflare-1.6.0/debian/rules	2018-11-24 05:58:00.000000000 +0000
@@ -1,8 +1,18 @@
 #!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 export QT_SELECT=qt5
 
 %:
-	dh $@
+	dh $@ 
+
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
diff -Nru photoflare-1.5.7/debian/watch photoflare-1.6.0/debian/watch
--- photoflare-1.5.7/debian/watch	2019-02-19 06:54:57.000000000 +0000
+++ photoflare-1.6.0/debian/watch	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-version=4
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/photoflare-$1\.tar\.gz/ \
-  https://github.com/PhotoFlare/photoflare/tags .*/v?(\d\S+)\.tar\.gz
diff -Nru photoflare-1.5.7/docs/allshortcuts.html photoflare-1.6.0/docs/allshortcuts.html
--- photoflare-1.5.7/docs/allshortcuts.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/allshortcuts.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,122 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="allshortcuts">Keyboard shortcuts</a></h2>
+<table>
+	<th>
+		Menu
+	</th>
+	<th>
+		Shortcut
+	</th>
+	<th>
+		Action
+	</th>
+	<tr>
+		<td>File</td>
+		<td>Ctrl+N</td>
+		<td>Launch the New file dialog.</td>
+	</tr>
+	<tr>
+		<td>File</td>
+		<td>Ctrl+O</td>
+		<td>Launch the Open file dialog.</td>
+	</tr>
+	<tr>
+		<td>File</td>
+		<td>Ctrl+S</td>
+		<td>Save the current file.</td>
+	</tr>
+	<tr>
+		<td>File</td>
+		<td>Ctrl+Shift+S</td>
+		<td>Save the current file with a new file name.</td>
+	</tr>
+	<tr>
+		<td>File</td>
+		<td>Ctrl+Shift+W</td>
+		<td>Closes the current file.</td>
+	</tr>
+	<tr>
+		<td>File</td>
+		<td>Ctrl+P</td>
+		<td>Print the current file.</td>
+	</tr>
+	<tr>
+		<td>File</td>
+		<td>Ctrl+J</td>
+		<td>Launch the Image properties dialog.</td>
+	</tr>
+	<tr>
+		<td>File</td>
+		<td>Ctrl+Q</td>
+		<td>Quit the application.</td>
+	</tr>
+	<tr>
+		<td>Edit</td>
+		<td>Ctrl+C</td>
+		<td>Copy current image.</td>
+	</tr>
+	<tr>
+		<td>Edit</td>
+		<td>Ctrl+V</td>
+		<td>Paste current image.</td>
+	</tr>
+	<tr>
+		<td>Edit</td>
+		<td>Ctrl+Shift+V</td>
+		<td>Paste current image as new image.</td>
+	</tr>
+	<tr>
+		<td>Image</td>
+		<td>Ctrl+H</td>
+		<td>Launch the Resize image dialog.</td>
+	</tr>
+	<tr>
+		<td>Image</td>
+		<td>Ctrl+U</td>
+		<td>Duplicate the current image into a new tab.</td>
+	</tr>
+	<tr>
+		<td>Image</td>
+		<td>Ctrl+Shift+H</td>
+		<td>Crop the current image based on your selected area.</td>
+	</tr>
+	<tr>
+		<td>Selection</td>
+		<td>Ctrl+A</td>
+		<td>Select the whole current image as your selected area.</td>
+	</tr>
+	<tr>
+		<td>View</td>
+		<td>Ctrl+L</td>
+		<td>Show/hide the toolpalette.</td>
+	</tr>
+	<tr>
+		<td>View</td>
+		<td>Ctrl+Shift(+)+</td>
+		<td>Increase zoom level.</td>
+	</tr>
+	<tr>
+		<td>View</td>
+		<td>Ctrl(+)-</td>
+		<td>Decrease zoom level.</td>
+	</tr>
+	<tr>
+		<td>View</td>
+		<td>Ctrl+0</td>
+		<td>Original zoom level. (100%)</td>
+	</tr>
+	<tr>
+		<td>View</td>
+		<td>Ctrl+F</td>
+		<td>Set application to full screen.</td>
+	</tr>
+</table>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/batch.html photoflare-1.6.0/docs/batch.html
--- photoflare-1.5.7/docs/batch.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/batch.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,26 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="batch">Batch processing/Automation</a></h2>
+<p>
+	Launch via "Tools >> Automate/Batch..." or via the toolbar button.
+</p>
+<h3>Add your source files and set the output folder</h3>
+<img src="images/batch1.png"/>
+<h3>Adjust image size or canvas size</h3>
+<img src="images/batch2.png"/>
+<h3>Adjust brightness, contrast, saturation or gamma correction</h3>
+<img src="images/batch3.png"/>
+<h3>Apply any of the available filters</h3>
+<img src="images/batch4.png"/>
+<h3>Rotate or flip</h3>
+<img src="images/batch5.png"/>
+<h3>Final summary screen - Click Ok to confirm</h3>
+<img src="images/batch6.png"/>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/_config.yml photoflare-1.6.0/docs/_config.yml
--- photoflare-1.5.7/docs/_config.yml	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/_config.yml	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1 @@
+theme: jekyll-theme-slate
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/creating.html photoflare-1.6.0/docs/creating.html
--- photoflare-1.5.7/docs/creating.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/creating.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,22 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="creating">Creating a new image</a></h2>
+<p>
+	Images are created by using the New file dialog.
+</p>
+<p>Menu:<br>"File >> New..."</p>
+<p>keyboard shortcut:<br>"Ctrl+N" <a href="allshortcuts.html">(View all shortcuts)</a></p>
+<p>Button:<br><img src="images/toolbar1/new.png" width="32"/></p>
+<ul>
+	<li>The top area shows the preview of dimensions in pixels. (Important if you are using Cm/Inches below)</li>
+	<li>The bottom area allows you to select the width, height, unit to use (Pixels,Cm,Inches), Background colour and Preset size.</li>
+</ul>
+<img src="images/newDialog.png"/>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/crop.html photoflare-1.6.0/docs/crop.html
--- photoflare-1.5.7/docs/crop.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/crop.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,17 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="crop">Cropping images</a></h2>
+<p>
+	To crop an image use the PointerTool (first tool in the palette). Left click and drag to select an area to crop. Right click to bring up the context menu. Select the "Crop" option.
+</p>
+<p>Menu:<br>"Image >> Crop"</p>
+<p>keyboard shortcut:<br>"Ctrl+Shift+H" <a href="allshortcuts.html">(View all shortcuts)</a></p>
+<img src="images/cropping.png"/>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/gradients.html photoflare-1.6.0/docs/gradients.html
--- photoflare-1.5.7/docs/gradients.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/gradients.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,17 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="gradients">Gradients</a></h2>
+<p>
+	Launch via the toolbar button. Easily create gradients via the Gradient dialog. You can select the gradient colours, direction and what type of gradient you would like. Gradients can be created on new images or applied to existing images.
+</p>
+<p>Button:<br><img src="images/toolbar2/gradient.png" width="32"/></p>
+<img src="images/grad1.png"/>
+<img src="images/grad2.png"/>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/hue.html photoflare-1.6.0/docs/hue.html
--- photoflare-1.5.7/docs/hue.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/hue.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,19 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="hue">Adjusting hue</a></h2>
+<p>
+	Launch the Hue Variation dialog. You can adjust either the hue via "Colorize" or "Hue" option.
+</p>
+<p>Menu:<br>"Adjust >> Hue Variation..."</p>
+<p>keyboard shortcut:<br>"Ctrl+H" <a href="allshortcuts.html">(View all shortcuts)</a></p>
+<p>Button:<br><img src="images/toolbar2/hue.png" width="32"/></p>
+<img src="images/hue1.png"/>
+<img src="images/hue2.png"/>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/batch1.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/batch1.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/batch2.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/batch2.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/batch3.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/batch3.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/batch4.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/batch4.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/batch5.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/batch5.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/batch6.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/batch6.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/cropping.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/cropping.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/grad1.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/grad1.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/grad2.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/grad2.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/hue1.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/hue1.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/hue2.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/hue2.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/mode_1.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/mode_1.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/mode_2.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/mode_2.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/mode_toggle.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/mode_toggle.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/newDialog.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/newDialog.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/openDialog.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/openDialog.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/pref1.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/pref1.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/pref2.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/pref2.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/pref3.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/pref3.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/pref4.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/pref4.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/pref5.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/pref5.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/pref6.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/pref6.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/pref7.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/pref7.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/pref_comp.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/pref_comp.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/resizeDialog.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/resizeDialog.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/text1.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/text1.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/toolbar1/imgsize.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/toolbar1/imgsize.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/toolbar1/new.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/toolbar1/new.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/toolbar1/open.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/toolbar1/open.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/toolbar1/pref.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/toolbar1/pref.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/toolbar1/text.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/toolbar1/text.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/toolbar2/gradient.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/toolbar2/gradient.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/toolbar2/hue.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/toolbar2/hue.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/Blur.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/Blur.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/Bucket.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/Bucket.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/ColourPicker.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/ColourPicker.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/Eraser.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/Eraser.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/Line.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/Line.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/PaintBrush-Plus.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/PaintBrush-Plus.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/PaintBrush.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/PaintBrush.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/Pointer.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/Pointer.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/Smudge.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/Smudge.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/Spraycan.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/Spraycan.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/Stamp.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/Stamp.png differ
Binary files /tmp/tmpVjft09/7E7QsijAUQ/photoflare-1.5.7/docs/images/tools/Wand.png and /tmp/tmpVjft09/b6ZGDYSqsm/photoflare-1.6.0/docs/images/tools/Wand.png differ
diff -Nru photoflare-1.5.7/docs/index.html photoflare-1.6.0/docs/index.html
--- photoflare-1.5.7/docs/index.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/index.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,32 @@
+---
+layout: default
+---
+<body>
+
+<p>
+	Photoflare is a cross-platform image editor with an aim to balance between powerful features and a very friendly graphical user interface. It suits a wide variety of different tasks and users who value a more nimble workflow. Features include basic image editing capabilities, paint brushes, image filters, colour adjustments and more advanced features such as Batch image processing.
+</p>
+
+<h1>User manual</h1>
+<p>
+	Welcome to the Photoflare user manual. This is information aimed at end users to help understand how to use the current features in the application.
+</p>
+
+<a name="contents"></a>
+<h2>Table of contents</h2>
+<ul>
+	<li><a href="creating.html">Creating a new image</a></li>
+	<li><a href="opening.html">Opening files</a></li>
+	<li><a href="resize.html">Resizing images</a></li>
+	<li><a href="crop.html">Cropping images</a></li>
+	<li><a href="tools.html">Tools</a></li>
+	<li><a href="hue.html">Adjusting hue</a></li>
+	<li><a href="gradients.html">Gradients</a></li>
+	<li><a href="text.html">Add/Edit text</a></li>
+	<li><a href="batch.html">Batch processing/Automation</a></li>
+	<li><a href="prefs.html">Preferences</a></li>
+	<li><a href="modes.html">Window modes</a></li>
+	<li><a href="allshortcuts.html">Keyboard shortcuts</a></li>
+</ul>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/modes.html photoflare-1.6.0/docs/modes.html
--- photoflare-1.5.7/docs/modes.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/modes.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,26 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="modes">Window modes</a></h2>
+<p>
+	Using the Window modes will give you options on how you work with your images. To switch window mode use the Layout tab inside Preferences and select "Multi-Window mode".
+</p>
+<img src="images/mode_toggle.png"/>
+<h3>Tab mode</h3>
+<p>
+	The default mode will be tabs. This should be familiar to most users.
+</p>
+<img src="images/mode_1.png" width="800" />
+
+<h3>MDI mode</h3>
+<p>
+	The MDI option will use child windows inside the main (parent) window. This is a little less modern but some users prefer this option.
+</p>
+<img src="images/mode_2.png" width="800" />
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/opening.html photoflare-1.6.0/docs/opening.html
--- photoflare-1.5.7/docs/opening.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/opening.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,27 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="opening">Opening files</a></h2>
+<p>
+	Open files with the Open file dialog.
+</p>
+<p>Menu:<br>"File >> Open..."</p>
+<p>keyboard shortcut:<br>"Ctrl+O" <a href="allshortcuts.html">(View all shortcuts)</a></p>
+<p>Button:<br><img src="images/toolbar1/open.png" width="32"/></p>
+<h3>Supported formats</h3>
+<ul>
+	<li>png</li>
+	<li>jpeg</li>
+	<li>gif</li>
+	<li>tiff</li>
+	<li>bmp</li>
+	<li>ico</li>
+</ul>
+<img src="images/openDialog.png" width="600"/>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/prefs.html photoflare-1.6.0/docs/prefs.html
--- photoflare-1.5.7/docs/prefs.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/prefs.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,71 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="prefs">Preferences</a></h2>
+<p>
+	The Preferences dialog contains all of the settings for Photoflare's features. They are separated into sections to make them easy to understand.
+</p>
+<p>Menu:<br>"Tools >> Preferences"</p>
+<p>Button:<br><img src="images/toolbar1/pref.png" width="32"/></p>
+<h3>Folders</h3>
+<ul>
+	<li>Opening folder - Default folder when opening files.</li>
+	<li>Remember previous opened folder - Always set location to the previously opened directory.</li>
+	<li>Saving folder - Default folder when saving files.</li>
+	<li>Remember previous save folder - Always set location to the previously saved directory.</li>
+</ul>
+<img src="images/pref1.png"/>
+
+<h3>Saving</h3>
+<ul>
+	<li>When you click save .png will be selected by default.</li>
+	<li>Choose a format to select by default when you click save.</li>
+</ul>
+<img src="images/pref2.png"/>
+
+<h3>Compression</h3>
+<p>
+	Example of compression dialog when saving .jpg files.
+</p>
+<img src="images/pref_comp.png"/>
+<ul>
+	<li>When saving .jpg files you will get a dialog to choose your compression level.</li>
+	<li>If you prefer you can set your default compression. This option will not show the dialog but save your file with the compression value selected.</li>
+</ul>
+<img src="images/pref3.png"/>
+
+<h3>Layout</h3>
+<ul>
+	<li>Multi Window Mode - Toggle between MDI and Tabs.</li>
+	<li>Default Toolpalette Location - Show the toolpalette on the right/left.</li>
+	<li>Zoom direction - Decides the zoom behaviour of the mouse scroll.</li>
+</ul>
+<img src="images/pref4.png"/>
+
+<h3>Default values</h3>
+<ul>
+	<li>Default units - Choose the units you prefer to work with. This will be selected by default on the New file dialog/resize dialog.
+	</li>
+	<li>Memorize parameters - If enabled your parameters entered on all dialogs will be memorized.</li>
+</ul>
+<img src="images/pref5.png"/>
+
+<h3>History</h3>
+<ul>
+	<li>Image history size - Set how many undo steps you want to allow.</li>
+</ul>
+<img src="images/pref6.png"/>
+
+<h3>Startup</h3>
+<ul>
+	<li>Language - Pick your language. (EN, FR, NL, DE, TW_ZH, CZ)</li>
+	<li>Maximize on startup - Always maximize when application starts.</li>
+</ul>
+<img src="images/pref7.png"/>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/resize.html photoflare-1.6.0/docs/resize.html
--- photoflare-1.5.7/docs/resize.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/resize.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,21 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="resize">Resizing images</a></h2>
+<p>
+	Resize images with the Image size dialog.
+</p>
+<p>Menu:<br>"Image >> Image size..."</p>
+<p>keyboard shortcut:<br>"Ctrl+H" <a href="allshortcuts.html">(View all shortcuts)</a></p>
+<p>Button:<br><img src="images/toolbar1/imgsize.png" width="32"/></p>
+<p>
+	This has similar options to the new file dialog. One new option here is the "Lock ratio" option. This will keep the ratio of the image intact if you change the width/height.
+</p>
+<img src="images/resizeDialog.png"/>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/text.html photoflare-1.6.0/docs/text.html
--- photoflare-1.5.7/docs/text.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/text.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,29 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="text">Add/Edit text</a></h2>
+<p>
+	To add text to an image use the Text dialog.
+</p>
+<p>Menu:<br>"Image >> Text..."</p>
+<p>Button:<br><img src="images/toolbar1/text.png" width="32"/></p>
+<h3>Options</h3>
+<ul>
+	<li>Font colour</li>
+	<li>Font face</li>
+	<li>Font size</li>
+	<li>Alignment</li>
+	<li>Bold</li>
+	<li>Italic</li>
+	<li>Strike out</li>
+	<li>Underline</li>
+	<li>Antialias</li>
+</ul>
+<img src="images/text1.png"/>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/docs/tools.html photoflare-1.6.0/docs/tools.html
--- photoflare-1.5.7/docs/tools.html	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/docs/tools.html	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,60 @@
+---
+layout: default
+---
+<body>
+
+<h2><a name="tools">Tools</a></h2>
+
+<h3><img src="images/tools/Pointer.png" width="32"/> Pointer tool</h3>
+<p>
+	Create selections on an image. Selections can then be used to copy a section of an image or crop to the selected area.
+</p>
+<h3><img src="images/tools/ColourPicker.png" width="32"/> Colour picker</h3>
+<p>
+	Pick a colour from an image and set this colour as either a primary (left click) or secondary colour(right click).
+</p>
+<h3><img src="images/tools/Wand.png" width="32"/> Magic wand</h3>
+<p>
+	Select areas of an image using edge detection.
+</p>
+<h3><img src="images/tools/Line.png" width="32"/> Line tool</h3>
+<p>
+	Draw lines on an image.
+</p>
+<h3><img src="images/tools/Bucket.png" width="32"/> Paint bucket</h3>
+<p>
+	Fill large areas on images with either a primary (left click) or secondary colour(right click).
+</p>
+<h3><img src="images/tools/Spraycan.png" width="32"/> Spray can</h3>
+<p>
+	Spray colour within a radius in a spread pattern.
+</p>
+<h3><img src="images/tools/PaintBrush.png" width="32"/> Paint brush</h3>
+<p>
+	Standard paint brush with basic brushes.
+</p>
+<h3><img src="images/tools/PaintBrush-Plus.png" width="32"/> Advanced paint brush</h3>
+<p>
+	Advanced paint brush with more options and artistic brush types.
+</p>
+<h3><img src="images/tools/Stamp.png" width="32"/> Clone Stamp</h3>
+<p>
+	Clone a section/area of an image and use it as a stamp.
+</p>
+<h3><img src="images/tools/Blur.png" width="32"/> Blur tool</h3>
+<p>
+	Blur parts of an image by holding left click and moving the radius to areas you need to blur.
+</p>
+<h3><img src="images/tools/Eraser.png" width="32"/> Eraser tool</h3>
+<p>
+	Basic eraser tool to remove your painting mistakes.
+</p>
+<h3><img src="images/tools/Smudge.png" width="32"/> Smudge tool</h3>
+<p>
+	Smudge pixels together using the radius of the tool while holding left click.
+</p>
+<p>
+	<a href="index.html">Return to table of contents >></a>
+</p>
+
+</body>
\ No newline at end of file
diff -Nru photoflare-1.5.7/flatpak/flatpak_build.json photoflare-1.6.0/flatpak/flatpak_build.json
--- photoflare-1.5.7/flatpak/flatpak_build.json	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/flatpak/flatpak_build.json	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,38 @@
+{
+    "app-id": "io.photoflare_editor.photoflare",
+    "runtime": "org.kde.Platform",
+    "runtime-version": "5.11",
+    "sdk": "org.kde.Platform",
+    "command": "photoflare",
+    "modules": [
+        {
+            "name": "graphicsmagick",
+            "builddir": true,
+            "config-opts": [
+                "--enable-shared",
+                "--with-modules",
+                "--with-perl",
+                "--with-quantum-depth=16",
+                "--with-threads"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://ftp.icm.edu.pl/pub/unix/graphics/GraphicsMagick/1.3/GraphicsMagick-1.3.29.tar.gz",
+                    "sha256":"de820cd10597205941a7e9d02c2e679231e92e8e769c204ef09034d2279ad453"
+                }
+            ]
+        },
+        {
+            "name": "photoflare",
+            "buildsystem": "qmake",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/PhotoFlare/photoflare.git",
+                    "commit": "a2b8c0da81811000e17c2e008de43a27523b4f2f"
+                }
+            ]
+        }
+    ]
+}
diff -Nru photoflare-1.5.7/.github/FUNDING.yml photoflare-1.6.0/.github/FUNDING.yml
--- photoflare-1.5.7/.github/FUNDING.yml	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/.github/FUNDING.yml	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: https://photoflare.io/donate/
diff -Nru photoflare-1.5.7/.github/README.md photoflare-1.6.0/.github/README.md
--- photoflare-1.5.7/.github/README.md	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/.github/README.md	2019-09-17 21:28:37.000000000 +0000
@@ -1,36 +1,43 @@
 # PhotoFlare
 
-[![DebianBadge](https://badges.debian.net/badges/debian/testing/photoflare/version.svg)](https://packages.debian.org/testing/photoflare)
-[![GitHub release](https://img.shields.io/badge/Release-1.5.6.1-green.svg)](https://github.com/PhotoFlare/photoflare/releases)
 [![License: GPL v3+](https://img.shields.io/badge/License-GPL-yellowgreen.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Build Status](https://travis-ci.org/PhotoFlare/photoflare.svg?branch=master)](https://travis-ci.org/PhotoFlare/photoflare)
-[![Snap Status](https://build.snapcraft.io/badge/PhotoFlare/photoflare.svg)](https://build.snapcraft.io/user/PhotoFlare/photoflare)
+[![GitHub release](https://img.shields.io/badge/Release-1.5.9-green.svg)](https://github.com/PhotoFlare/photoflare/releases)
+[![latest packaged version(s)](https://repology.org/badge/latest-versions/photoflare.svg)](https://repology.org/project/photoflare/versions)
 
-Simple but powerful Cross Platform image editor originally inspired by the PhotoFiltre image editor on Windows. Created with C++ 17, Qt Framework and the Graphicsmagick library.
+Photoflare is a cross-platform image editor with an aim to balance between powerful features and a very friendly graphical user interface. It suits a wide variety of different tasks and users who value a more nimble workflow. Features include basic image editing capabilities, paint brushes, image filters, colour adjustments and more advanced features such as Batch image processing.
 
-<img src="http://photoflare.io/wp-content/uploads/2018/03/CrossPlatform2.png">
+<img src="https://photoflare.io/wp-content/uploads/2018/03/CrossPlatform2.png">
 
 ## Documentation
-Information on features and using the project will be <a href="http://photoflare.io/documentation/">available here</a>. At the moment its a work in progress.
+Information on current features and how to use the application will be 
+<a href="https://photoflare.github.io/photoflare/">available here</a>. (WIP)
 
 ## Building
 
 ### Dependencies
+- G++/Clang on Linux, MSVC/Clang on Windows or Clang on MacOSX
 - libgraphicsmagick++-dev
-- qt5-default (Ubuntu only)
-- G++ on Linux, MinGW on Windows or Clang on MacOSX
+- libomp-dev
+- qt5-default (Ubuntu only)  
+**or**
+- libc6-dev
+- libqt5core5a-dev
+- libqt5gui5-dev
+- libqt5widgets5-dev
 
-Compile using either by opening the .pro file with Qt Creator or use qmake passing the .pro file as a parameter. Full instructions for each platform <a href="http://photoflare.io/contributing/building-the-source/">available here</a>
+Compile using either by opening the .pro file with Qt Creator or use qmake passing the .pro file as a parameter. Full instructions for each platform <a href="https://photoflare.io/contributing/building-the-source/">available here</a>
 
 ## Running
 
 ### Dependencies
 - libc6
 - libgraphicsmagick++-q16-12
-- libqt5gui5
 - libqt5core5a
+- libqt5gui5
 - libqt5widgets5
 - libqt5printsupport5
+- libomp5
 - qt5-image-formats-plugins (Optional - Extra file format support)
 
 ## Translations
@@ -43,4 +50,4 @@
 - Chinese (TW)
 - Czech
 
-If you would like to add to this list then get in touch. Instructions on adding a translation is <a href="http://photoflare.io/contributing/translations/">available here</a>
+If you would like to add to this list then get in touch. Instructions on adding a translation is <a href="https://photoflare.io/contributing/translations/">available here</a>
diff -Nru photoflare-1.5.7/Icons.qrc photoflare-1.6.0/Icons.qrc
--- photoflare-1.5.7/Icons.qrc	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/Icons.qrc	2019-09-17 21:28:37.000000000 +0000
@@ -103,5 +103,6 @@
     </qresource>
     <qresource prefix="/cursors">
         <file>assets/cursors/color-picker.png</file>
+        <file>assets/cursors/bucket.png</file>
     </qresource>
 </RCC>
diff -Nru photoflare-1.5.7/installers/deb/DEBIAN/control photoflare-1.6.0/installers/deb/DEBIAN/control
--- photoflare-1.5.7/installers/deb/DEBIAN/control	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/installers/deb/DEBIAN/control	2019-09-17 21:28:37.000000000 +0000
@@ -1,5 +1,5 @@
 Package: photoflare
-Version: 1.5.6.1~bionic1
+Version: 1.5.9~bionic1
 Architecture: amd64
 Maintainer: Dylan Coakley <info@photoflare.io>
 Installed-Size: 5000
diff -Nru photoflare-1.5.7/installers/PhotoFlare.aip photoflare-1.6.0/installers/PhotoFlare.aip
--- photoflare-1.5.7/installers/PhotoFlare.aip	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/installers/PhotoFlare.aip	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,487 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DOCUMENT Type="Advanced Installer" CreateVersion="12.8" version="15.7" Modules="simple" RootPath="." Language="en" Id="{5D06178B-435B-4E42-97DD-F876229286E7}">
+  <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
+    <ROW Name="HiddenItems" Value="AppXAppDetailsComponent;AppXCapabilitiesComponent;AppXDependenciesComponent;AppXProductDetailsComponent;AppXVisualAssetsComponent;AppXAppDeclarationsComponent;AppXUriRulesComponent;FixupComponent"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
+    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
+    <ROW Property="ALLUSERS" Value="1"/>
+    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
+    <ROW Property="ARPURLINFOABOUT" Value="http://photoflare.io"/>
+    <ROW Property="Manufacturer" Value="PhotoFlare.io"/>
+    <ROW Property="ProductCode" Value="1033:{07297193-3625-4016-9C28-602ECEDA3FC2} " Type="16"/>
+    <ROW Property="ProductLanguage" Value="1033"/>
+    <ROW Property="ProductName" Value="PhotoFlare"/>
+    <ROW Property="ProductVersion" Value="1.5.8.0" Type="32" TargetFile="PhotoFlare.exe"/>
+    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
+    <ROW Property="UpgradeCode" Value="{5DFB1CEA-0740-4E8A-9CE9-D5A82084C960}"/>
+    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT50" MultiBuildValue="DefaultBuild:Windows 2000" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT50Display" MultiBuildValue="DefaultBuild:Windows 2000" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT5X" MultiBuildValue="DefaultBuild:Windows XP/2003 RTM, Windows XP/2003 SP1, Windows XP SP2 x86" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT5XDisplay" MultiBuildValue="DefaultBuild:Windows XP/2003 RTM, Windows XP/2003 SP1, Windows XP SP2 x86" ValueLocId="-"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
+    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
+    <ROW Directory="SHORTCUTDIR" Directory_Parent="TARGETDIR" DefaultDir="SHORTC~1|SHORTCUTDIR" IsPseudoRoot="1"/>
+    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
+    <ROW Directory="imageformats_Dir" Directory_Parent="APPDIR" DefaultDir="IMAGEF~1|imageformats"/>
+    <ROW Directory="languages_1_Dir" Directory_Parent="APPDIR" DefaultDir="LANGUA~1|languages"/>
+    <ROW Directory="platforms_Dir" Directory_Parent="APPDIR" DefaultDir="PLATFO~1|platforms"/>
+    <ROW Directory="printsupport_Dir" Directory_Parent="APPDIR" DefaultDir="PRINTS~1|printsupport"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
+    <ROW Component="CORE_RL_Magick_.dll" ComponentId="{C4F82B72-FA73-4B50-83AD-4EE1C5A3F699}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_Magick_.dll_1"/>
+    <ROW Component="CORE_RL_bzlib_.dll" ComponentId="{5AC84C37-82CD-4B39-A3F0-F40F119548CE}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_bzlib_.dll"/>
+    <ROW Component="CORE_RL_jbig_.dll" ComponentId="{97B6BE9C-FEF0-4FEC-B6F5-A35C476A656C}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_jbig_.dll"/>
+    <ROW Component="CORE_RL_jp2_.dll" ComponentId="{2B325DA6-C290-4D49-B8A8-3F28E49A5D77}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_jp2_.dll"/>
+    <ROW Component="CORE_RL_jpeg_.dll" ComponentId="{A5FC015F-F9B4-4D72-9D89-3F2FAC8A1B38}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_jpeg_.dll"/>
+    <ROW Component="CORE_RL_lcms_.dll" ComponentId="{0C3667E3-D4E0-4F49-A276-BCE42B890190}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_lcms_.dll"/>
+    <ROW Component="CORE_RL_libxml_.dll" ComponentId="{397FDF57-C4B6-4F7B-B4B0-665F45F49E17}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_libxml_.dll"/>
+    <ROW Component="CORE_RL_magick_.dll" ComponentId="{499E03B8-FF05-40F9-9983-03B6BB3826F9}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_magick_.dll"/>
+    <ROW Component="CORE_RL_png_.dll" ComponentId="{1ADD9A16-18C9-43C7-A16A-1BE34B74D9FC}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_png_.dll"/>
+    <ROW Component="CORE_RL_tiff_.dll" ComponentId="{9116B285-8521-4978-8493-D31054CBBD30}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_tiff_.dll"/>
+    <ROW Component="CORE_RL_ttf_.dll" ComponentId="{052A5A7D-1716-4218-914D-712E22A9499A}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_ttf_.dll"/>
+    <ROW Component="CORE_RL_webp_.dll" ComponentId="{348B64C4-5DD9-4C26-A7DD-F5C9F6E2DB20}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_webp_.dll"/>
+    <ROW Component="CORE_RL_xlib_.dll" ComponentId="{A2178E6F-D9C9-4E04-A27E-BFA6D2C241F0}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_xlib_.dll"/>
+    <ROW Component="CORE_RL_zlib_.dll" ComponentId="{D80EEBBC-7455-4CF2-B919-71DB053E39EF}" Directory_="APPDIR" Attributes="256" KeyPath="CORE_RL_zlib_.dll"/>
+    <ROW Component="IM_MOD_RL_art_.dll" ComponentId="{17C7434D-E2C3-4563-A63B-54A251670A89}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_art_.dll"/>
+    <ROW Component="IM_MOD_RL_avi_.dll" ComponentId="{9156F9D2-98C4-452A-94D4-909729C7629B}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_avi_.dll"/>
+    <ROW Component="IM_MOD_RL_avs_.dll" ComponentId="{9461C853-BDEE-42F9-8E52-387D0727BE0C}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_avs_.dll"/>
+    <ROW Component="IM_MOD_RL_bmp_.dll" ComponentId="{CFBCF8E3-85A9-4E39-BFCE-BA6FAAFE37FC}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_bmp_.dll"/>
+    <ROW Component="IM_MOD_RL_cals_.dll" ComponentId="{9A699038-B05D-493C-A6ED-78FDE10223C1}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_cals_.dll"/>
+    <ROW Component="IM_MOD_RL_caption_.dll" ComponentId="{14B049AF-BFBE-44F6-A576-991352E6DF2E}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_caption_.dll"/>
+    <ROW Component="IM_MOD_RL_cineon_.dll" ComponentId="{69B1E091-477C-4ACE-B18E-6E04FA8E8534}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_cineon_.dll"/>
+    <ROW Component="IM_MOD_RL_clipboard_.dll" ComponentId="{2A7145B6-10BA-4F79-8DD1-AE3CB881CB5B}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_clipboard_.dll"/>
+    <ROW Component="IM_MOD_RL_cmyk_.dll" ComponentId="{83C1A0CC-7218-4B9E-B09B-5024B29C9692}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_cmyk_.dll"/>
+    <ROW Component="IM_MOD_RL_cut_.dll" ComponentId="{7CA09AA4-0AEA-4E66-A14F-6D889C748A9C}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_cut_.dll"/>
+    <ROW Component="IM_MOD_RL_dcm_.dll" ComponentId="{C8BF4BDA-25C4-41C9-9274-5C6A4AE8C23F}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_dcm_.dll"/>
+    <ROW Component="IM_MOD_RL_dcraw_.dll" ComponentId="{714E0E42-2C1D-4478-AB07-0E2A63BCB713}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_dcraw_.dll"/>
+    <ROW Component="IM_MOD_RL_dib_.dll" ComponentId="{959D4E27-A12B-44FB-9BFD-F7FD80408E71}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_dib_.dll"/>
+    <ROW Component="IM_MOD_RL_dps_.dll" ComponentId="{9AE9DF4A-00BE-492E-87A9-5E4B24B37F6B}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_dps_.dll"/>
+    <ROW Component="IM_MOD_RL_dpx_.dll" ComponentId="{3CFC6120-75DB-43FA-AEB7-733D2845930E}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_dpx_.dll"/>
+    <ROW Component="IM_MOD_RL_emf_.dll" ComponentId="{AFE586EA-C2C4-4CA1-8836-72CE3ED8862C}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_emf_.dll"/>
+    <ROW Component="IM_MOD_RL_ept_.dll" ComponentId="{11389379-4188-4414-BCD7-F8CA796AFEDF}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_ept_.dll"/>
+    <ROW Component="IM_MOD_RL_fax_.dll" ComponentId="{D82276C8-5025-44DC-A380-956FD90E3BED}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_fax_.dll"/>
+    <ROW Component="IM_MOD_RL_fits_.dll" ComponentId="{A14FDFA3-5034-4DC0-9B8F-74A57769A2F7}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_fits_.dll"/>
+    <ROW Component="IM_MOD_RL_fpx_.dll" ComponentId="{55D991DB-E1BF-462C-A2B6-A0E6600DC38E}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_fpx_.dll"/>
+    <ROW Component="IM_MOD_RL_gif_.dll" ComponentId="{3CDEF4C3-B842-43C6-AC52-5F8163DE11B6}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_gif_.dll"/>
+    <ROW Component="IM_MOD_RL_gradient_.dll" ComponentId="{A32B41FC-CB9C-4D4B-935E-ED3FE8BE66DF}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_gradient_.dll"/>
+    <ROW Component="IM_MOD_RL_gray_.dll" ComponentId="{D0390046-BCF5-4019-9CC8-BF1D95AD0DF7}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_gray_.dll"/>
+    <ROW Component="IM_MOD_RL_histogram_.dll" ComponentId="{09D305D2-450F-4017-A6BE-936837D95E2B}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_histogram_.dll"/>
+    <ROW Component="IM_MOD_RL_hrz_.dll" ComponentId="{8FFE4102-CE2F-402F-B71F-D72BA06B7A86}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_hrz_.dll"/>
+    <ROW Component="IM_MOD_RL_html_.dll" ComponentId="{590490FC-757A-43D0-AAD1-9788C1C9EE85}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_html_.dll"/>
+    <ROW Component="IM_MOD_RL_icon_.dll" ComponentId="{15CDB13C-F603-4866-B055-AF3D2EF5740B}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_icon_.dll"/>
+    <ROW Component="IM_MOD_RL_identity_.dll" ComponentId="{BB136A76-9414-428A-859F-DCA70E45D3AD}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_identity_.dll"/>
+    <ROW Component="IM_MOD_RL_info_.dll" ComponentId="{3666B8E7-8E8F-4A59-9B0C-554D2A8AC7CA}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_info_.dll"/>
+    <ROW Component="IM_MOD_RL_jbig_.dll" ComponentId="{7C3C920E-0DAE-4DF1-B3EC-BB1352F369AA}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_jbig_.dll"/>
+    <ROW Component="IM_MOD_RL_jnx_.dll" ComponentId="{ED8344FE-1F4A-40D1-B384-16B7930654A2}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_jnx_.dll"/>
+    <ROW Component="IM_MOD_RL_jp2_.dll" ComponentId="{698BC869-CB55-4D43-B0FC-84F68863DA4B}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_jp2_.dll"/>
+    <ROW Component="IM_MOD_RL_jpeg_.dll" ComponentId="{33E8CFB8-9297-448E-8C62-9BD7C28B82EA}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_jpeg_.dll"/>
+    <ROW Component="IM_MOD_RL_label_.dll" ComponentId="{9DD8CF95-ABDF-461C-8216-92001DFA5ADA}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_label_.dll"/>
+    <ROW Component="IM_MOD_RL_locale_.dll" ComponentId="{1CBE126B-B67E-4047-A5E7-0D61D63A93C2}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_locale_.dll"/>
+    <ROW Component="IM_MOD_RL_logo_.dll" ComponentId="{F1BD31D8-9198-411B-86F6-BD42770A6CA5}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_logo_.dll"/>
+    <ROW Component="IM_MOD_RL_mac_.dll" ComponentId="{219079EA-5BB6-4960-A5CF-445F25E0E617}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_mac_.dll"/>
+    <ROW Component="IM_MOD_RL_map_.dll" ComponentId="{6653E6DF-F36E-40CE-86B6-B8C5CA39402C}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_map_.dll"/>
+    <ROW Component="IM_MOD_RL_mat_.dll" ComponentId="{3760C332-8284-4DB0-A010-0BE1FDC10138}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_mat_.dll"/>
+    <ROW Component="IM_MOD_RL_matte_.dll" ComponentId="{B977BBC5-DC5F-4313-866B-B86887B900C4}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_matte_.dll"/>
+    <ROW Component="IM_MOD_RL_meta_.dll" ComponentId="{70D26EBF-F55A-472C-BB61-853C8FE7EA42}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_meta_.dll"/>
+    <ROW Component="IM_MOD_RL_miff_.dll" ComponentId="{5AFCC06C-546A-40DB-BEA3-750CD37953C5}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_miff_.dll"/>
+    <ROW Component="IM_MOD_RL_mono_.dll" ComponentId="{85ADC53B-6BF8-4266-93CB-EB0021512080}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_mono_.dll"/>
+    <ROW Component="IM_MOD_RL_mpc_.dll" ComponentId="{8BF7FC1C-FAC1-4249-93C1-05781E3BCFDE}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_mpc_.dll"/>
+    <ROW Component="IM_MOD_RL_mpeg_.dll" ComponentId="{84A076A3-FF83-4DF8-A7AD-E44FF88ACB17}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_mpeg_.dll"/>
+    <ROW Component="IM_MOD_RL_mpr_.dll" ComponentId="{BE0B4355-1B15-473E-95AB-FD1A94CD4F12}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_mpr_.dll"/>
+    <ROW Component="IM_MOD_RL_msl_.dll" ComponentId="{7ED3537B-73A1-42A0-83C8-5B5C5C1902FE}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_msl_.dll"/>
+    <ROW Component="IM_MOD_RL_mtv_.dll" ComponentId="{9EAFF11E-BA29-4E0D-8B72-94010A55695C}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_mtv_.dll"/>
+    <ROW Component="IM_MOD_RL_mvg_.dll" ComponentId="{DF2121BE-1F37-44B4-ADEB-2EB58A79B9AB}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_mvg_.dll"/>
+    <ROW Component="IM_MOD_RL_null_.dll" ComponentId="{BF35BAE7-C761-4373-81F9-FB32C5D7EF86}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_null_.dll"/>
+    <ROW Component="IM_MOD_RL_otb_.dll" ComponentId="{30FB965D-27A0-4235-BD33-577ACE85508D}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_otb_.dll"/>
+    <ROW Component="IM_MOD_RL_palm_.dll" ComponentId="{6B3B6E02-6993-47AB-B4C3-C4403B986227}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_palm_.dll"/>
+    <ROW Component="IM_MOD_RL_pcd_.dll" ComponentId="{FEF7E751-715B-41EB-8F4F-4D3CE3AA8ED6}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_pcd_.dll"/>
+    <ROW Component="IM_MOD_RL_pcl_.dll" ComponentId="{1CB818A7-D86B-4276-9670-649441D457FC}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_pcl_.dll"/>
+    <ROW Component="IM_MOD_RL_pcx_.dll" ComponentId="{6223C3BA-30E0-4EF0-BD6B-CB03352ED8A4}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_pcx_.dll"/>
+    <ROW Component="IM_MOD_RL_pdb_.dll" ComponentId="{4C6E8FD3-D165-476E-B10E-2BF4FC0AAA28}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_pdb_.dll"/>
+    <ROW Component="IM_MOD_RL_pdf_.dll" ComponentId="{402E468B-3CEB-4344-9EDA-79247F5187D1}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_pdf_.dll"/>
+    <ROW Component="IM_MOD_RL_pict_.dll" ComponentId="{2499B2DF-ABC7-4341-B5C4-E9D461547DDA}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_pict_.dll"/>
+    <ROW Component="IM_MOD_RL_pix_.dll" ComponentId="{11EE3F26-B02D-4996-9914-8EF9614599BE}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_pix_.dll"/>
+    <ROW Component="IM_MOD_RL_plasma_.dll" ComponentId="{44C42923-8899-435E-93C4-601C6E28101E}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_plasma_.dll"/>
+    <ROW Component="IM_MOD_RL_png_.dll" ComponentId="{BE2B38B7-4FB7-4B6A-855E-5029506D0108}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_png_.dll"/>
+    <ROW Component="IM_MOD_RL_pnm_.dll" ComponentId="{C20CFCD4-96B8-4CEF-B4BA-94F856D2F49E}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_pnm_.dll"/>
+    <ROW Component="IM_MOD_RL_preview_.dll" ComponentId="{C0D5EE27-38C9-44A1-975A-5C8137474A36}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_preview_.dll"/>
+    <ROW Component="IM_MOD_RL_ps2_.dll" ComponentId="{A3F1D75D-A3D7-42D0-BB02-919AB44EEB12}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_ps2_.dll"/>
+    <ROW Component="IM_MOD_RL_ps3_.dll" ComponentId="{D936C6B0-3FE3-4500-9105-471F622B91B5}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_ps3_.dll"/>
+    <ROW Component="IM_MOD_RL_ps_.dll" ComponentId="{145B8E85-F473-4EAB-A36E-038FA923C205}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_ps_.dll"/>
+    <ROW Component="IM_MOD_RL_psd_.dll" ComponentId="{85A5E27E-BF26-4471-A23D-36CBDC229C0B}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_psd_.dll"/>
+    <ROW Component="IM_MOD_RL_pwp_.dll" ComponentId="{FC91BDA2-430C-4C2F-9E7E-961B5A6FB529}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_pwp_.dll"/>
+    <ROW Component="IM_MOD_RL_rgb_.dll" ComponentId="{EB9E0688-C11F-4899-ABDD-FA7484AACB1A}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_rgb_.dll"/>
+    <ROW Component="IM_MOD_RL_rla_.dll" ComponentId="{D167D10E-5FC8-412A-BD24-7352B04B6DA7}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_rla_.dll"/>
+    <ROW Component="IM_MOD_RL_rle_.dll" ComponentId="{09A52DF8-53A6-45F5-9ADB-A49FD0E56E46}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_rle_.dll"/>
+    <ROW Component="IM_MOD_RL_sct_.dll" ComponentId="{09DBFACD-B419-4CD5-98F0-B4C7A37A8DBC}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_sct_.dll"/>
+    <ROW Component="IM_MOD_RL_sfw_.dll" ComponentId="{F44769F3-4095-49D9-B1DB-555C253D71C2}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_sfw_.dll"/>
+    <ROW Component="IM_MOD_RL_sgi_.dll" ComponentId="{53235C4C-6744-4164-AA51-3DE96FCBEE5B}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_sgi_.dll"/>
+    <ROW Component="IM_MOD_RL_stegano_.dll" ComponentId="{1F50747E-1246-4685-B41B-36CAB3654A05}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_stegano_.dll"/>
+    <ROW Component="IM_MOD_RL_sun_.dll" ComponentId="{79E80EC1-EAEB-4775-A78C-6C14EDA0B521}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_sun_.dll"/>
+    <ROW Component="IM_MOD_RL_svg_.dll" ComponentId="{8956CEAA-F58B-48BB-8341-FDD8B256ECDA}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_svg_.dll"/>
+    <ROW Component="IM_MOD_RL_tga_.dll" ComponentId="{EF13D848-6BCC-4023-97F9-08F8AB52EC29}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_tga_.dll"/>
+    <ROW Component="IM_MOD_RL_tiff_.dll" ComponentId="{83CF6A00-0427-4AFB-A29D-C84E3A75C991}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_tiff_.dll"/>
+    <ROW Component="IM_MOD_RL_tile_.dll" ComponentId="{A3526D52-954E-47B3-BD12-DFD9A4B473A8}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_tile_.dll"/>
+    <ROW Component="IM_MOD_RL_tim_.dll" ComponentId="{1967AABC-305E-4B31-8B62-75C8EB1B510E}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_tim_.dll"/>
+    <ROW Component="IM_MOD_RL_topol_.dll" ComponentId="{22DAEB4A-BC75-423D-BED0-E2F5C3B35CDB}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_topol_.dll"/>
+    <ROW Component="IM_MOD_RL_ttf_.dll" ComponentId="{F6FEB8EC-25B3-41A1-94D2-EBD60683F820}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_ttf_.dll"/>
+    <ROW Component="IM_MOD_RL_txt_.dll" ComponentId="{16B54916-CA03-4DD1-B5E2-62E1B4D9E5FD}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_txt_.dll"/>
+    <ROW Component="IM_MOD_RL_uil_.dll" ComponentId="{C6B19A16-6783-44D6-90B1-058E404BED28}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_uil_.dll"/>
+    <ROW Component="IM_MOD_RL_url_.dll" ComponentId="{94811D7A-A472-49F9-A663-77A2D1E01C0D}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_url_.dll"/>
+    <ROW Component="IM_MOD_RL_uyvy_.dll" ComponentId="{D3D51265-01E5-4311-A660-F65833325C55}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_uyvy_.dll"/>
+    <ROW Component="IM_MOD_RL_vicar_.dll" ComponentId="{79E5B3B3-E059-454E-B2C3-8C908BC30E23}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_vicar_.dll"/>
+    <ROW Component="IM_MOD_RL_vid_.dll" ComponentId="{B75630CB-11C5-417B-8BFF-452E10C2B3ED}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_vid_.dll"/>
+    <ROW Component="IM_MOD_RL_viff_.dll" ComponentId="{2A4EB7C0-48DB-452F-B55B-58F01D832B45}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_viff_.dll"/>
+    <ROW Component="IM_MOD_RL_wbmp_.dll" ComponentId="{A32C46E3-8A2D-445E-8957-A9D1EECFEF0B}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_wbmp_.dll"/>
+    <ROW Component="IM_MOD_RL_webp_.dll" ComponentId="{065CC683-CEFC-45DD-87E1-16CC1404AA42}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_webp_.dll"/>
+    <ROW Component="IM_MOD_RL_wmf_.dll" ComponentId="{77609972-80F4-49AC-88E3-DCD3C5F6238F}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_wmf_.dll"/>
+    <ROW Component="IM_MOD_RL_wpg_.dll" ComponentId="{DA74C48D-CAA6-4668-B3DD-83C097C20291}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_wpg_.dll"/>
+    <ROW Component="IM_MOD_RL_x_.dll" ComponentId="{6C219494-992A-4EEC-88DB-FB5E6548061A}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_x_.dll"/>
+    <ROW Component="IM_MOD_RL_xbm_.dll" ComponentId="{C1F89648-BE5E-472A-AFE5-225D0EB0DAC0}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_xbm_.dll"/>
+    <ROW Component="IM_MOD_RL_xc_.dll" ComponentId="{B204E314-38BE-45B2-B1A9-8694CAA3F10C}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_xc_.dll"/>
+    <ROW Component="IM_MOD_RL_xcf_.dll" ComponentId="{B1EBE9D7-73F4-4549-9037-7F26029DB0CE}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_xcf_.dll"/>
+    <ROW Component="IM_MOD_RL_xpm_.dll" ComponentId="{BAC8794E-382A-4A5F-9A22-0587FD95FE93}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_xpm_.dll"/>
+    <ROW Component="IM_MOD_RL_xtrn_.dll" ComponentId="{168A5733-4905-46B5-BF9F-9938F9FD9EED}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_xtrn_.dll"/>
+    <ROW Component="IM_MOD_RL_xwd_.dll" ComponentId="{104CB893-8EB7-429C-AB5D-ED44794B68D0}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_xwd_.dll"/>
+    <ROW Component="IM_MOD_RL_yuv_.dll" ComponentId="{81FF1D83-E3D6-4FE0-AC64-7092987F099A}" Directory_="APPDIR" Attributes="256" KeyPath="IM_MOD_RL_yuv_.dll"/>
+    <ROW Component="PhotoFlare.exe" ComponentId="{CE99A836-A332-41B7-8CEA-B64304A84B03}" Directory_="APPDIR" Attributes="256" KeyPath="PhotoFlare.exe"/>
+    <ROW Component="ProductInformation" ComponentId="{1D65AC3D-F912-4D07-86A8-9BC9D948D9E9}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
+    <ROW Component="Qt5Core.dll" ComponentId="{8E80789F-5524-41FC-B938-346E637F7924}" Directory_="APPDIR" Attributes="256" KeyPath="Qt5Core.dll"/>
+    <ROW Component="Qt5Gui.dll" ComponentId="{BBC92AA9-EC05-455D-AA49-443D7AFFFFEF}" Directory_="APPDIR" Attributes="256" KeyPath="Qt5Gui.dll"/>
+    <ROW Component="Qt5Network.dll" ComponentId="{E0F6A1DC-217B-4723-BAE1-3C14580DF378}" Directory_="APPDIR" Attributes="256" KeyPath="Qt5Network.dll"/>
+    <ROW Component="Qt5PrintSupport.dll" ComponentId="{87D368C3-FC22-42EB-8920-0B8FF2B6B50C}" Directory_="APPDIR" Attributes="256" KeyPath="Qt5PrintSupport.dll"/>
+    <ROW Component="Qt5Widgets.dll" ComponentId="{07B075E8-B7DA-4A33-9C84-519A9EDC925B}" Directory_="APPDIR" Attributes="256" KeyPath="Qt5Widgets.dll"/>
+    <ROW Component="SHORTCUTDIR" ComponentId="{202F0FB9-770D-44E5-8361-5F049171728D}" Directory_="SHORTCUTDIR" Attributes="0"/>
+    <ROW Component="de.qm_1" ComponentId="{3BA836DD-1727-4927-9E58-18FECB054517}" Directory_="languages_1_Dir" Attributes="0" KeyPath="de.qm_1" Type="0"/>
+    <ROW Component="qgif.dll" ComponentId="{18BC4281-B02D-41E2-BB0C-2E83D0FC38ED}" Directory_="imageformats_Dir" Attributes="256" KeyPath="qgif.dll"/>
+    <ROW Component="qicns.dll" ComponentId="{73491785-C752-4CD1-B122-EF8AE35D1AAB}" Directory_="imageformats_Dir" Attributes="256" KeyPath="qicns.dll"/>
+    <ROW Component="qico.dll" ComponentId="{2EA6A2C1-408F-4B5D-A418-0EE0ABB279CC}" Directory_="imageformats_Dir" Attributes="256" KeyPath="qico.dll"/>
+    <ROW Component="qjpeg.dll" ComponentId="{8F6E5540-C8AE-49B2-BA8C-8D948AEDA577}" Directory_="imageformats_Dir" Attributes="256" KeyPath="qjpeg.dll"/>
+    <ROW Component="qminimal.dll" ComponentId="{CC88D05C-634F-4286-B3C1-FFBDB312C048}" Directory_="platforms_Dir" Attributes="256" KeyPath="qminimal.dll"/>
+    <ROW Component="qsvg.dll" ComponentId="{527834BA-26F5-4F23-B4A6-3AC769564E36}" Directory_="imageformats_Dir" Attributes="256" KeyPath="qsvg.dll"/>
+    <ROW Component="qtga.dll" ComponentId="{5F78C423-277B-48DA-9620-7741E4177551}" Directory_="imageformats_Dir" Attributes="256" KeyPath="qtga.dll"/>
+    <ROW Component="qtiff.dll" ComponentId="{638F7C10-FD35-4AED-B61C-C7CBA4630C0C}" Directory_="imageformats_Dir" Attributes="256" KeyPath="qtiff.dll"/>
+    <ROW Component="qwbmp.dll" ComponentId="{A4197EF2-79E3-4AD0-A06E-F0BBE967F9AB}" Directory_="imageformats_Dir" Attributes="256" KeyPath="qwbmp.dll"/>
+    <ROW Component="qwebp.dll" ComponentId="{54D6EFC0-1C85-4500-B07F-7C9275EA1AAF}" Directory_="imageformats_Dir" Attributes="256" KeyPath="qwebp.dll"/>
+    <ROW Component="qwindows.dll" ComponentId="{5121C9C1-4980-4305-B917-25EFB28C38B9}" Directory_="platforms_Dir" Attributes="256" KeyPath="qwindows.dll"/>
+    <ROW Component="vcomp140.dll" ComponentId="{6A51B338-3E59-4E74-A07B-641357DEFB27}" Directory_="APPDIR" Attributes="256" KeyPath="vcomp140.dll"/>
+    <ROW Component="windowsprintersupport.dll" ComponentId="{6A66529A-34FC-49E4-AF59-9C2350BEDF76}" Directory_="printsupport_Dir" Attributes="256" KeyPath="windowsprintersupport.dll"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="CORE_RL_Magick_.dll CORE_RL_bzlib_.dll CORE_RL_jbig_.dll CORE_RL_jp2_.dll CORE_RL_jpeg_.dll CORE_RL_lcms_.dll CORE_RL_libxml_.dll CORE_RL_magick_.dll CORE_RL_png_.dll CORE_RL_tiff_.dll CORE_RL_ttf_.dll CORE_RL_webp_.dll CORE_RL_xlib_.dll CORE_RL_zlib_.dll IM_MOD_RL_art_.dll IM_MOD_RL_avi_.dll IM_MOD_RL_avs_.dll IM_MOD_RL_bmp_.dll IM_MOD_RL_cals_.dll IM_MOD_RL_caption_.dll IM_MOD_RL_cineon_.dll IM_MOD_RL_clipboard_.dll IM_MOD_RL_cmyk_.dll IM_MOD_RL_cut_.dll IM_MOD_RL_dcm_.dll IM_MOD_RL_dcraw_.dll IM_MOD_RL_dib_.dll IM_MOD_RL_dps_.dll IM_MOD_RL_dpx_.dll IM_MOD_RL_emf_.dll IM_MOD_RL_ept_.dll IM_MOD_RL_fax_.dll IM_MOD_RL_fits_.dll IM_MOD_RL_fpx_.dll IM_MOD_RL_gif_.dll IM_MOD_RL_gradient_.dll IM_MOD_RL_gray_.dll IM_MOD_RL_histogram_.dll IM_MOD_RL_hrz_.dll IM_MOD_RL_html_.dll IM_MOD_RL_icon_.dll IM_MOD_RL_identity_.dll IM_MOD_RL_info_.dll IM_MOD_RL_jbig_.dll IM_MOD_RL_jnx_.dll IM_MOD_RL_jp2_.dll IM_MOD_RL_jpeg_.dll IM_MOD_RL_label_.dll IM_MOD_RL_locale_.dll IM_MOD_RL_logo_.dll IM_MOD_RL_mac_.dll IM_MOD_RL_map_.dll IM_MOD_RL_mat_.dll IM_MOD_RL_matte_.dll IM_MOD_RL_meta_.dll IM_MOD_RL_miff_.dll IM_MOD_RL_mono_.dll IM_MOD_RL_mpc_.dll IM_MOD_RL_mpeg_.dll IM_MOD_RL_mpr_.dll IM_MOD_RL_msl_.dll IM_MOD_RL_mtv_.dll IM_MOD_RL_mvg_.dll IM_MOD_RL_null_.dll IM_MOD_RL_otb_.dll IM_MOD_RL_palm_.dll IM_MOD_RL_pcd_.dll IM_MOD_RL_pcl_.dll IM_MOD_RL_pcx_.dll IM_MOD_RL_pdb_.dll IM_MOD_RL_pdf_.dll IM_MOD_RL_pict_.dll IM_MOD_RL_pix_.dll IM_MOD_RL_plasma_.dll IM_MOD_RL_png_.dll IM_MOD_RL_pnm_.dll IM_MOD_RL_preview_.dll IM_MOD_RL_ps2_.dll IM_MOD_RL_ps3_.dll IM_MOD_RL_ps_.dll IM_MOD_RL_psd_.dll IM_MOD_RL_pwp_.dll IM_MOD_RL_rgb_.dll IM_MOD_RL_rla_.dll IM_MOD_RL_rle_.dll IM_MOD_RL_sct_.dll IM_MOD_RL_sfw_.dll IM_MOD_RL_sgi_.dll IM_MOD_RL_stegano_.dll IM_MOD_RL_sun_.dll IM_MOD_RL_svg_.dll IM_MOD_RL_tga_.dll IM_MOD_RL_tiff_.dll IM_MOD_RL_tile_.dll IM_MOD_RL_tim_.dll IM_MOD_RL_topol_.dll IM_MOD_RL_ttf_.dll IM_MOD_RL_txt_.dll IM_MOD_RL_uil_.dll IM_MOD_RL_url_.dll IM_MOD_RL_uyvy_.dll IM_MOD_RL_vicar_.dll IM_MOD_RL_vid_.dll IM_MOD_RL_viff_.dll IM_MOD_RL_wbmp_.dll IM_MOD_RL_webp_.dll IM_MOD_RL_wmf_.dll IM_MOD_RL_wpg_.dll IM_MOD_RL_x_.dll IM_MOD_RL_xbm_.dll IM_MOD_RL_xc_.dll IM_MOD_RL_xcf_.dll IM_MOD_RL_xpm_.dll IM_MOD_RL_xtrn_.dll IM_MOD_RL_xwd_.dll IM_MOD_RL_yuv_.dll PhotoFlare.exe ProductInformation Qt5Core.dll Qt5Gui.dll Qt5Network.dll Qt5PrintSupport.dll Qt5Widgets.dll SHORTCUTDIR de.qm_1 qgif.dll qicns.dll qico.dll qjpeg.dll qminimal.dll qsvg.dll qtga.dll qtiff.dll qwbmp.dll qwebp.dll qwindows.dll vcomp140.dll windowsprintersupport.dll"/>
+    <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
+    <ROW File="CORE_RL_Magick_.dll_1" Component_="CORE_RL_Magick_.dll" FileName="CORE_R~5.DLL|CORE_RL_Magick++_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_Magick++_.dll" SelfReg="false" NextFile="CORE_RL_ttf_.dll"/>
+    <ROW File="CORE_RL_bzlib_.dll" Component_="CORE_RL_bzlib_.dll" FileName="CORE_R~1.DLL|CORE_RL_bzlib_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_bzlib_.dll" SelfReg="false" NextFile="CORE_RL_lcms_.dll"/>
+    <ROW File="CORE_RL_jbig_.dll" Component_="CORE_RL_jbig_.dll" FileName="CORE_R~9.DLL|CORE_RL_jbig_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_jbig_.dll" SelfReg="false" NextFile="CORE_RL_jp2_.dll"/>
+    <ROW File="CORE_RL_jp2_.dll" Component_="CORE_RL_jp2_.dll" FileName="CORE_~10.DLL|CORE_RL_jp2_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_jp2_.dll" SelfReg="false" NextFile="CORE_RL_jpeg_.dll"/>
+    <ROW File="CORE_RL_jpeg_.dll" Component_="CORE_RL_jpeg_.dll" FileName="CORE_~11.DLL|CORE_RL_jpeg_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_jpeg_.dll" SelfReg="false" NextFile="CORE_RL_png_.dll"/>
+    <ROW File="CORE_RL_lcms_.dll" Component_="CORE_RL_lcms_.dll" FileName="CORE_R~2.DLL|CORE_RL_lcms_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_lcms_.dll" SelfReg="false" NextFile="CORE_RL_libxml_.dll"/>
+    <ROW File="CORE_RL_libxml_.dll" Component_="CORE_RL_libxml_.dll" FileName="CORE_R~3.DLL|CORE_RL_libxml_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_libxml_.dll" SelfReg="false" NextFile="CORE_RL_magick_.dll"/>
+    <ROW File="CORE_RL_magick_.dll" Component_="CORE_RL_magick_.dll" FileName="CORE_R~4.DLL|CORE_RL_magick_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_magick_.dll" SelfReg="false" NextFile="CORE_RL_Magick_.dll_1"/>
+    <ROW File="CORE_RL_png_.dll" Component_="CORE_RL_png_.dll" FileName="CORE_~12.DLL|CORE_RL_png_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_png_.dll" SelfReg="false" NextFile="CORE_RL_tiff_.dll"/>
+    <ROW File="CORE_RL_tiff_.dll" Component_="CORE_RL_tiff_.dll" FileName="CORE_~13.DLL|CORE_RL_tiff_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_tiff_.dll" SelfReg="false" NextFile="CORE_RL_webp_.dll"/>
+    <ROW File="CORE_RL_ttf_.dll" Component_="CORE_RL_ttf_.dll" FileName="CORE_R~6.DLL|CORE_RL_ttf_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_ttf_.dll" SelfReg="false" NextFile="CORE_RL_xlib_.dll"/>
+    <ROW File="CORE_RL_webp_.dll" Component_="CORE_RL_webp_.dll" FileName="CORE_~14.DLL|CORE_RL_webp_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_webp_.dll" SelfReg="false" NextFile="IM_MOD_RL_art_.dll"/>
+    <ROW File="CORE_RL_xlib_.dll" Component_="CORE_RL_xlib_.dll" FileName="CORE_R~7.DLL|CORE_RL_xlib_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_xlib_.dll" SelfReg="false" NextFile="CORE_RL_zlib_.dll"/>
+    <ROW File="CORE_RL_zlib_.dll" Component_="CORE_RL_zlib_.dll" FileName="CORE_R~8.DLL|CORE_RL_zlib_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\CORE_RL_zlib_.dll" SelfReg="false" NextFile="Qt5Core.dll"/>
+    <ROW File="IM_MOD_RL_art_.dll" Component_="IM_MOD_RL_art_.dll" FileName="IM_MOD~1.DLL|IM_MOD_RL_art_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_art_.dll" SelfReg="false" NextFile="IM_MOD_RL_avi_.dll"/>
+    <ROW File="IM_MOD_RL_avi_.dll" Component_="IM_MOD_RL_avi_.dll" FileName="IM_MOD~2.DLL|IM_MOD_RL_avi_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_avi_.dll" SelfReg="false" NextFile="IM_MOD_RL_avs_.dll"/>
+    <ROW File="IM_MOD_RL_avs_.dll" Component_="IM_MOD_RL_avs_.dll" FileName="IM_MOD~3.DLL|IM_MOD_RL_avs_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_avs_.dll" SelfReg="false" NextFile="IM_MOD_RL_bmp_.dll"/>
+    <ROW File="IM_MOD_RL_bmp_.dll" Component_="IM_MOD_RL_bmp_.dll" FileName="IM_MOD~4.DLL|IM_MOD_RL_bmp_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_bmp_.dll" SelfReg="false" NextFile="IM_MOD_RL_cals_.dll"/>
+    <ROW File="IM_MOD_RL_cals_.dll" Component_="IM_MOD_RL_cals_.dll" FileName="IM_MOD~5.DLL|IM_MOD_RL_cals_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_cals_.dll" SelfReg="false" NextFile="IM_MOD_RL_caption_.dll"/>
+    <ROW File="IM_MOD_RL_caption_.dll" Component_="IM_MOD_RL_caption_.dll" FileName="IM_MOD~6.DLL|IM_MOD_RL_caption_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_caption_.dll" SelfReg="false" NextFile="IM_MOD_RL_cineon_.dll"/>
+    <ROW File="IM_MOD_RL_cineon_.dll" Component_="IM_MOD_RL_cineon_.dll" FileName="IM_MOD~7.DLL|IM_MOD_RL_cineon_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_cineon_.dll" SelfReg="false" NextFile="IM_MOD_RL_clipboard_.dll"/>
+    <ROW File="IM_MOD_RL_clipboard_.dll" Component_="IM_MOD_RL_clipboard_.dll" FileName="IM_MOD~8.DLL|IM_MOD_RL_clipboard_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_clipboard_.dll" SelfReg="false" NextFile="IM_MOD_RL_cmyk_.dll"/>
+    <ROW File="IM_MOD_RL_cmyk_.dll" Component_="IM_MOD_RL_cmyk_.dll" FileName="IM_MOD~9.DLL|IM_MOD_RL_cmyk_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_cmyk_.dll" SelfReg="false" NextFile="IM_MOD_RL_cut_.dll"/>
+    <ROW File="IM_MOD_RL_cut_.dll" Component_="IM_MOD_RL_cut_.dll" FileName="IM_MO~10.DLL|IM_MOD_RL_cut_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_cut_.dll" SelfReg="false" NextFile="IM_MOD_RL_dcm_.dll"/>
+    <ROW File="IM_MOD_RL_dcm_.dll" Component_="IM_MOD_RL_dcm_.dll" FileName="IM_MO~11.DLL|IM_MOD_RL_dcm_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_dcm_.dll" SelfReg="false" NextFile="IM_MOD_RL_dcraw_.dll"/>
+    <ROW File="IM_MOD_RL_dcraw_.dll" Component_="IM_MOD_RL_dcraw_.dll" FileName="IM_MO~12.DLL|IM_MOD_RL_dcraw_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_dcraw_.dll" SelfReg="false" NextFile="IM_MOD_RL_dib_.dll"/>
+    <ROW File="IM_MOD_RL_dib_.dll" Component_="IM_MOD_RL_dib_.dll" FileName="IM_MO~13.DLL|IM_MOD_RL_dib_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_dib_.dll" SelfReg="false" NextFile="IM_MOD_RL_dps_.dll"/>
+    <ROW File="IM_MOD_RL_dps_.dll" Component_="IM_MOD_RL_dps_.dll" FileName="IM_MO~14.DLL|IM_MOD_RL_dps_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_dps_.dll" SelfReg="false" NextFile="IM_MOD_RL_dpx_.dll"/>
+    <ROW File="IM_MOD_RL_dpx_.dll" Component_="IM_MOD_RL_dpx_.dll" FileName="IM_MO~15.DLL|IM_MOD_RL_dpx_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_dpx_.dll" SelfReg="false" NextFile="IM_MOD_RL_emf_.dll"/>
+    <ROW File="IM_MOD_RL_emf_.dll" Component_="IM_MOD_RL_emf_.dll" FileName="IM_MO~16.DLL|IM_MOD_RL_emf_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_emf_.dll" SelfReg="false" NextFile="IM_MOD_RL_ept_.dll"/>
+    <ROW File="IM_MOD_RL_ept_.dll" Component_="IM_MOD_RL_ept_.dll" FileName="IM_MO~17.DLL|IM_MOD_RL_ept_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_ept_.dll" SelfReg="false" NextFile="IM_MOD_RL_fax_.dll"/>
+    <ROW File="IM_MOD_RL_fax_.dll" Component_="IM_MOD_RL_fax_.dll" FileName="IM_MO~18.DLL|IM_MOD_RL_fax_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_fax_.dll" SelfReg="false" NextFile="IM_MOD_RL_fits_.dll"/>
+    <ROW File="IM_MOD_RL_fits_.dll" Component_="IM_MOD_RL_fits_.dll" FileName="IM_MO~19.DLL|IM_MOD_RL_fits_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_fits_.dll" SelfReg="false" NextFile="IM_MOD_RL_fpx_.dll"/>
+    <ROW File="IM_MOD_RL_fpx_.dll" Component_="IM_MOD_RL_fpx_.dll" FileName="IM_MO~20.DLL|IM_MOD_RL_fpx_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_fpx_.dll" SelfReg="false" NextFile="IM_MOD_RL_gif_.dll"/>
+    <ROW File="IM_MOD_RL_gif_.dll" Component_="IM_MOD_RL_gif_.dll" FileName="IM_MO~21.DLL|IM_MOD_RL_gif_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_gif_.dll" SelfReg="false" NextFile="IM_MOD_RL_gradient_.dll"/>
+    <ROW File="IM_MOD_RL_gradient_.dll" Component_="IM_MOD_RL_gradient_.dll" FileName="IM_MO~22.DLL|IM_MOD_RL_gradient_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_gradient_.dll" SelfReg="false" NextFile="IM_MOD_RL_gray_.dll"/>
+    <ROW File="IM_MOD_RL_gray_.dll" Component_="IM_MOD_RL_gray_.dll" FileName="IM_MO~23.DLL|IM_MOD_RL_gray_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_gray_.dll" SelfReg="false" NextFile="IM_MOD_RL_histogram_.dll"/>
+    <ROW File="IM_MOD_RL_histogram_.dll" Component_="IM_MOD_RL_histogram_.dll" FileName="IM_MO~24.DLL|IM_MOD_RL_histogram_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_histogram_.dll" SelfReg="false" NextFile="IM_MOD_RL_hrz_.dll"/>
+    <ROW File="IM_MOD_RL_hrz_.dll" Component_="IM_MOD_RL_hrz_.dll" FileName="IM_MO~25.DLL|IM_MOD_RL_hrz_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_hrz_.dll" SelfReg="false" NextFile="IM_MOD_RL_html_.dll"/>
+    <ROW File="IM_MOD_RL_html_.dll" Component_="IM_MOD_RL_html_.dll" FileName="IM_MO~26.DLL|IM_MOD_RL_html_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_html_.dll" SelfReg="false" NextFile="IM_MOD_RL_icon_.dll"/>
+    <ROW File="IM_MOD_RL_icon_.dll" Component_="IM_MOD_RL_icon_.dll" FileName="IM_MO~27.DLL|IM_MOD_RL_icon_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_icon_.dll" SelfReg="false" NextFile="IM_MOD_RL_identity_.dll"/>
+    <ROW File="IM_MOD_RL_identity_.dll" Component_="IM_MOD_RL_identity_.dll" FileName="IM_MO~28.DLL|IM_MOD_RL_identity_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_identity_.dll" SelfReg="false" NextFile="IM_MOD_RL_info_.dll"/>
+    <ROW File="IM_MOD_RL_info_.dll" Component_="IM_MOD_RL_info_.dll" FileName="IM_MO~29.DLL|IM_MOD_RL_info_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_info_.dll" SelfReg="false" NextFile="IM_MOD_RL_jbig_.dll"/>
+    <ROW File="IM_MOD_RL_jbig_.dll" Component_="IM_MOD_RL_jbig_.dll" FileName="IM_MO~30.DLL|IM_MOD_RL_jbig_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_jbig_.dll" SelfReg="false" NextFile="IM_MOD_RL_jnx_.dll"/>
+    <ROW File="IM_MOD_RL_jnx_.dll" Component_="IM_MOD_RL_jnx_.dll" FileName="IM_MO~31.DLL|IM_MOD_RL_jnx_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_jnx_.dll" SelfReg="false" NextFile="IM_MOD_RL_jp2_.dll"/>
+    <ROW File="IM_MOD_RL_jp2_.dll" Component_="IM_MOD_RL_jp2_.dll" FileName="IM_MO~32.DLL|IM_MOD_RL_jp2_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_jp2_.dll" SelfReg="false" NextFile="IM_MOD_RL_jpeg_.dll"/>
+    <ROW File="IM_MOD_RL_jpeg_.dll" Component_="IM_MOD_RL_jpeg_.dll" FileName="IM_MO~33.DLL|IM_MOD_RL_jpeg_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_jpeg_.dll" SelfReg="false" NextFile="IM_MOD_RL_label_.dll"/>
+    <ROW File="IM_MOD_RL_label_.dll" Component_="IM_MOD_RL_label_.dll" FileName="IM_MO~34.DLL|IM_MOD_RL_label_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_label_.dll" SelfReg="false" NextFile="IM_MOD_RL_locale_.dll"/>
+    <ROW File="IM_MOD_RL_locale_.dll" Component_="IM_MOD_RL_locale_.dll" FileName="IM_MO~35.DLL|IM_MOD_RL_locale_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_locale_.dll" SelfReg="false" NextFile="IM_MOD_RL_logo_.dll"/>
+    <ROW File="IM_MOD_RL_logo_.dll" Component_="IM_MOD_RL_logo_.dll" FileName="IM_MO~36.DLL|IM_MOD_RL_logo_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_logo_.dll" SelfReg="false" NextFile="IM_MOD_RL_mac_.dll"/>
+    <ROW File="IM_MOD_RL_mac_.dll" Component_="IM_MOD_RL_mac_.dll" FileName="IM_MO~37.DLL|IM_MOD_RL_mac_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_mac_.dll" SelfReg="false" NextFile="IM_MOD_RL_map_.dll"/>
+    <ROW File="IM_MOD_RL_map_.dll" Component_="IM_MOD_RL_map_.dll" FileName="IM_MO~38.DLL|IM_MOD_RL_map_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_map_.dll" SelfReg="false" NextFile="IM_MOD_RL_mat_.dll"/>
+    <ROW File="IM_MOD_RL_mat_.dll" Component_="IM_MOD_RL_mat_.dll" FileName="IM_MO~39.DLL|IM_MOD_RL_mat_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_mat_.dll" SelfReg="false" NextFile="IM_MOD_RL_matte_.dll"/>
+    <ROW File="IM_MOD_RL_matte_.dll" Component_="IM_MOD_RL_matte_.dll" FileName="IM_MO~40.DLL|IM_MOD_RL_matte_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_matte_.dll" SelfReg="false" NextFile="IM_MOD_RL_meta_.dll"/>
+    <ROW File="IM_MOD_RL_meta_.dll" Component_="IM_MOD_RL_meta_.dll" FileName="IM_MO~41.DLL|IM_MOD_RL_meta_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_meta_.dll" SelfReg="false" NextFile="IM_MOD_RL_miff_.dll"/>
+    <ROW File="IM_MOD_RL_miff_.dll" Component_="IM_MOD_RL_miff_.dll" FileName="IM_MO~42.DLL|IM_MOD_RL_miff_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_miff_.dll" SelfReg="false" NextFile="IM_MOD_RL_mono_.dll"/>
+    <ROW File="IM_MOD_RL_mono_.dll" Component_="IM_MOD_RL_mono_.dll" FileName="IM_MO~43.DLL|IM_MOD_RL_mono_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_mono_.dll" SelfReg="false" NextFile="IM_MOD_RL_mpc_.dll"/>
+    <ROW File="IM_MOD_RL_mpc_.dll" Component_="IM_MOD_RL_mpc_.dll" FileName="IM_MO~44.DLL|IM_MOD_RL_mpc_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_mpc_.dll" SelfReg="false" NextFile="IM_MOD_RL_mpeg_.dll"/>
+    <ROW File="IM_MOD_RL_mpeg_.dll" Component_="IM_MOD_RL_mpeg_.dll" FileName="IM_MO~45.DLL|IM_MOD_RL_mpeg_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_mpeg_.dll" SelfReg="false" NextFile="IM_MOD_RL_mpr_.dll"/>
+    <ROW File="IM_MOD_RL_mpr_.dll" Component_="IM_MOD_RL_mpr_.dll" FileName="IM_MO~46.DLL|IM_MOD_RL_mpr_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_mpr_.dll" SelfReg="false" NextFile="IM_MOD_RL_msl_.dll"/>
+    <ROW File="IM_MOD_RL_msl_.dll" Component_="IM_MOD_RL_msl_.dll" FileName="IM_MO~47.DLL|IM_MOD_RL_msl_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_msl_.dll" SelfReg="false" NextFile="IM_MOD_RL_mtv_.dll"/>
+    <ROW File="IM_MOD_RL_mtv_.dll" Component_="IM_MOD_RL_mtv_.dll" FileName="IM_MO~48.DLL|IM_MOD_RL_mtv_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_mtv_.dll" SelfReg="false" NextFile="IM_MOD_RL_mvg_.dll"/>
+    <ROW File="IM_MOD_RL_mvg_.dll" Component_="IM_MOD_RL_mvg_.dll" FileName="IM_MO~49.DLL|IM_MOD_RL_mvg_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_mvg_.dll" SelfReg="false" NextFile="IM_MOD_RL_null_.dll"/>
+    <ROW File="IM_MOD_RL_null_.dll" Component_="IM_MOD_RL_null_.dll" FileName="IM_MO~50.DLL|IM_MOD_RL_null_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_null_.dll" SelfReg="false" NextFile="IM_MOD_RL_otb_.dll"/>
+    <ROW File="IM_MOD_RL_otb_.dll" Component_="IM_MOD_RL_otb_.dll" FileName="IM_MO~51.DLL|IM_MOD_RL_otb_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_otb_.dll" SelfReg="false" NextFile="IM_MOD_RL_palm_.dll"/>
+    <ROW File="IM_MOD_RL_palm_.dll" Component_="IM_MOD_RL_palm_.dll" FileName="IM_MO~52.DLL|IM_MOD_RL_palm_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_palm_.dll" SelfReg="false" NextFile="IM_MOD_RL_pcd_.dll"/>
+    <ROW File="IM_MOD_RL_pcd_.dll" Component_="IM_MOD_RL_pcd_.dll" FileName="IM_MO~53.DLL|IM_MOD_RL_pcd_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_pcd_.dll" SelfReg="false" NextFile="IM_MOD_RL_pcl_.dll"/>
+    <ROW File="IM_MOD_RL_pcl_.dll" Component_="IM_MOD_RL_pcl_.dll" FileName="IM_MO~54.DLL|IM_MOD_RL_pcl_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_pcl_.dll" SelfReg="false" NextFile="IM_MOD_RL_pcx_.dll"/>
+    <ROW File="IM_MOD_RL_pcx_.dll" Component_="IM_MOD_RL_pcx_.dll" FileName="IM_MO~55.DLL|IM_MOD_RL_pcx_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_pcx_.dll" SelfReg="false" NextFile="IM_MOD_RL_pdb_.dll"/>
+    <ROW File="IM_MOD_RL_pdb_.dll" Component_="IM_MOD_RL_pdb_.dll" FileName="IM_MO~56.DLL|IM_MOD_RL_pdb_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_pdb_.dll" SelfReg="false" NextFile="IM_MOD_RL_pdf_.dll"/>
+    <ROW File="IM_MOD_RL_pdf_.dll" Component_="IM_MOD_RL_pdf_.dll" FileName="IM_MO~57.DLL|IM_MOD_RL_pdf_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_pdf_.dll" SelfReg="false" NextFile="IM_MOD_RL_pict_.dll"/>
+    <ROW File="IM_MOD_RL_pict_.dll" Component_="IM_MOD_RL_pict_.dll" FileName="IM_MO~58.DLL|IM_MOD_RL_pict_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_pict_.dll" SelfReg="false" NextFile="IM_MOD_RL_pix_.dll"/>
+    <ROW File="IM_MOD_RL_pix_.dll" Component_="IM_MOD_RL_pix_.dll" FileName="IM_MO~59.DLL|IM_MOD_RL_pix_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_pix_.dll" SelfReg="false" NextFile="IM_MOD_RL_plasma_.dll"/>
+    <ROW File="IM_MOD_RL_plasma_.dll" Component_="IM_MOD_RL_plasma_.dll" FileName="IM_MO~60.DLL|IM_MOD_RL_plasma_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_plasma_.dll" SelfReg="false" NextFile="IM_MOD_RL_png_.dll"/>
+    <ROW File="IM_MOD_RL_png_.dll" Component_="IM_MOD_RL_png_.dll" FileName="IM_MO~61.DLL|IM_MOD_RL_png_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_png_.dll" SelfReg="false" NextFile="IM_MOD_RL_pnm_.dll"/>
+    <ROW File="IM_MOD_RL_pnm_.dll" Component_="IM_MOD_RL_pnm_.dll" FileName="IM_MO~62.DLL|IM_MOD_RL_pnm_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_pnm_.dll" SelfReg="false" NextFile="IM_MOD_RL_preview_.dll"/>
+    <ROW File="IM_MOD_RL_preview_.dll" Component_="IM_MOD_RL_preview_.dll" FileName="IM_MO~63.DLL|IM_MOD_RL_preview_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_preview_.dll" SelfReg="false" NextFile="IM_MOD_RL_ps_.dll"/>
+    <ROW File="IM_MOD_RL_ps2_.dll" Component_="IM_MOD_RL_ps2_.dll" FileName="IM_MO~65.DLL|IM_MOD_RL_ps2_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_ps2_.dll" SelfReg="false" NextFile="IM_MOD_RL_ps3_.dll"/>
+    <ROW File="IM_MOD_RL_ps3_.dll" Component_="IM_MOD_RL_ps3_.dll" FileName="IM_MO~66.DLL|IM_MOD_RL_ps3_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_ps3_.dll" SelfReg="false" NextFile="IM_MOD_RL_psd_.dll"/>
+    <ROW File="IM_MOD_RL_ps_.dll" Component_="IM_MOD_RL_ps_.dll" FileName="IM_MO~64.DLL|IM_MOD_RL_ps_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_ps_.dll" SelfReg="false" NextFile="IM_MOD_RL_ps2_.dll"/>
+    <ROW File="IM_MOD_RL_psd_.dll" Component_="IM_MOD_RL_psd_.dll" FileName="IM_MO~67.DLL|IM_MOD_RL_psd_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_psd_.dll" SelfReg="false" NextFile="IM_MOD_RL_pwp_.dll"/>
+    <ROW File="IM_MOD_RL_pwp_.dll" Component_="IM_MOD_RL_pwp_.dll" FileName="IM_MO~68.DLL|IM_MOD_RL_pwp_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_pwp_.dll" SelfReg="false" NextFile="IM_MOD_RL_rgb_.dll"/>
+    <ROW File="IM_MOD_RL_rgb_.dll" Component_="IM_MOD_RL_rgb_.dll" FileName="IM_MO~69.DLL|IM_MOD_RL_rgb_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_rgb_.dll" SelfReg="false" NextFile="IM_MOD_RL_rla_.dll"/>
+    <ROW File="IM_MOD_RL_rla_.dll" Component_="IM_MOD_RL_rla_.dll" FileName="IM_MO~70.DLL|IM_MOD_RL_rla_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_rla_.dll" SelfReg="false" NextFile="IM_MOD_RL_rle_.dll"/>
+    <ROW File="IM_MOD_RL_rle_.dll" Component_="IM_MOD_RL_rle_.dll" FileName="IM_MO~71.DLL|IM_MOD_RL_rle_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_rle_.dll" SelfReg="false" NextFile="IM_MOD_RL_sct_.dll"/>
+    <ROW File="IM_MOD_RL_sct_.dll" Component_="IM_MOD_RL_sct_.dll" FileName="IM_MO~72.DLL|IM_MOD_RL_sct_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_sct_.dll" SelfReg="false" NextFile="IM_MOD_RL_sfw_.dll"/>
+    <ROW File="IM_MOD_RL_sfw_.dll" Component_="IM_MOD_RL_sfw_.dll" FileName="IM_MO~73.DLL|IM_MOD_RL_sfw_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_sfw_.dll" SelfReg="false" NextFile="IM_MOD_RL_sgi_.dll"/>
+    <ROW File="IM_MOD_RL_sgi_.dll" Component_="IM_MOD_RL_sgi_.dll" FileName="IM_MO~74.DLL|IM_MOD_RL_sgi_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_sgi_.dll" SelfReg="false" NextFile="IM_MOD_RL_stegano_.dll"/>
+    <ROW File="IM_MOD_RL_stegano_.dll" Component_="IM_MOD_RL_stegano_.dll" FileName="IM_MO~75.DLL|IM_MOD_RL_stegano_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_stegano_.dll" SelfReg="false" NextFile="IM_MOD_RL_sun_.dll"/>
+    <ROW File="IM_MOD_RL_sun_.dll" Component_="IM_MOD_RL_sun_.dll" FileName="IM_MO~76.DLL|IM_MOD_RL_sun_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_sun_.dll" SelfReg="false" NextFile="IM_MOD_RL_svg_.dll"/>
+    <ROW File="IM_MOD_RL_svg_.dll" Component_="IM_MOD_RL_svg_.dll" FileName="IM_MO~77.DLL|IM_MOD_RL_svg_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_svg_.dll" SelfReg="false" NextFile="IM_MOD_RL_tga_.dll"/>
+    <ROW File="IM_MOD_RL_tga_.dll" Component_="IM_MOD_RL_tga_.dll" FileName="IM_MO~78.DLL|IM_MOD_RL_tga_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_tga_.dll" SelfReg="false" NextFile="IM_MOD_RL_tiff_.dll"/>
+    <ROW File="IM_MOD_RL_tiff_.dll" Component_="IM_MOD_RL_tiff_.dll" FileName="IM_MO~79.DLL|IM_MOD_RL_tiff_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_tiff_.dll" SelfReg="false" NextFile="IM_MOD_RL_tile_.dll"/>
+    <ROW File="IM_MOD_RL_tile_.dll" Component_="IM_MOD_RL_tile_.dll" FileName="IM_MO~80.DLL|IM_MOD_RL_tile_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_tile_.dll" SelfReg="false" NextFile="IM_MOD_RL_tim_.dll"/>
+    <ROW File="IM_MOD_RL_tim_.dll" Component_="IM_MOD_RL_tim_.dll" FileName="IM_MO~81.DLL|IM_MOD_RL_tim_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_tim_.dll" SelfReg="false" NextFile="IM_MOD_RL_topol_.dll"/>
+    <ROW File="IM_MOD_RL_topol_.dll" Component_="IM_MOD_RL_topol_.dll" FileName="IM_MO~82.DLL|IM_MOD_RL_topol_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_topol_.dll" SelfReg="false" NextFile="IM_MOD_RL_ttf_.dll"/>
+    <ROW File="IM_MOD_RL_ttf_.dll" Component_="IM_MOD_RL_ttf_.dll" FileName="IM_MO~83.DLL|IM_MOD_RL_ttf_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_ttf_.dll" SelfReg="false" NextFile="IM_MOD_RL_txt_.dll"/>
+    <ROW File="IM_MOD_RL_txt_.dll" Component_="IM_MOD_RL_txt_.dll" FileName="IM_MO~84.DLL|IM_MOD_RL_txt_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_txt_.dll" SelfReg="false" NextFile="IM_MOD_RL_uil_.dll"/>
+    <ROW File="IM_MOD_RL_uil_.dll" Component_="IM_MOD_RL_uil_.dll" FileName="IM_MO~85.DLL|IM_MOD_RL_uil_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_uil_.dll" SelfReg="false" NextFile="IM_MOD_RL_url_.dll"/>
+    <ROW File="IM_MOD_RL_url_.dll" Component_="IM_MOD_RL_url_.dll" FileName="IM_MO~86.DLL|IM_MOD_RL_url_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_url_.dll" SelfReg="false" NextFile="IM_MOD_RL_uyvy_.dll"/>
+    <ROW File="IM_MOD_RL_uyvy_.dll" Component_="IM_MOD_RL_uyvy_.dll" FileName="IM_MO~87.DLL|IM_MOD_RL_uyvy_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_uyvy_.dll" SelfReg="false" NextFile="IM_MOD_RL_vicar_.dll"/>
+    <ROW File="IM_MOD_RL_vicar_.dll" Component_="IM_MOD_RL_vicar_.dll" FileName="IM_MO~88.DLL|IM_MOD_RL_vicar_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_vicar_.dll" SelfReg="false" NextFile="IM_MOD_RL_vid_.dll"/>
+    <ROW File="IM_MOD_RL_vid_.dll" Component_="IM_MOD_RL_vid_.dll" FileName="IM_MO~89.DLL|IM_MOD_RL_vid_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_vid_.dll" SelfReg="false" NextFile="IM_MOD_RL_viff_.dll"/>
+    <ROW File="IM_MOD_RL_viff_.dll" Component_="IM_MOD_RL_viff_.dll" FileName="IM_MO~90.DLL|IM_MOD_RL_viff_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_viff_.dll" SelfReg="false" NextFile="IM_MOD_RL_wbmp_.dll"/>
+    <ROW File="IM_MOD_RL_wbmp_.dll" Component_="IM_MOD_RL_wbmp_.dll" FileName="IM_MO~91.DLL|IM_MOD_RL_wbmp_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_wbmp_.dll" SelfReg="false" NextFile="IM_MOD_RL_webp_.dll"/>
+    <ROW File="IM_MOD_RL_webp_.dll" Component_="IM_MOD_RL_webp_.dll" FileName="IM_MO~92.DLL|IM_MOD_RL_webp_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_webp_.dll" SelfReg="false" NextFile="IM_MOD_RL_wmf_.dll"/>
+    <ROW File="IM_MOD_RL_wmf_.dll" Component_="IM_MOD_RL_wmf_.dll" FileName="IM_MO~93.DLL|IM_MOD_RL_wmf_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_wmf_.dll" SelfReg="false" NextFile="IM_MOD_RL_wpg_.dll"/>
+    <ROW File="IM_MOD_RL_wpg_.dll" Component_="IM_MOD_RL_wpg_.dll" FileName="IM_MO~94.DLL|IM_MOD_RL_wpg_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_wpg_.dll" SelfReg="false" NextFile="IM_MOD_RL_x_.dll"/>
+    <ROW File="IM_MOD_RL_x_.dll" Component_="IM_MOD_RL_x_.dll" FileName="IM_MO~95.DLL|IM_MOD_RL_x_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_x_.dll" SelfReg="false" NextFile="IM_MOD_RL_xbm_.dll"/>
+    <ROW File="IM_MOD_RL_xbm_.dll" Component_="IM_MOD_RL_xbm_.dll" FileName="IM_MO~96.DLL|IM_MOD_RL_xbm_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_xbm_.dll" SelfReg="false" NextFile="IM_MOD_RL_xc_.dll"/>
+    <ROW File="IM_MOD_RL_xc_.dll" Component_="IM_MOD_RL_xc_.dll" FileName="IM_MO~97.DLL|IM_MOD_RL_xc_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_xc_.dll" SelfReg="false" NextFile="IM_MOD_RL_xcf_.dll"/>
+    <ROW File="IM_MOD_RL_xcf_.dll" Component_="IM_MOD_RL_xcf_.dll" FileName="IM_MO~98.DLL|IM_MOD_RL_xcf_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_xcf_.dll" SelfReg="false" NextFile="IM_MOD_RL_xpm_.dll"/>
+    <ROW File="IM_MOD_RL_xpm_.dll" Component_="IM_MOD_RL_xpm_.dll" FileName="IM_MO~99.DLL|IM_MOD_RL_xpm_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_xpm_.dll" SelfReg="false" NextFile="IM_MOD_RL_xtrn_.dll"/>
+    <ROW File="IM_MOD_RL_xtrn_.dll" Component_="IM_MOD_RL_xtrn_.dll" FileName="IM_M~100.DLL|IM_MOD_RL_xtrn_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_xtrn_.dll" SelfReg="false" NextFile="IM_MOD_RL_xwd_.dll"/>
+    <ROW File="IM_MOD_RL_xwd_.dll" Component_="IM_MOD_RL_xwd_.dll" FileName="IM_M~101.DLL|IM_MOD_RL_xwd_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_xwd_.dll" SelfReg="false" NextFile="IM_MOD_RL_yuv_.dll"/>
+    <ROW File="IM_MOD_RL_yuv_.dll" Component_="IM_MOD_RL_yuv_.dll" FileName="IM_M~102.DLL|IM_MOD_RL_yuv_.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\IM_MOD_RL_yuv_.dll" SelfReg="false" NextFile="vcomp140.dll"/>
+    <ROW File="PhotoFlare.exe" Component_="PhotoFlare.exe" FileName="PHOTOF~1.EXE|photoflare.exe" Version="1.5.5.0" Attributes="0" SourcePath="PhotoFlare_Win_AIP\PhotoFlare.exe" SelfReg="false" NextFile="CORE_RL_bzlib_.dll" DigSign="true"/>
+    <ROW File="Qt5Core.dll" Component_="Qt5Core.dll" FileName="Qt5Core.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\Qt5Core.dll" SelfReg="false" NextFile="Qt5Gui.dll"/>
+    <ROW File="Qt5Gui.dll" Component_="Qt5Gui.dll" FileName="Qt5Gui.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\Qt5Gui.dll" SelfReg="false" NextFile="Qt5Network.dll"/>
+    <ROW File="Qt5Network.dll" Component_="Qt5Network.dll" FileName="QT5NET~1.DLL|Qt5Network.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\Qt5Network.dll" SelfReg="false" NextFile="Qt5PrintSupport.dll"/>
+    <ROW File="Qt5PrintSupport.dll" Component_="Qt5PrintSupport.dll" FileName="QT5PRI~1.DLL|Qt5PrintSupport.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\Qt5PrintSupport.dll" SelfReg="false" NextFile="Qt5Widgets.dll"/>
+    <ROW File="Qt5Widgets.dll" Component_="Qt5Widgets.dll" FileName="QT5WID~1.DLL|Qt5Widgets.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\Qt5Widgets.dll" SelfReg="false" NextFile="qgif.dll"/>
+    <ROW File="cs.qm" Component_="de.qm_1" FileName="cs.qm" Attributes="0" SourcePath="PhotoFlare_Win_AIP\languages\cs.qm" SelfReg="false"/>
+    <ROW File="de.qm_1" Component_="de.qm_1" FileName="de.qm" Attributes="0" SourcePath="PhotoFlare_Win_AIP\languages\de.qm" SelfReg="false" NextFile="en.qm_1"/>
+    <ROW File="en.qm_1" Component_="de.qm_1" FileName="en.qm" Attributes="0" SourcePath="PhotoFlare_Win_AIP\languages\en.qm" SelfReg="false" NextFile="fr.qm_1"/>
+    <ROW File="fr.qm_1" Component_="de.qm_1" FileName="fr.qm" Attributes="0" SourcePath="PhotoFlare_Win_AIP\languages\fr.qm" SelfReg="false" NextFile="nl.qm_1"/>
+    <ROW File="nl.qm_1" Component_="de.qm_1" FileName="nl.qm" Attributes="0" SourcePath="PhotoFlare_Win_AIP\languages\nl.qm" SelfReg="false" NextFile="zh_TW.qm_1"/>
+    <ROW File="qgif.dll" Component_="qgif.dll" FileName="qgif.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\imageformats\qgif.dll" SelfReg="false" NextFile="qicns.dll"/>
+    <ROW File="qicns.dll" Component_="qicns.dll" FileName="qicns.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\imageformats\qicns.dll" SelfReg="false" NextFile="qico.dll"/>
+    <ROW File="qico.dll" Component_="qico.dll" FileName="qico.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\imageformats\qico.dll" SelfReg="false" NextFile="qjpeg.dll"/>
+    <ROW File="qjpeg.dll" Component_="qjpeg.dll" FileName="qjpeg.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\imageformats\qjpeg.dll" SelfReg="false" NextFile="qsvg.dll"/>
+    <ROW File="qminimal.dll" Component_="qminimal.dll" FileName="qminimal.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\platforms\qminimal.dll" SelfReg="false" NextFile="qwindows.dll"/>
+    <ROW File="qsvg.dll" Component_="qsvg.dll" FileName="qsvg.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\imageformats\qsvg.dll" SelfReg="false" NextFile="qtga.dll"/>
+    <ROW File="qtga.dll" Component_="qtga.dll" FileName="qtga.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\imageformats\qtga.dll" SelfReg="false" NextFile="qtiff.dll"/>
+    <ROW File="qtiff.dll" Component_="qtiff.dll" FileName="qtiff.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\imageformats\qtiff.dll" SelfReg="false" NextFile="qwbmp.dll"/>
+    <ROW File="qwbmp.dll" Component_="qwbmp.dll" FileName="qwbmp.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\imageformats\qwbmp.dll" SelfReg="false" NextFile="qwebp.dll"/>
+    <ROW File="qwebp.dll" Component_="qwebp.dll" FileName="qwebp.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\imageformats\qwebp.dll" SelfReg="false" NextFile="qminimal.dll"/>
+    <ROW File="qwindows.dll" Component_="qwindows.dll" FileName="qwindows.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\platforms\qwindows.dll" SelfReg="false" NextFile="windowsprintersupport.dll"/>
+    <ROW File="vcomp140.dll" Component_="vcomp140.dll" FileName="vcomp140.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\vcomp140.dll" SelfReg="false" NextFile="de.qm_1"/>
+    <ROW File="windowsprintersupport.dll" Component_="windowsprintersupport.dll" FileName="WINDOW~1.DLL|windowsprintersupport.dll" Attributes="0" SourcePath="PhotoFlare_Win_AIP\printsupport\windowsprintersupport.dll" SelfReg="false" NextFile="CORE_RL_jbig_.dll"/>
+    <ROW File="zh_TW.qm_1" Component_="de.qm_1" FileName="zh_TW.qm" Attributes="0" SourcePath="PhotoFlare_Win_AIP\languages\zh_TW.qm" SelfReg="false" NextFile="cs.qm"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" Languages="en" InstallationType="4" UseLargeSchema="true" MsiPackageType="x64"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
+    <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
+    <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
+    <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
+    <ROW Fragment="FolderDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\FolderDlg.aip"/>
+    <ROW Fragment="MaintenanceTypeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceTypeDlg.aip"/>
+    <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceWelcomeDlg.aip"/>
+    <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
+    <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
+    <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
+    <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
+    <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
+    <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>
+    <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>
+    <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
+    <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
+    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_INSTALL" Ordering="201"/>
+    <ROW Dialog_="FolderDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="197"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="201"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="1"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="399" Options="1"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
+    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
+    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
+    <ROW Dialog_="FolderDlg" Control_="Browse" Event="[_BrowseProperty]" Argument="APPDIR" Condition="1" Ordering="100" MsiKey="FolderDlg#Browse#[_BrowseProperty]#APPDIR#1"/>
+    <ROW Dialog_="FolderDlg" Control_="Next" Event="SetTargetPath" Argument="APPDIR" Condition="1" Ordering="200" MsiKey="FolderDlg#Next#SetTargetPath#APPDIR#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="[InstallMode]" Argument="Change" Condition="1" Ordering="100" MsiKey="MaintenanceTypeDlg#ChangeButton#[InstallMode]#Change#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="[Progress1]" Argument="[CtrlEvtChanging]" Condition="1" Ordering="200" MsiKey="MaintenanceTypeDlg#ChangeButton#[Progress1]#[CtrlEvtChanging]#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="[Progress2]" Argument="[CtrlEvtchanges]" Condition="1" Ordering="300" MsiKey="MaintenanceTypeDlg#ChangeButton#[Progress2]#[CtrlEvtchanges]#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="[AI_INSTALL_MODE]" Argument="Change" Condition="1" Ordering="400" MsiKey="MaintenanceTypeDlg#ChangeButton#[AI_INSTALL_MODE]#Change#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="[AI_CommitButton]" Argument="ButtonText_Install" Condition="1" Ordering="500" MsiKey="MaintenanceTypeDlg#ChangeButton#[AI_CommitButton]#ButtonText_Install#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="[InstallMode]" Argument="Remove" Condition="1" Ordering="100" MsiKey="MaintenanceTypeDlg#RemoveButton#[InstallMode]#Remove#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="[Progress1]" Argument="[CtrlEvtRemoving]" Condition="1" Ordering="200" MsiKey="MaintenanceTypeDlg#RemoveButton#[Progress1]#[CtrlEvtRemoving]#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="[Progress2]" Argument="[CtrlEvtremoves]" Condition="1" Ordering="300" MsiKey="MaintenanceTypeDlg#RemoveButton#[Progress2]#[CtrlEvtremoves]#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="[AI_INSTALL_MODE]" Argument="Remove" Condition="1" Ordering="500" MsiKey="MaintenanceTypeDlg#RemoveButton#[AI_INSTALL_MODE]#Remove#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="[AI_CommitButton]" Argument="ButtonText_Remove" Condition="1" Ordering="600" MsiKey="MaintenanceTypeDlg#RemoveButton#[AI_CommitButton]#ButtonText_Remove#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="[InstallMode]" Argument="Repair" Condition="1" Ordering="100" MsiKey="MaintenanceTypeDlg#RepairButton#[InstallMode]#Repair#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="[Progress1]" Argument="[CtrlEvtRepairing]" Condition="1" Ordering="200" MsiKey="MaintenanceTypeDlg#RepairButton#[Progress1]#[CtrlEvtRepairing]#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="[Progress2]" Argument="[CtrlEvtrepairs]" Condition="1" Ordering="300" MsiKey="MaintenanceTypeDlg#RepairButton#[Progress2]#[CtrlEvtrepairs]#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="[AI_INSTALL_MODE]" Argument="Repair" Condition="1" Ordering="500" MsiKey="MaintenanceTypeDlg#RepairButton#[AI_INSTALL_MODE]#Repair#1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="[AI_CommitButton]" Argument="ButtonText_Repair" Condition="1" Ordering="600" MsiKey="MaintenanceTypeDlg#RepairButton#[AI_CommitButton]#ButtonText_Repair#1"/>
+    <ROW Dialog_="AdminBrowseDlg" Control_="Cancel" Event="EndDialog" Argument="Return" Condition="1" Ordering="200" MsiKey="AdminBrowseDlg#Cancel#EndDialog#Return#1"/>
+    <ROW Dialog_="AdminBrowseDlg" Control_="OK" Event="EndDialog" Argument="Return" Condition="1" Ordering="200" MsiKey="AdminBrowseDlg#OK#EndDialog#Return#1"/>
+    <ROW Dialog_="AdminBrowseDlg" Control_="OK" Event="SetTargetPath" Argument="TARGETDIR" Condition="1" Ordering="100" MsiKey="AdminBrowseDlg#OK#SetTargetPath#TARGETDIR#1"/>
+    <ROW Dialog_="AdminInstallPointDlg" Control_="Next" Event="SetTargetPath" Argument="TARGETDIR" Condition="1" Ordering="100" MsiKey="AdminInstallPointDlg#Next#SetTargetPath#TARGETDIR#1"/>
+    <ROW Dialog_="AdminWelcomeDlg" Control_="Next" Event="[InstallMode]" Argument="Server Image" Condition="1" Ordering="100" MsiKey="AdminWelcomeDlg#Next#[InstallMode]#Server Image#1"/>
+    <ROW Dialog_="BrowseDlg" Control_="Cancel" Event="EndDialog" Argument="Return" Condition="1" Ordering="200" MsiKey="BrowseDlg#Cancel#EndDialog#Return#1"/>
+    <ROW Dialog_="BrowseDlg" Control_="OK" Event="EndDialog" Argument="Return" Condition="1" Ordering="200" MsiKey="BrowseDlg#OK#EndDialog#Return#1"/>
+    <ROW Dialog_="BrowseDlg" Control_="OK" Event="SetTargetPath" Argument="[_BrowseProperty]" Condition="1" Ordering="100" MsiKey="BrowseDlg#OK#SetTargetPath#[_BrowseProperty]#1"/>
+    <ROW Dialog_="CancelDlg" Control_="No" Event="EndDialog" Argument="Return" Condition="1" Ordering="100" MsiKey="CancelDlg#No#EndDialog#Return#1"/>
+    <ROW Dialog_="CancelDlg" Control_="Yes" Event="EndDialog" Argument="Exit" Condition="1" Ordering="100" MsiKey="CancelDlg#Yes#EndDialog#Exit#1"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="DoAction" Argument="AI_InstallModeCheck" Condition="AI_MAINT" Ordering="100" MsiKey="CustomizeDlg#Next#DoAction#AI_InstallModeCheck#AI_MAINT"/>
+    <ROW Dialog_="DiskCostDlg" Control_="OK" Event="EndDialog" Argument="Return" Condition="1" Ordering="100" MsiKey="DiskCostDlg#OK#EndDialog#Return#1"/>
+    <ROW Dialog_="ErrorDlg" Control_="A" Event="EndDialog" Argument="ErrorAbort" Condition="1" Ordering="100" MsiKey="ErrorDlg#A#EndDialog#ErrorAbort#1"/>
+    <ROW Dialog_="ErrorDlg" Control_="C" Event="EndDialog" Argument="ErrorCancel" Condition="1" Ordering="100" MsiKey="ErrorDlg#C#EndDialog#ErrorCancel#1"/>
+    <ROW Dialog_="ErrorDlg" Control_="I" Event="EndDialog" Argument="ErrorIgnore" Condition="1" Ordering="100" MsiKey="ErrorDlg#I#EndDialog#ErrorIgnore#1"/>
+    <ROW Dialog_="ErrorDlg" Control_="N" Event="EndDialog" Argument="ErrorNo" Condition="1" Ordering="100" MsiKey="ErrorDlg#N#EndDialog#ErrorNo#1"/>
+    <ROW Dialog_="ErrorDlg" Control_="O" Event="EndDialog" Argument="ErrorOk" Condition="1" Ordering="100" MsiKey="ErrorDlg#O#EndDialog#ErrorOk#1"/>
+    <ROW Dialog_="ErrorDlg" Control_="R" Event="EndDialog" Argument="ErrorRetry" Condition="1" Ordering="100" MsiKey="ErrorDlg#R#EndDialog#ErrorRetry#1"/>
+    <ROW Dialog_="ErrorDlg" Control_="Y" Event="EndDialog" Argument="ErrorYes" Condition="1" Ordering="100" MsiKey="ErrorDlg#Y#EndDialog#ErrorYes#1"/>
+    <ROW Dialog_="ExitDialog" Control_="Finish" Event="DoAction" Argument="AI_LaunchApp" Condition="(RUNAPPLICATION=1) AND (AI_INSTALL OR AI_PATCH)" Ordering="200" MsiKey="ExitDialog#Finish#DoAction#AI_LaunchApp#(RUNAPPLICATION=1) AND (AI_INSTALL OR AI_PATCH)"/>
+    <ROW Dialog_="ExitDialog" Control_="Finish" Event="DoAction" Argument="AI_ViewReadme" Condition="(VIEWREADME=1) AND (AI_INSTALL OR AI_PATCH)" Ordering="100" MsiKey="ExitDialog#Finish#DoAction#AI_ViewReadme#(VIEWREADME=1) AND (AI_INSTALL OR AI_PATCH)"/>
+    <ROW Dialog_="ExitDialog" Control_="Finish" Event="EndDialog" Argument="Return" Condition="1" Ordering="300" MsiKey="ExitDialog#Finish#EndDialog#Return#1"/>
+    <ROW Dialog_="ExitDialog" Control_="Cancel" Event="EndDialog" Argument="Return" Condition="1" Ordering="100" MsiKey="ExitDialog#Cancel#EndDialog#Return#1"/>
+    <ROW Dialog_="FatalError" Control_="Finish" Event="EndDialog" Argument="Exit" Condition="1" Ordering="100" MsiKey="FatalError#Finish#EndDialog#Exit#1"/>
+    <ROW Dialog_="FatalError" Control_="Finish" Event="DoAction" Argument="AI_SHOW_LOG" Condition="(MsiLogFileLocation AND AI_LOG_CHECKBOX)" Ordering="101" MsiKey="FatalError#Finish#DoAction#AI_SHOW_LOG#(MsiLogFileLocation AND AI_LOG_CHECKBOX)"/>
+    <ROW Dialog_="FatalError" Control_="Cancel" Event="EndDialog" Argument="Exit" Condition="1" Ordering="100" MsiKey="FatalError#Cancel#EndDialog#Exit#1"/>
+    <ROW Dialog_="FilesInUse" Control_="Exit" Event="EndDialog" Argument="Exit" Condition="1" Ordering="100" MsiKey="FilesInUse#Exit#EndDialog#Exit#1"/>
+    <ROW Dialog_="FilesInUse" Control_="Ignore" Event="EndDialog" Argument="Ignore" Condition="1" Ordering="100" MsiKey="FilesInUse#Ignore#EndDialog#Ignore#1"/>
+    <ROW Dialog_="FilesInUse" Control_="Retry" Event="EndDialog" Argument="Retry" Condition="1" Ordering="100" MsiKey="FilesInUse#Retry#EndDialog#Retry#1"/>
+    <ROW Dialog_="OutOfDiskDlg" Control_="OK" Event="EndDialog" Argument="Return" Condition="1" Ordering="100" MsiKey="OutOfDiskDlg#OK#EndDialog#Return#1"/>
+    <ROW Dialog_="OutOfRbDiskDlg" Control_="No" Event="EndDialog" Argument="Return" Condition="1" Ordering="100" MsiKey="OutOfRbDiskDlg#No#EndDialog#Return#1"/>
+    <ROW Dialog_="OutOfRbDiskDlg" Control_="Yes" Event="EnableRollback" Argument="False" Condition="1" Ordering="100" MsiKey="OutOfRbDiskDlg#Yes#EnableRollback#False#1"/>
+    <ROW Dialog_="OutOfRbDiskDlg" Control_="Yes" Event="EndDialog" Argument="Return" Condition="1" Ordering="200" MsiKey="OutOfRbDiskDlg#Yes#EndDialog#Return#1"/>
+    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EnableRollback" Argument="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" Ordering="500" MsiKey="ResumeDlg#Install#EnableRollback#False#OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;"/>
+    <ROW Dialog_="UserExit" Control_="Finish" Event="EndDialog" Argument="Exit" Condition="1" Ordering="100" MsiKey="UserExit#Finish#EndDialog#Exit#1"/>
+    <ROW Dialog_="UserExit" Control_="Cancel" Event="EndDialog" Argument="Exit" Condition="1" Ordering="100" MsiKey="UserExit#Cancel#EndDialog#Exit#1"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_ADMIN AND InstallMode = &quot;Server Image&quot;" Ordering="150" MsiKey="VerifyReadyDlg#Install#EndDialog#Return#AI_ADMIN AND InstallMode = &quot;Server Image&quot;"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EnableRollback" Argument="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" Ordering="400" MsiKey="VerifyReadyDlg#Install#EnableRollback#False#OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;"/>
+    <ROW Dialog_="WaitForCostingDlg" Control_="Return" Event="EndDialog" Argument="Exit" Condition="1" Ordering="100" MsiKey="WaitForCostingDlg#Return#EndDialog#Exit#1"/>
+    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="ReinstallMode" Argument="ecmus" Condition="AI_PATCH" Ordering="100" MsiKey="PatchWelcomeDlg#Next#ReinstallMode#ecmus#AI_PATCH"/>
+    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="Reinstall" Argument="All" Condition="AI_PATCH" Ordering="200" MsiKey="PatchWelcomeDlg#Next#Reinstall#All#AI_PATCH"/>
+    <ROW Dialog_="MsiRMFilesInUse" Control_="Cancel" Event="EndDialog" Argument="Exit" Condition="1" Ordering="100" MsiKey="MsiRMFilesInUse#Cancel#EndDialog#Exit#1"/>
+    <ROW Dialog_="MsiRMFilesInUse" Control_="OK" Event="EndDialog" Argument="Return" Condition="1" Ordering="200" MsiKey="MsiRMFilesInUse#OK#EndDialog#Return#1"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EnableRollback" Argument="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" Ordering="500" MsiKey="VerifyRemoveDlg#Remove#EnableRollback#False#OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="Remove" Argument="ALL" Condition="OutOfDiskSpace &lt;&gt; 1" Ordering="100" MsiKey="VerifyRemoveDlg#Remove#Remove#All#OutOfDiskSpace &lt;&gt; 1"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EnableRollback" Argument="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" Ordering="600" MsiKey="VerifyRepairDlg#Repair#EnableRollback#False#OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="Reinstall" Argument="All" Condition="OutOfDiskSpace &lt;&gt; 1" Ordering="200" MsiKey="VerifyRepairDlg#Repair#Reinstall#All#OutOfDiskSpace &lt;&gt; 1"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="ReinstallMode" Argument="ecmus" Condition="OutOfDiskSpace &lt;&gt; 1" Ordering="100" MsiKey="VerifyRepairDlg#Repair#ReinstallMode#ecmus#OutOfDiskSpace &lt;&gt; 1"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
+    <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
+    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
+    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
+    <ROW Action="AI_EnableDebugLog" Type="321" Source="aicustact.dll" Target="EnableDebugLog"/>
+    <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
+    <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
+    <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
+    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
+    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFiles64Folder][Manufacturer]\[ProductName]"/>
+    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
+    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
+    <ROW Name="PhotoFlare_1.exe" SourcePath="PhotoFlare_Win_AIP\logo.ico" Index="0"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
+    <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1501"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1399"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
+    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
+    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="201"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
+    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
+    <ROW Action="AI_DpiContentScale" Sequence="52"/>
+    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
+    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on [WindowsTypeNT40Display]." DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="(VersionNT &lt;&gt; 500)" Description="[ProductName] cannot be installed on [WindowsTypeNT50Display]." DescriptionLocId="AI.LaunchCondition.NoNT50" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="(VersionNT64 OR ((VersionNT &lt;&gt; 501) OR (ServicePackLevel = 3))) AND ((VersionNT &lt;&gt; 502) OR (ServicePackLevel = 2))" Description="[ProductName] cannot be installed on [WindowsTypeNT5XDisplay]." DescriptionLocId="AI.LaunchCondition.NoNT5X" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]." DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
+    <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
+    <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
+    <ROW Shortcut="PhotoFiltreLX" Directory_="SHORTCUTDIR" Name="PHOTOF~1|PhotoFlare" Component_="PhotoFlare.exe" Target="[APPDIR]\PhotoFlare" Arguments="Your Arguments" Description="Simple but powerful image editor" Hotkey="0" Icon_="PhotoFlare_1.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
+    <ATTRIBUTE name="UsedTheme" value="classic"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="0.0.1" VersionMax="[|ProductVersion]" Attributes="257" ActionProperty="OLDPRODUCTS"/>
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
+  </COMPONENT>
+</DOCUMENT>
diff -Nru photoflare-1.5.7/io.photoflare.photoflare.appdata.xml photoflare-1.6.0/io.photoflare.photoflare.appdata.xml
--- photoflare-1.5.7/io.photoflare.photoflare.appdata.xml	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/io.photoflare.photoflare.appdata.xml	2019-09-17 21:28:37.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2018 Dylan Coakley <info@photoflare.io> -->
+<!-- Copyright 2019 Dylan Coakley <info@photoflare.io> -->
 <component type="desktop-application">
   <id>io.photoflare.photoflare</id>
   <metadata_license>FSFAP</metadata_license>
   <project_license>GPL-3.0+</project_license>
-  <name>PhotoFlare</name>
+  <name>Photoflare</name>
   <summary>Simple but powerful Cross Platform Image Editor</summary>
 
   <description>
@@ -30,45 +30,45 @@
     </screenshot>
   </screenshots>
 
-  <url type="homepage">http://photoflare.io</url>
-  <project_group>PhotoFlare</project_group>
+  <url type="homepage">https://photoflare.io</url>
+  <project_group>Photoflare</project_group>
 
   <provides>
     <binary>photoflare</binary>
   </provides>
 
   <releases>
-  <release version="1.5.6.1" date="2018-12-02">
+    <release version="1.6.0" date="2019-09-26">
       <description>
- 		<ul>
-			<li>Fixed the TextTool wrapping for text more than a single line.</li>
-			<li>Fixed the EraserTool incorrectly showing zero as the initial radius.</li>
-			<li>Fixed issue with the language path not detected correctly.</li>
-		</ul>
+    <ul>
+      <li>Added custom cursor for Paint Bucket tool.</li>
+      <li>Fixed incorrect tool being selected when you change tab.</li>
+      <li>Improved aboutDialog credits layout so titles can be translated.</li>
+      <li>Added Flatpak packaging manifest.</li>
+      <li>Added keyboard shortcut for Select All.</li>
+      <li>Improved Dock layout and Zoom settings to be translatable.</li>
+      <li>Added zoom direction feature to Preferences.</li>
+      <li>Added buttons to add/remove filters on batch/automate dialog.</li>
+      <li>Added keyboard shortcut for original zoom. (Ctrl+0)</li>
+      <li>Added OpenMP to use multiple threads for graphicsmagick filters.</li>
+    </ul>
       </description>
-    </release>
-    <release version="1.5.6" date="2018-11-23">
+  </release>
+  <release version="1.5.9" date="2019-05-26">
       <description>
- 		<ul>
-			<li>Improved layout of the Hue Dialog.</li>
-			<li>Improved rendering of scaled high resolution images. (8K)</li>
-			<li>Fixed Dockpalettes being able to close or float.</li>
-			<li>Fixed Advanced PaintBrush not painting via single click.</li>
-			<li>Fixed Basic PaintBrush not having a default opacity/pressure set.</li>
-			<li>Fixed Contrast increase/decrease not working with the latest graphicsmagick.</li>
-			<li>Fixed Gamma increase/decrease not working with the latest graphicsmagick.</li>
-			<li>Fixed TextDialog font not taking the colour previously selected after first use.</li>
-			<li>Fixed Filterbar being floatable causing issues outside program bounds.</li>
-			<li>Fixed Eraser tool width incorrect on mouse click.</li>
-			<li>Fixed text cut off on Restart button in Preferences for NL translation.</li>
-			<li>Fixed zoom +/- after using Original zoom from View menu.</li>
-			<li>Fixed Show grid with zero causing max consumption of resources.</li>
-			<li>Fixed Show grid without image causing crash.</li>
-			<li>Add 2560 x 1440 to the New dialog presets.</li>
-			<li>Add support for generating Snap installers on 18.04.</li>
-			<li>Add checkbox menu toggle for Fullscreen, Filterbar, Toolpalette and View grid.</li>
-		</ul>
+    <ul>
+      <li>Added ability to transition from auto zoom to zoom step for zoom in.</li>
+      <li>Added keyboard shortcuts for zoom in/zoom out.</li>
+      <li>Added keyboard shortcut to toggle View > Full Screen.</li>
+      <li>Fixed the newdialog size preview having arrow controls and focus.</li>
+      <li>Fixed not being able to undo after pasting image.</li>
+      <li>Fixed whatIsThis not disabled on Windows during compile.</li>
+      <li>Fixed being able to resize certain dialogs.</li>
+      <li>Fixed Compression and History size sliders not updating on click. </li>
+      <li>Fixed Paste as New Image without any copied data.</li>
+      <li>Removed lots of compiler warnings.</li>
+    </ul>
       </description>
-    </release>
+  </release>
   </releases>
 </component>
diff -Nru photoflare-1.5.7/photoflare.1 photoflare-1.6.0/photoflare.1
--- photoflare-1.5.7/photoflare.1	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/photoflare.1	2019-09-17 21:28:37.000000000 +0000
@@ -1,5 +1,5 @@
 .\"
-.TH PHOTOFLARE "1" "December 2018" "1.5.6.1"
+.TH PHOTOFLARE "1" "August 2019" "1.6.0"
 .SH NAME
 photoFlare \- Simple but powerful Cross Platform Image Editor
 .SH DESCRIPTION
@@ -12,6 +12,6 @@
 .br
 .BR https://github.com/PhotoFlare/photoflare
 .SH COPYRIGHT
-Copyright \(co 2015\-2018 Dylan Coakley.
+Copyright \(co 2015\-2019 Dylan Coakley.
 .br
 Distributed under the GNU GPL-3+ open source license.
diff -Nru photoflare-1.5.7/PhotoFlare.pro photoflare-1.6.0/PhotoFlare.pro
--- photoflare-1.5.7/PhotoFlare.pro	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/PhotoFlare.pro	2019-09-17 21:28:37.000000000 +0000
@@ -9,7 +9,7 @@
 
 TARGET = photoflare
 TEMPLATE = app
-CONFIG += c++17
+CONFIG += c++11
 
 # This path is used in order to find all of the header files
 INCLUDEPATH += ./src/widgets \
@@ -30,6 +30,8 @@
 linux|hurd {
     INCLUDEPATH += /usr/include/GraphicsMagick
     LIBS += -L/usr/lib -lGraphicsMagick++
+    QMAKE_CXXFLAGS += -fopenmp
+    LIBS += -fopenmp
 }
 
 # Project settings for Mac OS. Adjust the paths as needed on your system.
@@ -92,6 +94,7 @@
     src/widgets/layermanager.cpp \
     src/progress/batchprogress.cpp \
     src/workers/filterworker.cpp \
+    src/workers/filterworkermp.cpp \
     src/tools/EraserTool.cpp \
     src/toolSettings/erasersettingswidget.cpp \
     src/tools/SmudgeTool.cpp \
@@ -145,6 +148,7 @@
     src/widgets/colorboxwidget.h \
     src/progress/batchprogress.h \
     src/workers/filterworker.h \
+    src/workers/filterworkermp.h \
     src/tools/EraserTool.h \
     src/toolSettings/erasersettingswidget.h \
     src/tools/SmudgeTool.h \
diff -Nru photoflare-1.5.7/snap/snapcraft.yaml photoflare-1.6.0/snap/snapcraft.yaml
--- photoflare-1.5.7/snap/snapcraft.yaml	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/snap/snapcraft.yaml	2019-09-17 21:28:37.000000000 +0000
@@ -1,13 +1,13 @@
 name: photoflare
-version: 1.5.5.1
+version: 1.6.0
 summary: PhotoFlare
 description: Simple but powerful Cross Platform image editor
 icon: installers/deb/DEBIAN/usr/share/icons/hicolor/48x48/apps/photoflare.png
 type: app
 
 base: core18
-confinement: devmode
-grade: devel
+confinement: classic
+grade: stable
 
 apps:
   photoflare:
@@ -19,7 +19,7 @@
     after: [desktop-qt5]
     source: https://github.com/PhotoFlare/photoflare.git
     source-type: git
-    source-tag: 'v1.5.5.1'
+    source-tag: 'v1.6.0'
     plugin: qmake
     qt-version: qt5
     build-packages:
diff -Nru photoflare-1.5.7/src/dialogs/aboutdialog.cpp photoflare-1.6.0/src/dialogs/aboutdialog.cpp
--- photoflare-1.5.7/src/dialogs/aboutdialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/aboutdialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  About dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// About dialog class for the PhotoFlare application.
+
 #include <QApplication>
 #include <QTextEdit>
 
@@ -16,32 +29,38 @@
 {
     ui->setupUi(this);
     setFixedSize(size());
-    ui->creditsTextArea->setVisible(false);
-    ui->creditsTextArea->setText(tr("<b>Developers</b>"
-                                    "<br>Commercial - ICS<br>Lead - Dylan Coakley"
-                                    "<br>Developer - Marek Mosna"
-                                    "<br>Developer - Dmitry Vasilenko"
-                                    "<br><br><b>Graphics</b>"
-                                    "<br>Main icon - Robert BM"
-                                    "<br>Website graphics - Raqasa"
-                                    "<br>Application icons - Attari B"
-                                    "<br><br><b>Promotional Media</b>"
-                                    "<br>Art Designer - Catherine Fister"
-                                    "<br>Advertising - Don Murphy"
-                                    "<br><br><b>Contributors</b>"
-                                    "<br>Duzy Chan - Code"
-                                    "<br>Samuel Cowen - Code"
-                                    "<br>Richard Senior - GNU Autotools"
-                                    "<br>Alexandre Kharlamov - Code"
-                                    "<br>Michael Sheppard - Code"
-                                    "<br>Helene Levernieux - Project Icon"
-                                    "<br><br><b>Translators</b>"
-                                    "<br>FR - Ludovic, Nerdouille"
-                                    "<br>NL - Freek Pol"
-                                    "<br>DE - Freacore"
-                                    "<br>zh_TW - Coolshou"
-                                    "<br><br><b>Special thanks"
-                                    "</b><br>I would like to thank Samantha for being an absolute gem of a person. You light up my life and I'm so glad to have found you."));
+    ui->creditsWidget->setVisible(false);
+
+    ui->devTextArea->setText(
+                tr("Commercial - ICS"
+                "<br>Lead - Dylan Coakley"
+                "<br>Developer - Marek Mosna"
+                "<br>Developer - Dmitry Vasilenko"
+                "<br>Debian package - Dylan Aissi"
+                "<br>AppImage package - probonopd")
+    );
+    ui->graphicsTextArea->setText(tr("Main icon - Robert BM"
+                                  "<br>Website graphics - Raqasa"
+                                  "<br>Application icons - Attari B"
+                                  "<br>Art Designer - Catherine Hegedusich"
+                                  "<br>Advertising - Don Murphy")
+    );
+
+    ui->translateTextArea->setText(tr("FR - Ludovic, Nerdouille"
+                                   "<br>NL - Freek Pol"
+                                   "<br>DE - Freacore"
+                                   "<br>zh_TW - Coolshou")
+    );
+    ui->contribTextArea->setText(tr("Duzy Chan - Code"
+                                 "<br>Samuel Cowen - Code"
+                                 "<br>Richard Senior - GNU Autotools"
+                                 "<br>Alexandre Kharlamov - Code"
+                                 "<br>Michael Sheppard - Code"
+                                 "<br>Helene Levernieux - Project Icon"
+                                 "<br><br><b>Special thanks"
+                                 "</b><br>I would like to thank Samantha for being an absolute gem of a person."
+                                 " You light up my life and I'm so glad to have found you.")
+    );
 
     QString appName = qApp->applicationName().replace("p","P");
     ui->appName->setText(appName);
@@ -50,11 +69,7 @@
     ui->appName->setFont(font);
     ui->appVersion->setText(qApp->applicationVersion()+tr(" Community Edition"));
     ui->appDescription->setText(tr("A simple but featureful editor."));
-    ui->appUrl->setText(tr("<a href='http://www.photoflare.io'>http://www.photoflare.io</a>"));
-    ui->appName->setAlignment(Qt::AlignCenter);
-    ui->appVersion->setAlignment(Qt::AlignCenter);
-    ui->appDescription->setAlignment(Qt::AlignCenter);
-    ui->appUrl->setAlignment(Qt::AlignCenter);
+    ui->appUrl->setText(tr("<a href='https://www.photoflare.io'>https://www.photoflare.io</a>"));
 }
 
 aboutDialog::~aboutDialog()
@@ -62,22 +77,20 @@
     delete ui;
 }
 
-void aboutDialog::on_pushButton_clicked()
+void aboutDialog::on_closeButton_clicked()
 {
     close();
 }
 
-void aboutDialog::on_pushButton_2_clicked()
+void aboutDialog::on_creditsButton_clicked()
 {
-    if (ui->creditsTextArea->isVisible()==false)
+    if (ui->creditsWidget->isVisible()==false)
     {
-        ui->creditsTextArea->setVisible(true);
-        creditsVisible=true;
+        ui->creditsWidget->setVisible(true);
     }
-    else if (ui->creditsTextArea->isVisible()==true)
+    else if (ui->creditsWidget->isVisible()==true)
     {
-        ui->creditsTextArea->setVisible(false);
-        creditsVisible=false;
+        ui->creditsWidget->setVisible(false);
     }
 
 }
diff -Nru photoflare-1.5.7/src/dialogs/aboutdialog.h photoflare-1.6.0/src/dialogs/aboutdialog.h
--- photoflare-1.5.7/src/dialogs/aboutdialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/aboutdialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,7 +1,18 @@
 /*
+    This file is part of Photoflare.
 
-  About dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 #ifndef ABOUTDIALOG_H
@@ -22,12 +33,11 @@
     ~aboutDialog();
 
 private slots:
-    void on_pushButton_clicked();
-    void on_pushButton_2_clicked();
+    void on_closeButton_clicked();
+    void on_creditsButton_clicked();
 
 private:
     Ui::aboutDialog *ui;
-    bool creditsVisible;
 };
 
 #endif // ABOUTDIALOG_H
diff -Nru photoflare-1.5.7/src/dialogs/aboutdialog.ui photoflare-1.6.0/src/dialogs/aboutdialog.ui
--- photoflare-1.5.7/src/dialogs/aboutdialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/aboutdialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>aboutDialog</class>
  <widget class="QDialog" name="aboutDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="enabled">
    <bool>true</bool>
   </property>
@@ -9,8 +12,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>391</width>
-    <height>411</height>
+    <width>425</width>
+    <height>408</height>
    </rect>
   </property>
   <property name="font">
@@ -21,10 +24,10 @@
   <property name="windowTitle">
    <string>About</string>
   </property>
-  <widget class="QPushButton" name="pushButton">
+  <widget class="QPushButton" name="closeButton">
    <property name="geometry">
     <rect>
-     <x>270</x>
+     <x>310</x>
      <y>370</y>
      <width>99</width>
      <height>27</height>
@@ -39,7 +42,7 @@
     <rect>
      <x>0</x>
      <y>210</y>
-     <width>381</width>
+     <width>421</width>
      <height>31</height>
     </rect>
    </property>
@@ -49,39 +52,48 @@
    <property name="textFormat">
     <enum>Qt::RichText</enum>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
   </widget>
   <widget class="QLabel" name="appVersion">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>250</y>
-     <width>381</width>
+     <width>421</width>
      <height>20</height>
     </rect>
    </property>
    <property name="text">
     <string>TextLabel</string>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
   </widget>
   <widget class="QLabel" name="appDescription">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>280</y>
-     <width>381</width>
+     <width>421</width>
      <height>20</height>
     </rect>
    </property>
    <property name="text">
     <string>TextLabel</string>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
   </widget>
   <widget class="QLabel" name="appUrl">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>300</y>
-     <width>381</width>
+     <width>421</width>
      <height>20</height>
     </rect>
    </property>
@@ -91,6 +103,9 @@
    <property name="textFormat">
     <enum>Qt::RichText</enum>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
    <property name="openExternalLinks">
     <bool>true</bool>
    </property>
@@ -98,7 +113,7 @@
   <widget class="QLabel" name="appLogo">
    <property name="geometry">
     <rect>
-     <x>120</x>
+     <x>140</x>
      <y>30</y>
      <width>150</width>
      <height>150</height>
@@ -129,7 +144,7 @@
     <set>Qt::AlignCenter</set>
    </property>
   </widget>
-  <widget class="QPushButton" name="pushButton_2">
+  <widget class="QPushButton" name="creditsButton">
    <property name="geometry">
     <rect>
      <x>20</x>
@@ -142,21 +157,102 @@
     <string>C&amp;redits</string>
    </property>
   </widget>
-  <widget class="QTextEdit" name="creditsTextArea">
-   <property name="enabled">
-    <bool>true</bool>
-   </property>
+  <widget class="QTabWidget" name="creditsWidget">
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>210</y>
-     <width>351</width>
-     <height>151</height>
+     <y>200</y>
+     <width>391</width>
+     <height>161</height>
     </rect>
    </property>
-   <property name="readOnly">
-    <bool>true</bool>
+   <property name="currentIndex">
+    <number>0</number>
    </property>
+   <widget class="QWidget" name="d_tab">
+    <attribute name="title">
+     <string>Developers</string>
+    </attribute>
+    <widget class="QTextEdit" name="devTextArea">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>0</y>
+       <width>391</width>
+       <height>131</height>
+      </rect>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="g_tab">
+    <attribute name="title">
+     <string>Graphics</string>
+    </attribute>
+    <widget class="QTextEdit" name="graphicsTextArea">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>0</y>
+       <width>391</width>
+       <height>131</height>
+      </rect>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="t_tab">
+    <attribute name="title">
+     <string>Translators</string>
+    </attribute>
+    <widget class="QTextEdit" name="translateTextArea">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>0</y>
+       <width>391</width>
+       <height>131</height>
+      </rect>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="c_tab">
+    <attribute name="title">
+     <string>Contributors</string>
+    </attribute>
+    <widget class="QTextEdit" name="contribTextArea">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>0</y>
+       <width>391</width>
+       <height>131</height>
+      </rect>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+    </widget>
+   </widget>
   </widget>
  </widget>
  <resources>
diff -Nru photoflare-1.5.7/src/dialogs/batchdialog.cpp photoflare-1.6.0/src/dialogs/batchdialog.cpp
--- photoflare-1.5.7/src/dialogs/batchdialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/batchdialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Batch dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Batch dialog class for the PhotoFlare application.
+
 //#include <QDebug>
 #include <QFileDialog>
 #include <QColorDialog>
@@ -263,6 +276,7 @@
 
 void batchDialog::mousePressEvent(QComboBox* obj, QMouseEvent *e)
 {
+    Q_UNUSED(obj);
     if(!ui->backgroundColorComboBox->isVisible())
     {
         e->accept();
@@ -378,24 +392,24 @@
 
 char batchDialog::rotate() const
 {
-    if(!ui->rotateCheckBox->isChecked())
-        return 0;
     if(ui->rotate90radioButton->isChecked())
         return Rotate90CW;
-    if(ui->rotate90ccwRadioButton->isChecked())
+    else if(ui->rotate90ccwRadioButton->isChecked())
         return Rotate90CCW;
-    if(ui->rotate180RadioButton->isChecked())
+    else if(ui->rotate180RadioButton->isChecked())
         return Rotate180;
+    else
+        return 0;
 }
 
 char batchDialog::flip() const
 {
-    if(!ui->flipCheckBox->isChecked())
-        return 0;
     if(ui->flipVerticalRadioButton)
         return FlipVertical;
-    if(ui->flipHorizontalRadioButton)
+    else if(ui->flipHorizontalRadioButton)
         return FlipHorizontal;
+    else
+        return 0;
 }
 
 void batchDialog::on_addFilesButton_clicked()
@@ -468,6 +482,7 @@
 
 void batchDialog::on_outFormat_currentIndexChanged(int index)
 {
+    Q_UNUSED(index);
     d->outFormat = ui->outFormat->currentText();
 }
 
@@ -543,3 +558,13 @@
     ui->listWidget->setIconSize(QSize(64,64));
     ui->listWidget->addItem(itm);
 }
+
+void batchDialog::on_addFilterButton_clicked()
+{
+    on_listWidget_2_doubleClicked(ui->listWidget_2->currentIndex());
+}
+
+void batchDialog::on_removeFilterButton_clicked()
+{
+    on_listWidget_3_doubleClicked(ui->listWidget_3->currentIndex());
+}
diff -Nru photoflare-1.5.7/src/dialogs/batchdialog.h photoflare-1.6.0/src/dialogs/batchdialog.h
--- photoflare-1.5.7/src/dialogs/batchdialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/batchdialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef BATCHDIALOG_H
-#define BATCHDIALOG_H
-
 /*
+    This file is part of Photoflare.
 
-  Batch dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef BATCHDIALOG_H
+#define BATCHDIALOG_H
+
 #include <QDialog>
 #include <brushtypecombobox.h>
 #include "imagepositionwidget.h"
@@ -106,6 +117,10 @@
 
     void addItemToFileListWidget(QString filePath);
 
+    void on_addFilterButton_clicked();
+
+    void on_removeFilterButton_clicked();
+
 private:
     Ui::batchDialog *ui;
     BatchDialogPrivate *d;
diff -Nru photoflare-1.5.7/src/dialogs/batchdialog.ui photoflare-1.6.0/src/dialogs/batchdialog.ui
--- photoflare-1.5.7/src/dialogs/batchdialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/batchdialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>batchDialog</class>
  <widget class="QDialog" name="batchDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -229,6 +232,9 @@
      <property name="decimals">
       <number>0</number>
      </property>
+     <property name="minimum">
+      <double>1.000000000000000</double>
+     </property>
      <property name="maximum">
       <double>9999.000000000000000</double>
      </property>
@@ -254,6 +260,9 @@
      <property name="decimals">
       <number>0</number>
      </property>
+     <property name="minimum">
+      <double>1.000000000000000</double>
+     </property>
      <property name="maximum">
       <double>9999.000000000000000</double>
      </property>
@@ -285,7 +294,7 @@
       <rect>
        <x>10</x>
        <y>90</y>
-       <width>131</width>
+       <width>171</width>
        <height>17</height>
       </rect>
      </property>
@@ -308,6 +317,9 @@
      <property name="decimals">
       <number>0</number>
      </property>
+     <property name="minimum">
+      <double>1.000000000000000</double>
+     </property>
      <property name="maximum">
       <double>9999.000000000000000</double>
      </property>
@@ -375,6 +387,9 @@
      <property name="decimals">
       <number>0</number>
      </property>
+     <property name="minimum">
+      <double>1.000000000000000</double>
+     </property>
      <property name="maximum">
       <double>9999.000000000000000</double>
      </property>
@@ -947,6 +962,38 @@
       </rect>
      </property>
     </widget>
+    <widget class="QPushButton" name="addFilterButton">
+     <property name="geometry">
+      <rect>
+       <x>350</x>
+       <y>100</y>
+       <width>41</width>
+       <height>25</height>
+      </rect>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+     <property name="text">
+      <string>&gt;</string>
+     </property>
+    </widget>
+    <widget class="QPushButton" name="removeFilterButton">
+     <property name="geometry">
+      <rect>
+       <x>350</x>
+       <y>170</y>
+       <width>41</width>
+       <height>25</height>
+      </rect>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+     <property name="text">
+      <string>&lt;</string>
+     </property>
+    </widget>
    </widget>
    <widget class="QWidget" name="Transform_tab">
     <attribute name="title">
@@ -972,7 +1019,7 @@
        <rect>
         <x>10</x>
         <y>60</y>
-        <width>121</width>
+        <width>151</width>
         <height>17</height>
        </rect>
       </property>
@@ -1017,7 +1064,7 @@
        <rect>
         <x>10</x>
         <y>40</y>
-        <width>121</width>
+        <width>141</width>
         <height>17</height>
        </rect>
       </property>
@@ -1049,7 +1096,7 @@
        <rect>
         <x>10</x>
         <y>40</y>
-        <width>91</width>
+        <width>141</width>
         <height>17</height>
        </rect>
       </property>
@@ -1068,7 +1115,7 @@
        <rect>
         <x>10</x>
         <y>60</y>
-        <width>111</width>
+        <width>151</width>
         <height>17</height>
        </rect>
       </property>
diff -Nru photoflare-1.5.7/src/dialogs/checkupdatedialog.cpp photoflare-1.6.0/src/dialogs/checkupdatedialog.cpp
--- photoflare-1.5.7/src/dialogs/checkupdatedialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/checkupdatedialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Dialog for checking version updates.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Dialog for checking version updates.
+
 //#include <QDebug>
 
 #include <QNetworkAccessManager>
@@ -21,6 +34,7 @@
     ui(new Ui::checkupdateDialog)
 {
     ui->setupUi(this);
+    setFixedSize(size());
     ui->downloadButton->setVisible(false);
 
     QNetworkAccessManager *manager = new QNetworkAccessManager(this);
@@ -65,6 +79,6 @@
 
 void checkupdateDialog::on_downloadButton_clicked()
 {
-    QString link = "http://photoflare.io/downloads/";
+    QString link = "https://photoflare.io/downloads/";
     QDesktopServices::openUrl(QUrl(link));
 }
diff -Nru photoflare-1.5.7/src/dialogs/checkupdatedialog.h photoflare-1.6.0/src/dialogs/checkupdatedialog.h
--- photoflare-1.5.7/src/dialogs/checkupdatedialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/checkupdatedialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef CHECKUPDATEDIALOG_H
 #define CHECKUPDATEDIALOG_H
 
diff -Nru photoflare-1.5.7/src/dialogs/checkupdatedialog.ui photoflare-1.6.0/src/dialogs/checkupdatedialog.ui
--- photoflare-1.5.7/src/dialogs/checkupdatedialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/checkupdatedialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -3,7 +3,7 @@
  <class>checkupdateDialog</class>
  <widget class="QDialog" name="checkupdateDialog">
   <property name="windowModality">
-   <enum>Qt::NonModal</enum>
+   <enum>Qt::ApplicationModal</enum>
   </property>
   <property name="geometry">
    <rect>
diff -Nru photoflare-1.5.7/src/dialogs/colourmanagerdialog.cpp photoflare-1.6.0/src/dialogs/colourmanagerdialog.cpp
--- photoflare-1.5.7/src/dialogs/colourmanagerdialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/colourmanagerdialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Dialog for managing colour palettes
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Dialog for managing colour palettes
+
 //#include <QDebug>
 
 #include <QBoxLayout>
diff -Nru photoflare-1.5.7/src/dialogs/colourmanagerdialog.h photoflare-1.6.0/src/dialogs/colourmanagerdialog.h
--- photoflare-1.5.7/src/dialogs/colourmanagerdialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/colourmanagerdialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef COLOURMANAGERDIALOG_H
 #define COLOURMANAGERDIALOG_H
 
diff -Nru photoflare-1.5.7/src/dialogs/colourmanagerdialog.ui photoflare-1.6.0/src/dialogs/colourmanagerdialog.ui
--- photoflare-1.5.7/src/dialogs/colourmanagerdialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/colourmanagerdialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>colourManagerDialog</class>
  <widget class="QDialog" name="colourManagerDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
diff -Nru photoflare-1.5.7/src/dialogs/compressiondialog.cpp photoflare-1.6.0/src/dialogs/compressiondialog.cpp
--- photoflare-1.5.7/src/dialogs/compressiondialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/compressiondialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Compression dialog to give user option to set compression on save.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Compression dialog to give user option to set compression on save.
+
 #include "compressiondialog.h"
 #include "ui_compressiondialog.h"
 
@@ -39,3 +52,8 @@
 {
     this->enableSaveImage = false;
 }
+
+void CompressionDialog::on_horizontalSlider_valueChanged(int value)
+{
+    ui->valueLabel->setText(QString::number(value));
+}
diff -Nru photoflare-1.5.7/src/dialogs/compressiondialog.h photoflare-1.6.0/src/dialogs/compressiondialog.h
--- photoflare-1.5.7/src/dialogs/compressiondialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/compressiondialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef COMPRESSIONDIALOG_H
-#define COMPRESSIONDIALOG_H
-
 /*
+    This file is part of Photoflare.
 
-  Compression dialog to give user option to set compression on save.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef COMPRESSIONDIALOG_H
+#define COMPRESSIONDIALOG_H
+
 #include <QDialog>
 
 namespace Ui {
@@ -30,6 +41,8 @@
 
     void on_buttonBox_rejected();
 
+    void on_horizontalSlider_valueChanged(int value);
+
 private:
     Ui::CompressionDialog *ui;
 };
diff -Nru photoflare-1.5.7/src/dialogs/compressiondialog.ui photoflare-1.6.0/src/dialogs/compressiondialog.ui
--- photoflare-1.5.7/src/dialogs/compressiondialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/compressiondialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>CompressionDialog</class>
  <widget class="QDialog" name="CompressionDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -80,7 +83,7 @@
     <enum>QSlider::TicksBelow</enum>
    </property>
    <property name="tickInterval">
-    <number>5</number>
+    <number>10</number>
    </property>
   </widget>
   <widget class="QLabel" name="label_3">
diff -Nru photoflare-1.5.7/src/dialogs/dropshadowdialog.cpp photoflare-1.6.0/src/dialogs/dropshadowdialog.cpp
--- photoflare-1.5.7/src/dialogs/dropshadowdialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/dropshadowdialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,22 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+// Dropshadow dialog class for the PhotoFlare application.
+
 #include "dropshadowdialog.h"
 #include "ui_dropshadowdialog.h"
 #include "../Settings.h"
@@ -10,6 +29,7 @@
     ui(new Ui::dropshadowDialog)
 {
     ui->setupUi(this);
+    setFixedSize(size());
 
     for(int i=Qt::white; i <= Qt::yellow; i++)
     {
diff -Nru photoflare-1.5.7/src/dialogs/dropshadowdialog.h photoflare-1.6.0/src/dialogs/dropshadowdialog.h
--- photoflare-1.5.7/src/dialogs/dropshadowdialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/dropshadowdialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef DROPSHADOWDIALOG_H
 #define DROPSHADOWDIALOG_H
 
diff -Nru photoflare-1.5.7/src/dialogs/dropshadowdialog.ui photoflare-1.6.0/src/dialogs/dropshadowdialog.ui
--- photoflare-1.5.7/src/dialogs/dropshadowdialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/dropshadowdialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>dropshadowDialog</class>
  <widget class="QDialog" name="dropshadowDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
diff -Nru photoflare-1.5.7/src/dialogs/gradientdialog.cpp photoflare-1.6.0/src/dialogs/gradientdialog.cpp
--- photoflare-1.5.7/src/dialogs/gradientdialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/gradientdialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Gradient dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Gradient dialog class for the PhotoFlare application.
+
 #include <QMouseEvent>
 #include <QColorDialog>
 #include <QSettings>
@@ -242,3 +255,67 @@
     }
     settings.endGroup();
 }
+
+void GradientDialog::on_directionN_clicked(bool checked)
+{
+    if(!checked)
+    {
+        ui->directionN->setChecked(true);
+    }
+}
+
+void GradientDialog::on_directionNE_clicked(bool checked)
+{
+    if(!checked)
+    {
+        ui->directionNE->setChecked(true);
+    }
+}
+
+void GradientDialog::on_directionE_clicked(bool checked)
+{
+    if(!checked)
+    {
+        ui->directionE->setChecked(true);
+    }
+}
+
+void GradientDialog::on_directionSE_clicked(bool checked)
+{
+    if(!checked)
+    {
+        ui->directionSE->setChecked(true);
+    }
+}
+
+void GradientDialog::on_directionS_clicked(bool checked)
+{
+    if(!checked)
+    {
+        ui->directionS->setChecked(true);
+    }
+}
+
+void GradientDialog::on_directionSW_clicked(bool checked)
+{
+    if(!checked)
+    {
+        ui->directionSW->setChecked(true);
+    }
+}
+
+void GradientDialog::on_directionW_clicked(bool checked)
+{
+    if(!checked)
+    {
+        ui->directionW->setChecked(true);
+    }
+}
+
+void GradientDialog::on_directionNW_clicked(bool checked)
+{
+    if(!checked)
+    {
+        ui->directionNW->setChecked(true);
+    }
+}
diff -Nru photoflare-1.5.7/src/dialogs/gradientdialog.h photoflare-1.6.0/src/dialogs/gradientdialog.h
--- photoflare-1.5.7/src/dialogs/gradientdialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/gradientdialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef GRADIENTDIALOG_H
-#define GRADIENTDIALOG_H
-
 /*
+    This file is part of Photoflare.
 
-  Gradient dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef GRADIENTDIALOG_H
+#define GRADIENTDIALOG_H
+
 #include <QDialog>
 #include <brushtypecombobox.h>
 
@@ -53,6 +64,22 @@
 
     void readSettings(QWidget* window);
 
+    void on_directionN_clicked(bool checked);
+
+    void on_directionNE_clicked(bool checked);
+
+    void on_directionE_clicked(bool checked);
+
+    void on_directionSE_clicked(bool checked);
+
+    void on_directionS_clicked(bool checked);
+
+    void on_directionSW_clicked(bool checked);
+
+    void on_directionW_clicked(bool checked);
+
+    void on_directionNW_clicked(bool checked);
+
 private:
     Ui::GradientDialog *ui;
     Direction m_direction;
diff -Nru photoflare-1.5.7/src/dialogs/gradientdialog.ui photoflare-1.6.0/src/dialogs/gradientdialog.ui
--- photoflare-1.5.7/src/dialogs/gradientdialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/gradientdialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>GradientDialog</class>
  <widget class="QDialog" name="GradientDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -184,7 +187,7 @@
      <string/>
     </property>
     <property name="checked">
-     <bool>true</bool>
+     <bool>false</bool>
     </property>
     <property name="autoRepeat">
      <bool>false</bool>
diff -Nru photoflare-1.5.7/src/dialogs/huedialog.cpp photoflare-1.6.0/src/dialogs/huedialog.cpp
--- photoflare-1.5.7/src/dialogs/huedialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/huedialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,8 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Hue dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
+
+// Hue dialog class for the PhotoFlare application.
+
 #include <QMouseEvent>
 #include <QColorDialog>
 #include <QSettings>
@@ -122,7 +136,7 @@
     }
 }
 
-void HueDialog::on_method1_toggled(bool checked)
+void HueDialog::on_method1_toggled()
 {
     on_horizontalSlider_valueChanged(ui->horizontalSlider->value());
 }
diff -Nru photoflare-1.5.7/src/dialogs/huedialog.h photoflare-1.6.0/src/dialogs/huedialog.h
--- photoflare-1.5.7/src/dialogs/huedialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/huedialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef HUEDIALOG_H
-#define HUEDIALOG_H
-
 /*
+    This file is part of Photoflare.
 
-  Hue dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef HUEDIALOG_H
+#define HUEDIALOG_H
+
 #include <QDialog>
 
 namespace Ui {
@@ -31,7 +42,7 @@
 private slots:
     void on_horizontalSlider_valueChanged(int value);
 
-    void on_method1_toggled(bool checked);
+    void on_method1_toggled();
     void setColor(const QColor &color, QWidget *colorLabel);
     void showColorDialog(QWidget *colorLabel);
     QColor getColorFromLabel(QWidget *colorLabel) const;
diff -Nru photoflare-1.5.7/src/dialogs/huedialog.ui photoflare-1.6.0/src/dialogs/huedialog.ui
--- photoflare-1.5.7/src/dialogs/huedialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/huedialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>HueDialog</class>
  <widget class="QDialog" name="HueDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
diff -Nru photoflare-1.5.7/src/dialogs/imagepropertiesdialog.cpp photoflare-1.6.0/src/dialogs/imagepropertiesdialog.cpp
--- photoflare-1.5.7/src/dialogs/imagepropertiesdialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/imagepropertiesdialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  ImageProperties dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// ImageProperties dialog class for the PhotoFlare application.
+
 #include "imagepropertiesdialog.h"
 #include "ui_imagepropertiesdialog.h"
 
diff -Nru photoflare-1.5.7/src/dialogs/imagepropertiesdialog.h photoflare-1.6.0/src/dialogs/imagepropertiesdialog.h
--- photoflare-1.5.7/src/dialogs/imagepropertiesdialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/imagepropertiesdialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef IMAGEPROPERTIESDIALOG_H
-#define IMAGEPROPERTIESDIALOG_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  ImageProperties dialog class for the PhotoFlare application.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef IMAGEPROPERTIESDIALOG_H
+#define IMAGEPROPERTIESDIALOG_H
+
 #include <QDialog>
 
 class ImagePropertiesPrivate;
diff -Nru photoflare-1.5.7/src/dialogs/imagepropertiesdialog.ui photoflare-1.6.0/src/dialogs/imagepropertiesdialog.ui
--- photoflare-1.5.7/src/dialogs/imagepropertiesdialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/imagepropertiesdialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>imagePropertiesDialog</class>
  <widget class="QDialog" name="imagePropertiesDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
diff -Nru photoflare-1.5.7/src/dialogs/NewDialog.cpp photoflare-1.6.0/src/dialogs/NewDialog.cpp
--- photoflare-1.5.7/src/dialogs/NewDialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/NewDialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Dialog for creating a new image.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Dialog for creating a new image.
+
 //#include <QDebug>
 
 #include <QTabWidget>
@@ -35,20 +48,22 @@
     ui(new Ui::NewDialog)
 {
     ui->setupUi(this);
+    setFixedSize(size());
 
-    width_px = 1024;
-    height_px = 768;
-    imageRatio = (width_px/height_px);
+    // Set default values
+    original_width_px = 0;
+    original_height_px = 0;
     currentUnit = SETTINGS->getUnit();
     ui->imageResCombo->setCurrentIndex(PPI);
     ui->imageWHcombo->setCurrentIndex(currentUnit);
-    //Standard ppi
+    // Standard PPI
     ui->imageRvalue->setValue(96.0);
     ui->pixelWvalue->setValue(width_px);
     ui->pixelHvalue->setValue(height_px);
     ui->memoryValue->setValue((((width_px * height_px) * 3)/1024)/1024);
     ui->lockedRatioButton->setChecked(true);
 
+    // Setup Colour combobox colours
     for(int i=Qt::white; i <= Qt::yellow; i++)
     {
         QPixmap pixmap(QSize(ui->backgroundColorComboBox->width(),ui->backgroundColorComboBox->height()));
@@ -89,6 +104,8 @@
 
 void NewDialog::setImageSize(QSize size)
 {
+    original_width_px = size.width();
+    original_height_px =size.height();
     ui->imageWvalue->setValue(size.width());
     ui->imageHvalue->setValue(size.height());
 }
@@ -224,7 +241,14 @@
 void NewDialog::on_imageHvalue_valueChanged(double value)
 {
     Q_UNUSED(value);
-    imageRatio = (width_px/height_px);
+    if(original_width_px>0)
+    {
+        imageRatio = (original_width_px/original_height_px);
+    }
+    else
+    {
+        imageRatio = (width_px/height_px);
+    }
     float resoulution_in = ui->imageRvalue->value();
     if(ui->imageResCombo->currentIndex() == PPM)
         resoulution_in = resoulution_in * CM_IN_INCH;
@@ -255,7 +279,14 @@
 void NewDialog::on_imageWvalue_valueChanged(double value)
 {
     Q_UNUSED(value);
-    imageRatio = (width_px/height_px);
+    if(original_width_px>0)
+    {
+        imageRatio = (original_width_px/original_height_px);
+    }
+    else
+    {
+        imageRatio = (width_px/height_px);
+    }
     float resoulution_in = ui->imageRvalue->value();
     if(ui->imageResCombo->currentIndex() == PPM)
         resoulution_in = resoulution_in * CM_IN_INCH;
diff -Nru photoflare-1.5.7/src/dialogs/NewDialog.h photoflare-1.6.0/src/dialogs/NewDialog.h
--- photoflare-1.5.7/src/dialogs/NewDialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/NewDialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef NEWDIALOG_H
-#define NEWDIALOG_H
-
 /*
+    This file is part of Photoflare.
 
-  Dialog for creating a new image.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef NEWDIALOG_H
+#define NEWDIALOG_H
+
 #include <QDialog>
 #include <brushtypecombobox.h>
 #include "imagepositionwidget.h"
@@ -70,6 +81,8 @@
     double imageRatio;
     float width_px;
     float height_px;
+    float original_width_px;
+    float original_height_px;
     int currentUnit;
 };
 
diff -Nru photoflare-1.5.7/src/dialogs/NewDialog.ui photoflare-1.6.0/src/dialogs/NewDialog.ui
--- photoflare-1.5.7/src/dialogs/NewDialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/NewDialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>NewDialog</class>
  <widget class="QDialog" name="NewDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -18,6 +21,12 @@
   <property name="windowTitle">
    <string>New</string>
   </property>
+  <property name="autoFillBackground">
+   <bool>false</bool>
+  </property>
+  <property name="modal">
+   <bool>false</bool>
+  </property>
   <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
@@ -163,12 +172,18 @@
       <height>27</height>
      </rect>
     </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
     <property name="frame">
      <bool>true</bool>
     </property>
     <property name="readOnly">
      <bool>true</bool>
     </property>
+    <property name="buttonSymbols">
+     <enum>QAbstractSpinBox::NoButtons</enum>
+    </property>
     <property name="decimals">
      <number>0</number>
     </property>
@@ -185,9 +200,15 @@
       <height>27</height>
      </rect>
     </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
     <property name="readOnly">
      <bool>true</bool>
     </property>
+    <property name="buttonSymbols">
+     <enum>QAbstractSpinBox::NoButtons</enum>
+    </property>
     <property name="decimals">
      <number>0</number>
     </property>
@@ -204,9 +225,15 @@
       <height>27</height>
      </rect>
     </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
     <property name="readOnly">
      <bool>true</bool>
     </property>
+    <property name="buttonSymbols">
+     <enum>QAbstractSpinBox::NoButtons</enum>
+    </property>
     <property name="maximum">
      <double>9999999.000000000000000</double>
     </property>
diff -Nru photoflare-1.5.7/src/dialogs/outerframedialog.cpp photoflare-1.6.0/src/dialogs/outerframedialog.cpp
--- photoflare-1.5.7/src/dialogs/outerframedialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/outerframedialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Outerframe dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Outerframe dialog class for the PhotoFlare application.
+
 #include <QColorDialog>
 
 #include "outerframedialog.h"
diff -Nru photoflare-1.5.7/src/dialogs/outerframedialog.h photoflare-1.6.0/src/dialogs/outerframedialog.h
--- photoflare-1.5.7/src/dialogs/outerframedialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/outerframedialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef OUTERFRAMEDIALOG_H
-#define OUTERFRAMEDIALOG_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Outerframe dialog class for the PhotoFlare application.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef OUTERFRAMEDIALOG_H
+#define OUTERFRAMEDIALOG_H
+
 #include <QDialog>
 #include <QComboBox>
 #include <QMouseEvent>
diff -Nru photoflare-1.5.7/src/dialogs/outerframedialog.ui photoflare-1.6.0/src/dialogs/outerframedialog.ui
--- photoflare-1.5.7/src/dialogs/outerframedialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/outerframedialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>OuterFrameDialog</class>
  <widget class="QDialog" name="OuterFrameDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
diff -Nru photoflare-1.5.7/src/dialogs/plugindialog.cpp photoflare-1.6.0/src/dialogs/plugindialog.cpp
--- photoflare-1.5.7/src/dialogs/plugindialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/plugindialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #include "plugindialog.h"
 #include "ui_plugindialog.h"
 
diff -Nru photoflare-1.5.7/src/dialogs/plugindialog.h photoflare-1.6.0/src/dialogs/plugindialog.h
--- photoflare-1.5.7/src/dialogs/plugindialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/plugindialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef PLUGINDIALOG_H
 #define PLUGINDIALOG_H
 
diff -Nru photoflare-1.5.7/src/dialogs/plugindialog.ui photoflare-1.6.0/src/dialogs/plugindialog.ui
--- photoflare-1.5.7/src/dialogs/plugindialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/plugindialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>PluginDialog</class>
  <widget class="QDialog" name="PluginDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
diff -Nru photoflare-1.5.7/src/dialogs/prefsdialog.cpp photoflare-1.6.0/src/dialogs/prefsdialog.cpp
--- photoflare-1.5.7/src/dialogs/prefsdialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/prefsdialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Preferences dialog class.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Preferences dialog class.
+
 #include <QFileDialog>
 #include <QApplication>
 #include <QProcess>
@@ -36,14 +49,21 @@
     ui->compressionSlider->setValue(SETTINGS->getCompressionDefaultValue().toInt());
 
     //Layout tab
-    QStringList toolList(QStringList() << "Right" << "Left");
+    QStringList toolList(QStringList() << tr("Right") << tr("Left"));
     ui->toolPaletteLocation->addItems(toolList);
 
-    if(SETTINGS->getDockLayout() == "Left")
+    if(SETTINGS->getDockLayout() == "1")
     {
         ui->toolPaletteLocation->setCurrentIndex(1);
     }
 
+    QStringList zoomList(QStringList() << tr("Default") << tr("Inverted"));
+    ui->zoomDirection->addItems(zoomList);
+    if(SETTINGS->getZoomDirection() == "1")
+    {
+        ui->zoomDirection->setCurrentIndex(1);
+    }
+
     //Default values tab
     ui->memorizeParams->setChecked(SETTINGS->getMemParamsEnabled());
     ui->unitsCBox->setCurrentIndex(SETTINGS->getUnit());
@@ -109,14 +129,8 @@
     SETTINGS->setPreviouslyOpenedSave(ui->previousOpenedSaveEnabled->isChecked());
 
     //Layout tab
-    if(ui->toolPaletteLocation->currentIndex() == 0)
-    {
-        SETTINGS->setDockLayout("Right");
-    }
-    else
-    {
-        SETTINGS->setDockLayout("Left");
-    }
+    SETTINGS->setDockLayout(QString::number(ui->toolPaletteLocation->currentIndex()));
+    SETTINGS->setZoomDirection(QString::number(ui->zoomDirection->currentIndex()));
 
     //Default values tab
     SETTINGS->setMemParamsEnabled(ui->memorizeParams->isChecked());
@@ -178,23 +192,34 @@
     ui->compressionValue->setText(val);
 }
 
+void prefsDialog::on_compressionSlider_valueChanged(int value)
+{
+    QString val = QString::number(value);
+    ui->compressionValue->setText(val);
+}
+
 void prefsDialog::on_historySlider_sliderMoved(int position)
 {
     QString val = QString::number(position);
     ui->history_value->setText(val);
 }
 
+void prefsDialog::on_historySlider_valueChanged(int value)
+{
+    QString val = QString::number(value);
+    ui->history_value->setText(val);
+}
+
 void prefsDialog::on_restartButton_clicked()
 {
     // Save language before we quit
     set_user_language();
 
     qApp->quit();
-    QProcess* proc = new QProcess();
-    proc->start(QCoreApplication::applicationFilePath());
+    QProcess::startDetached(QCoreApplication::applicationFilePath());
 }
 
-void prefsDialog::on_comboBoxLanguage_currentIndexChanged(const QString &arg1)
+void prefsDialog::on_comboBoxLanguage_currentIndexChanged()
 {
     ui->restartButton->show();
 }
diff -Nru photoflare-1.5.7/src/dialogs/prefsdialog.h photoflare-1.6.0/src/dialogs/prefsdialog.h
--- photoflare-1.5.7/src/dialogs/prefsdialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/prefsdialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef PREFSDIALOG_H
-#define PREFSDIALOG_H
-
 /*
+    This file is part of Photoflare.
 
-  Preferences dialog class.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef PREFSDIALOG_H
+#define PREFSDIALOG_H
+
 #include <QDialog>
 
 namespace Ui {
@@ -36,10 +47,14 @@
 
     void set_user_language();
 
-    void on_comboBoxLanguage_currentIndexChanged(const QString &arg1);
+    void on_comboBoxLanguage_currentIndexChanged();
 
     void on_buttonBox_rejected();
 
+    void on_compressionSlider_valueChanged(int value);
+
+    void on_historySlider_valueChanged(int value);
+
 private:
     Ui::prefsDialog *ui;
     QString flagPath;
diff -Nru photoflare-1.5.7/src/dialogs/prefsdialog.ui photoflare-1.6.0/src/dialogs/prefsdialog.ui
--- photoflare-1.5.7/src/dialogs/prefsdialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/prefsdialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>prefsDialog</class>
  <widget class="QDialog" name="prefsDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -213,7 +216,7 @@
       <rect>
        <x>30</x>
        <y>130</y>
-       <width>501</width>
+       <width>471</width>
        <height>29</height>
       </rect>
      </property>
@@ -312,6 +315,29 @@
       </rect>
      </property>
     </widget>
+    <widget class="QLabel" name="label_8">
+     <property name="geometry">
+      <rect>
+       <x>20</x>
+       <y>140</y>
+       <width>111</width>
+       <height>17</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Zoom direction</string>
+     </property>
+    </widget>
+    <widget class="QComboBox" name="zoomDirection">
+     <property name="geometry">
+      <rect>
+       <x>20</x>
+       <y>160</y>
+       <width>191</width>
+       <height>25</height>
+      </rect>
+     </property>
+    </widget>
    </widget>
    <widget class="QWidget" name="tab_5">
     <attribute name="title">
@@ -391,7 +417,7 @@
       <rect>
        <x>30</x>
        <y>40</y>
-       <width>391</width>
+       <width>471</width>
        <height>29</height>
       </rect>
      </property>
diff -Nru photoflare-1.5.7/src/dialogs/textdialog.cpp photoflare-1.6.0/src/dialogs/textdialog.cpp
--- photoflare-1.5.7/src/dialogs/textdialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/textdialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Text dialog class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Text dialog class for the PhotoFlare application.
+
 #include <QColorDialog>
 #include <QSettings>
 
@@ -26,7 +39,6 @@
     ui->plainTextEdit->setFocus();
     ui->emptyWarning->hide();
     ui->alignleftButton->setChecked(true);
-    positionFont;
 
     if(SETTINGS->getMemParamsEnabled())
     {
diff -Nru photoflare-1.5.7/src/dialogs/textdialog.h photoflare-1.6.0/src/dialogs/textdialog.h
--- photoflare-1.5.7/src/dialogs/textdialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/textdialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef TEXTDIALOG_H
-#define TEXTDIALOG_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Text dialog class for the PhotoFlare application.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef TEXTDIALOG_H
+#define TEXTDIALOG_H
+
 #include <QDialog>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/dialogs/textdialog.ui photoflare-1.6.0/src/dialogs/textdialog.ui
--- photoflare-1.5.7/src/dialogs/textdialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/textdialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>textDialog</class>
  <widget class="QDialog" name="textDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
diff -Nru photoflare-1.5.7/src/dialogs/transparentdialog.cpp photoflare-1.6.0/src/dialogs/transparentdialog.cpp
--- photoflare-1.5.7/src/dialogs/transparentdialog.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/transparentdialog.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Transparent dialog class.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Transparent dialog class - Used to replace a selected colour with transparency.
+
 #include <QSettings>
 
 #include "transparentdialog.h"
@@ -30,10 +43,6 @@
     delete ui;
 }
 
-void TransparentDialog::on_horizontalSlider_sliderMoved(int value)
-{
-}
-
 void TransparentDialog::setColor(QRgb color)
 {
     m_color = QColor(color);
diff -Nru photoflare-1.5.7/src/dialogs/transparentdialog.h photoflare-1.6.0/src/dialogs/transparentdialog.h
--- photoflare-1.5.7/src/dialogs/transparentdialog.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/transparentdialog.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef TRANSPARENTDIALOG_H
-#define TRANSPARENTDIALOG_H
-
 /*
+    This file is part of Photoflare.
 
-  Transparent dialog class.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef TRANSPARENTDIALOG_H
+#define TRANSPARENTDIALOG_H
+
 #include <QDialog>
 
 namespace Ui {
@@ -25,18 +36,11 @@
     QColor color() {return m_color;}
     int tolerance();
 private slots:
-    void on_horizontalSlider_sliderMoved(int position);
-
     void on_horizontalSlider_valueChanged(int value);
-
     void on_pushButton_clicked();
-
     void on_pushButton_2_clicked();
-
     void on_pushButton_3_clicked();
-
     void readSettings(QWidget* window);
-
     void writeSettings(QWidget* window);
 
 signals:
diff -Nru photoflare-1.5.7/src/dialogs/transparentdialog.ui photoflare-1.6.0/src/dialogs/transparentdialog.ui
--- photoflare-1.5.7/src/dialogs/transparentdialog.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/dialogs/transparentdialog.ui	2019-09-17 21:28:37.000000000 +0000
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>TransparentDialog</class>
  <widget class="QDialog" name="TransparentDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,7 +14,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Transparent color</string>
+   <string>Transparent colour</string>
   </property>
   <widget class="QSlider" name="horizontalSlider">
    <property name="geometry">
diff -Nru photoflare-1.5.7/src/main.cpp photoflare-1.6.0/src/main.cpp
--- photoflare-1.5.7/src/main.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/main.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  PhotoFlare main program.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// PhotoFlare main program.
+
 //#include <QDebug>
 
 #include <QApplication>
@@ -22,94 +35,96 @@
 {
     QtSingleApplication app("PhotoFlare", argc, argv);
 
-    // Remove WhatIsThis from Window Controls
-    //app.setAttribute(Qt::AA_DisableWindowContextHelpButton); //required in newer Qt versions
+    // Remove WhatIsThis from Window Controls (Windows only)
+    #ifdef WIN32
+        app.setAttribute(Qt::AA_DisableWindowContextHelpButton); //required in newer Qt versions
+    #endif
+
+    if(!app.isRunning())
+    {
+        app.setApplicationName(QObject::tr("photoflare"));
+        app.setApplicationVersion(QObject::tr("1.6.0"));
+        app.setOrganizationDomain(QObject::tr("photoflare.io"));
+
+        // Setup Default settings
+        QString loc = QStandardPaths::locate(QStandardPaths::ConfigLocation, QString(), QStandardPaths::LocateDirectory)+"photoflare.io";
+        if(QDir(loc).exists() == false)
+        {
+            SETTINGS->setDefaultSettings();
+        }
 
-        if(!app.isRunning())
+        // Set language based on System locale
+        if(SETTINGS->getUserLanguage() == "notset")
         {
-            app.setApplicationName(QObject::tr("photoflare"));
-            app.setApplicationVersion(QObject::tr("1.5.7"));
-            app.setOrganizationDomain(QObject::tr("photoflare.io"));
-
-            // Setup Default settings
-            QString loc = QStandardPaths::locate(QStandardPaths::ConfigLocation, QString(), QStandardPaths::LocateDirectory)+"photoflare.io";
-            if(QDir(loc).exists() == false)
-            {
-                SETTINGS->setDefaultSettings();
-            }
-
-            // Set language based on System locale
-            if(SETTINGS->getUserLanguage() == "notset")
-            {
-                QString sysLanguage =  QLocale::languageToString(QLocale::system().language());
-                QString lang;
-
-                if(sysLanguage == "English")
-                {
-                    lang = "en";
-                }
-                else if(sysLanguage == "French")
-                {
-                    lang = "fr";
-                }
-                else if(sysLanguage == "German")
-                {
-                    lang = "de";
-                }
-                else if(sysLanguage == "Dutch")
-                {
-                    lang = "nl";
-                }
-                else if(sysLanguage == "Chinese")
-                {
-                    lang = "zh_TW";
-                }
-                else if(sysLanguage == "Czech")
-                {
-                    lang = "cs";
-                }
-                SETTINGS->setUserLanguage(lang);
-            }
-
-            QTranslator translator;
-            app.installTranslator(&translator);
-
-            QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
-            for(int i = 0;i < paths.length(); i++)
-            {
-                QFileInfo check_file(paths[i]+"/languages/"+SETTINGS->getUserLanguage()+".qm");  //for installers
-                //QFileInfo check_file("languages/"+SETTINGS->getUserLanguage()+".qm");  //local builds
-                if(check_file.exists() && check_file.isFile())
-                {
-                    translator.load(SETTINGS->getUserLanguage()+".qm", paths[i]+"/languages/");  //for installers
-                    //translator.load(SETTINGS->getUserLanguage()+".qm", "languages/"); //local builds
-                }
-            }
-            MainWindow w;
-            w.show();
-
-            if(argc > 1)
-            {
-                for (int i = 1; i < argc; ++i)
-                {
-                    w.handleMessage(QString(argv[i]));
-                }
+            QString sysLanguage =  QLocale::languageToString(QLocale::system().language());
+            QString lang;
+
+            if(sysLanguage == "English")
+            {
+                lang = "en";
+            }
+            else if(sysLanguage == "French")
+            {
+                lang = "fr";
+            }
+            else if(sysLanguage == "German")
+            {
+                lang = "de";
+            }
+            else if(sysLanguage == "Dutch")
+            {
+                lang = "nl";
+            }
+            else if(sysLanguage == "Chinese")
+            {
+                lang = "zh_TW";
             }
+            else if(sysLanguage == "Czech")
+            {
+                lang = "cs";
+            }
+            SETTINGS->setUserLanguage(lang);
+        }
 
-            app.setActivationWindow(&w, true);
-            QObject::connect(&app, SIGNAL(messageReceived(QString)), &w, SLOT(handleMessage(QString)));
+        QTranslator translator;
+        app.installTranslator(&translator);
 
-            return app.exec();
+        QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
+        for(int i = 0;i < paths.length(); i++)
+        {
+            QFileInfo check_file(paths[i]+"/languages/"+SETTINGS->getUserLanguage()+".qm");  //for installers
+            //QFileInfo check_file("languages/"+SETTINGS->getUserLanguage()+".qm");  //local builds
+            if(check_file.exists() && check_file.isFile())
+            {
+                translator.load(SETTINGS->getUserLanguage()+".qm", paths[i]+"/languages/");  //for installers
+                //translator.load(SETTINGS->getUserLanguage()+".qm", "languages/"); //local builds
+            }
         }
-        else
+        MainWindow w;
+        w.show();
+
+        if(argc > 1)
+        {
+            for (int i = 1; i < argc; ++i)
+            {
+                w.handleMessage(QString(argv[i]));
+            }
+        }
+
+        app.setActivationWindow(&w, true);
+        QObject::connect(&app, SIGNAL(messageReceived(QString)), &w, SLOT(handleMessage(QString)));
+
+        return app.exec();
+    }
+    else
+    {
+        if(argc > 1)
         {
-            if(argc > 1)
+            for (int i = 1; i < argc; ++i)
             {
-                for (int i = 1; i < argc; ++i)
-                {
-                    app.sendMessage(QString(argv[i]));
-                }
+                app.sendMessage(QString(argv[i]));
             }
         }
-        return 0;
+    }
+    return 0;
 }
diff -Nru photoflare-1.5.7/src/mainwindow.cpp photoflare-1.6.0/src/mainwindow.cpp
--- photoflare-1.5.7/src/mainwindow.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/mainwindow.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Main window class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Main window class for the PhotoFlare application.
+
 //#include <QDebug>
 
 #include <QClipboard>
@@ -76,6 +89,9 @@
 #include "workers/BatchProcessWorker.h"
 #include "progress/batchprogress.h"
 #include "workers/filterworker.h"
+#include "workers/filterworkermp.h"
+
+#include <omp.h>
 
 #define PAINT_BRUSH ToolManager::instance()->paintBrush()
 #define PAINT_BRUSH_ADV ToolManager::instance()->paintBrushAdv()
@@ -114,7 +130,7 @@
         ui->mdiArea->setViewMode(QMdiArea::TabbedView);
     }
 
-    if(SETTINGS->getDockLayout() == "Left")
+    if(SETTINGS->getDockLayout() == "1")
     {
         addDockWidget(Qt::LeftDockWidgetArea, ui->dockWidget_palette);
         addDockWidget(Qt::LeftDockWidgetArea, ui->dockWidgetSettings);
@@ -301,6 +317,26 @@
     batchLbl->setText(tr("Working..."));
 }
 
+void MainWindow::applyThreadedFilterMP(QString filterName, double dV)
+{
+    QThread *thread = new QThread();
+    FilterWorkerMP *worker = new FilterWorkerMP();
+    worker->setFilter(filterName);
+
+    PaintWidget *widget = getCurrentPaintWidget();
+    if(widget)
+    worker->setImage(widget->image());
+    worker->setDoubleVal(dV);
+    worker->setParent(this);
+    worker->moveToThread(thread);
+
+    connect(thread, SIGNAL(started()), worker, SLOT(process()));
+    connect(worker, SIGNAL(filterProcessFinished(QImage)), this, SLOT(on_image_filtered(QImage)));
+    thread->start();
+
+    batchLbl->setText(tr("Working..."));
+}
+
 /*
 
     | FILE MENU |
@@ -348,7 +384,7 @@
     {
         for(int i=0;i<fileName.length();i++)
         {
-            openFile(fileName[i], false);
+            openFile(fileName[i]);
         }
 
         if(SETTINGS->getPreviouslyOpened() == true)
@@ -379,7 +415,7 @@
     QImageReader reader(fileName);
     reader.setDecideFormatFromContent(true); // Autodetect file type without depending on extension
 
-    if(info.completeSuffix() != "jpg" && info.completeSuffix() != reader.format() && fileTypeSupported(reader.supportedImageFormats(),reader.format()))
+    if(info.completeSuffix().toLower() != "jpg" && info.completeSuffix() != reader.format() && fileTypeSupported(reader.supportedImageFormats(),reader.format()))
     {
         int ret = QMessageBox::warning(this,
                     tr("Incorrect file extension detected"),
@@ -406,7 +442,7 @@
     return newFileName;
 }
 
-void MainWindow::openFile(const QString& fileName, bool direct)
+void MainWindow::openFile(const QString& fileName)
 {
     if(!fileExists(fileName))
     {
@@ -429,7 +465,7 @@
 {
     QFileInfo fileInfo(message);
     if(fileInfo.exists())
-        openFile(QString(fileInfo.absoluteFilePath()),true);
+        openFile(QString(fileInfo.absoluteFilePath()));
 }
 
 void MainWindow::on_actionRevert_triggered()
@@ -461,7 +497,7 @@
         {
             QAction* action = ui->menuRecent_Files->addAction(fileName);
             connect(action, &QAction::triggered, [this, fileName] () {
-                openFile(fileName,false);
+                openFile(fileName);
             });
         }
     }
@@ -539,7 +575,7 @@
 
         int quality = -1;
 
-        if(SETTINGS->getCompressionDialogEnabled() && fileNameSuffix == "jpg" || fileNameSuffix == "jpeg")
+        if(SETTINGS->getCompressionDialogEnabled() && (fileNameSuffix == "jpg" || fileNameSuffix == "jpeg"))
         {
             CompressionDialog dlg;
             dlg.exec();
@@ -738,6 +774,8 @@
         QClipboard *clipboard = QApplication::clipboard();
         widget->setPaintTool(MOUSE_POINTER);
         MOUSE_POINTER->setOverlayImage(clipboard->image());
+        m_toolSelected = "pointer";
+        refreshTools();
     }
     else
     {
@@ -757,6 +795,7 @@
 
 void MainWindow::on_actionPaste_as_new_image_triggered()
 {
+    on_actionCopy_triggered();
     PaintWidget *widget = getCurrentPaintWidget();
     QClipboard *clipboard = QApplication::clipboard();
     if(clipboard->mimeData()->hasImage())
@@ -871,10 +910,11 @@
     dialog.setWindowTitle("Resize Image");
     dialog.setMode(NewDialog::ResizeImage);
     dialog.setImageSize(widget->image().size());
-    if (dialog.exec())
+    if (dialog.exec() == QDialog::Accepted)
+    {
         widget->setImage(widget->image().scaled(dialog.newImageSize()));
-
-    updateStatusArea(dialog.newImageSize().width(),dialog.newImageSize().height());
+        updateStatusArea(dialog.newImageSize().width(),dialog.newImageSize().height());
+    }
 }
 
 void MainWindow::on_actionCanvas_Size_triggered()
@@ -1208,7 +1248,7 @@
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("dustreduction");
+    applyThreadedFilterMP("dustreduction");
 }
 
 void MainWindow::on_actionDespeckle_triggered()
@@ -1229,21 +1269,21 @@
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("impulseNoise");
+    applyThreadedFilterMP("impulseNoise");
 }
 
 void MainWindow::on_actionLaplacian_triggered()
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("laplacianNoise");
+    applyThreadedFilterMP("laplacianNoise");
 }
 
 void MainWindow::on_actionPoisson_triggered()
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("poissonNoise");
+    applyThreadedFilterMP("poissonNoise");
 }
 
 void MainWindow::on_actionGrayScale_triggered()
@@ -1299,7 +1339,7 @@
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("oil");
+    applyThreadedFilterMP("oil");
 }
 
 void MainWindow::on_actionCharcoal_Drawing_triggered()
@@ -1429,6 +1469,10 @@
                 widget->showGrid(i);
                 ui->actionShow_grid->setChecked(true);
             }
+            else
+            {
+                ui->actionShow_grid->setChecked(false);
+            }
         }
         else
         {
@@ -1436,14 +1480,73 @@
             ui->actionShow_grid->setChecked(false);
         }
     }
+    else
+    {
+        ui->actionShow_grid->setChecked(false);
+    }
+}
+
+/*
+ * TODO
+ * - This needs to work in the opposite way to getNextZoom.
+ * - Needed to transition from autoZoom to stepZoom if users clicks zoom out.
+ * (Autozoom happens after opening an image)
+*/
+
+void MainWindow::getPrevZoomFromScale(QString scaletext)
+{
+    int count = this->zoomCombo->count();
+    for(int i=count;i>=0;i--)
+    {
+        int a = this->zoomCombo->itemText(i).replace("%","").toInt();
+        int b = scaletext.replace("%","").toInt();
+
+        //qDebug() << "a" << a;
+        //qDebug() << "b" << b;
+
+        if(b > a)
+        {
+            //qDebug() << "i" << i;
+            //qDebug()<< this->zoomCombo->itemText(i);
+            this->zoomCombo->setCurrentIndex(i-1);
+            break;
+        }
+    }
+}
+
+void MainWindow::getNextZoomFromScale(QString scaletext)
+{
+    int count = this->zoomCombo->count();
+    for(int i=1;i<count;i++)
+    {
+        int a = this->zoomCombo->itemText(i).replace("%","").toInt();
+        int b = scaletext.replace("%","").toInt();
+
+        if(a > b)
+        {
+            this->zoomCombo->setCurrentIndex(i-1);
+            break;
+        }
+    }
 }
 
 void MainWindow::on_actionZoom_in_triggered()
 {
-    this->zoomCombo->setCurrentIndex(this->zoomCombo->currentIndex()+1);
-    if(this->zoomCombo->currentText() == "")
+    if(this->zoomCombo->currentIndex()==0)
     {
-        this->zoomCombo->setCurrentIndex(this->zoomCombo->currentIndex()+1);
+        getNextZoomFromScale(this->zoomCombo->currentText());
+    }
+    else
+    {
+        if(this->zoomCombo->currentIndex()+1 < this->zoomCombo->count() && this->zoomCombo->currentIndex()>0)
+        {
+            this->zoomCombo->setCurrentIndex(this->zoomCombo->currentIndex()+1);
+        }
+
+        if(this->zoomCombo->currentText() == "")
+        {
+            this->zoomCombo->setCurrentIndex(this->zoomCombo->currentIndex()+1);
+        }
     }
 
     PaintWidget *widget = getCurrentPaintWidget();
@@ -1455,7 +1558,12 @@
 
 void MainWindow::on_actionZoom_out_triggered()
 {
-    if(this->zoomCombo->currentIndex() > 0)
+    if(this->zoomCombo->currentIndex()==0)
+    {
+        getPrevZoomFromScale(this->zoomCombo->currentText());
+    }
+
+    if(this->zoomCombo->currentIndex()-1 > 1)
     {
         this->zoomCombo->setCurrentIndex(this->zoomCombo->currentIndex()-1);
     }
@@ -1482,16 +1590,6 @@
     }
 }
 
-void MainWindow::on_actionAuto_zoom_triggered()
-{
-    PaintWidget *widget = getCurrentPaintWidget();
-    widget->autoScale();
-    connect(widget, &PaintWidget::zoomChanged, [this] (float scale) {
-        this->zoomCombo->setItemText(0, QString::number((int)(scale*100)).append("%"));
-        this->zoomCombo->setCurrentIndex(0);
-    });
-}
-
 void MainWindow::on_actionFull_screen_triggered()
 {
     if(this->isFullScreen())
@@ -1702,7 +1800,7 @@
     if (widget)
     {
         MOUSE_POINTER->onCrop();
-        widget->onSelectionChanged(QRect());
+        widget->onSelectionChanged(QPolygon());
     }
 }
 
@@ -2025,7 +2123,10 @@
 
 void MainWindow::onSubWindowActivated(QMdiSubWindow *window)
 {
-    Q_UNUSED(window)
+    Q_UNUSED(window);
+    // Set the previously selected tool as active
+    refreshTools();
+
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
     {
@@ -2215,8 +2316,14 @@
     ui->actionDuplicate->setShortcut(QString("Ctrl+U"));
     ui->actionImage_Size->setShortcut(QString("Ctrl+H"));
     ui->actionCrop->setShortcut(QString("Ctrl+Shift+H"));
+    // Selection Menu
+    ui->actionSelect_all->setShortcut(QString("Ctrl+A"));
     //View Menu
     ui->actionToolpalette->setShortcut(QString("Ctrl+L"));
+    ui->actionZoom_in->setShortcut(QKeySequence::ZoomIn);
+    ui->actionZoom_out->setShortcut(QKeySequence::ZoomOut);
+    ui->actionOriginal_size->setShortcut(QString("Ctrl+0"));
+    ui->actionFull_screen->setShortcut(QString("Ctrl+F"));
 }
 
 /*
@@ -2300,42 +2407,44 @@
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("contrastplus");
+
+    applyThreadedFilterMP("contrastplus");
+
 }
 
 void MainWindow::on_actionContrastminus_triggered()
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("contrastminus");
+    applyThreadedFilterMP("contrastminus");
 }
 
 void MainWindow::on_actionSaturationplus_triggered()
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("saturationplus");
+    applyThreadedFilterMP("saturationplus");
 }
 
 void MainWindow::on_actionSaturationminus_triggered()
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("saturationminus");
+    applyThreadedFilterMP("saturationminus");
 }
 
 void MainWindow::on_actionGammaCorrectplus_triggered()
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("gammacorrectplus");
+    applyThreadedFilterMP("gammacorrectplus");
 }
 
 void MainWindow::on_actionGammaCorrectminus_triggered()
 {
     PaintWidget *widget = getCurrentPaintWidget();
     if (widget)
-    applyThreadedFilter("gammacorrectminus");
+    applyThreadedFilterMP("gammacorrectminus");
 }
 
 void MainWindow::on_actionGradient_triggered()
@@ -2425,10 +2534,6 @@
             subWindow->widget()->deleteLater();
             break;
         }
-        case QEvent::LanguageChange:
-        {
-            ui->retranslateUi(this);
-        }
         default:
             qt_noop();
     }
diff -Nru photoflare-1.5.7/src/mainwindow.h photoflare-1.6.0/src/mainwindow.h
--- photoflare-1.5.7/src/mainwindow.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/mainwindow.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
 /*
+    This file is part of Photoflare.
 
-  Main window class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
 #include <QMainWindow>
 #include <QSignalMapper>
 #include <QMdiArea>
@@ -45,7 +56,7 @@
     ~MainWindow();
 
     PaintWidget* getCurrentPaintWidget();
-    void openFile(const QString& fileName, bool direct);
+    void openFile(const QString& fileName);
 
 public slots:
     void handleMessage(const QString& message);
@@ -212,6 +223,8 @@
 
     QString prepareFile(const QString& fileName);
     bool fileTypeSupported(QList<QByteArray> formats, QString ext);
+    void getNextZoomFromScale(QString scaletext);
+    void getPrevZoomFromScale(QString scaletext);
 
 protected:
     void closeEvent(QCloseEvent *event);
@@ -223,7 +236,6 @@
     void addPaintWidget(PaintWidget *widget);
     void addTab(PaintWidget *widget);
     void addChildWindow(PaintWidget *widget);
-    void on_actionAuto_zoom_triggered();
     void saveContent();
     bool saveImage(const QString &fileName, int quality);
     bool handleCloseChildWindow(QMdiSubWindow *subWindow);
@@ -236,6 +248,7 @@
     void clearStatusArea();
 
     void applyThreadedFilter(QString filterName, double doubleVal = 0.0);
+    void applyThreadedFilterMP(QString filterName, double doubleVal = 0.0);
 
     Ui::MainWindow *ui;
     QString m_toolSelected;
diff -Nru photoflare-1.5.7/src/mainwindow.ui photoflare-1.6.0/src/mainwindow.ui
--- photoflare-1.5.7/src/mainwindow.ui	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/mainwindow.ui	2019-09-17 21:28:37.000000000 +0000
@@ -364,7 +364,6 @@
     <addaction name="actionZoom_in"/>
     <addaction name="actionZoom_out"/>
     <addaction name="actionOriginal_size"/>
-    <addaction name="actionAuto_zoom"/>
     <addaction name="actionFull_screen"/>
    </widget>
    <widget class="QMenu" name="menuTools">
diff -Nru photoflare-1.5.7/src/managers/FilterManager.cpp photoflare-1.6.0/src/managers/FilterManager.cpp
--- photoflare-1.5.7/src/managers/FilterManager.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/managers/FilterManager.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,25 @@
 /*
+    This file is part of Photoflare.
 
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+/*
   Filter manager class.
 
   Some of the filters are implemented by ImageMagick through the Magick++ API.
-
+  Others use Qt QGraphics methods.
 */
 
 //#include <QDebug>
@@ -19,6 +35,7 @@
 #include <QGraphicsEffect>
 #include <QGraphicsScene>
 #include <QGraphicsPixmapItem>
+
 //#include <QElapsedTimer>
 
 #include "FilterManager.h"
@@ -138,7 +155,7 @@
     if(useContrast)
     {
         QImage modifiedImage = applyEffectToImage(image, e);
-        QImage newImage = setContrast(modifiedImage,5,0);
+        QImage newImage = setContrast(modifiedImage,5);
         return newImage;
     }
     else
@@ -303,19 +320,13 @@
 
 QImage FilterManager::grayscale(const QImage &image)
 {
-    QImage modifiedImage = image.convertToFormat(image.hasAlphaChannel() ?
-    QImage::Format_ARGB32 : QImage::Format_RGB32);
+    Magick::Image *magickImage = d->fromQtImage(image);
+    magickImage->modulate(100,0,0);
 
-     unsigned int *data = (unsigned int*)modifiedImage.bits();
-     int pixelCount = modifiedImage.width() * modifiedImage.height();
+    QImage modifiedImage = d->toQtImage(magickImage);
+    delete magickImage;
 
-     // Convert each pixel to grayscale
-     for(int i = 0; i < pixelCount; ++i) {
-        int val = qGray(*data);
-        *data = qRgba(val, val, val, qAlpha(*data));
-        ++data;
-     }
-     return modifiedImage;
+    return modifiedImage;
 }
 
 QImage FilterManager::oldPhoto(const QImage &image)
@@ -590,60 +601,19 @@
     return image.transformed(QMatrix().rotate(90.0));
 }
 
-static Magick::ChannelType channelById(int channelId)
+QImage FilterManager::setBrightness(const QImage &image, int brightness)
 {
-    switch(channelId)
-    {
-    case 0:
-        return Magick::AllChannels;
-    case 1:
-        return Magick::RedChannel;
-    case 2:
-        return Magick::GreenChannel;
-    case 3:
-        return Magick::BlueChannel;
-    case 4:
-        return Magick::CyanChannel;
-    case 5:
-        return Magick::MagentaChannel;
-    case 6:
-        return Magick::YellowChannel;
-    default:
-        return Magick::AllChannels;
-    }
-}
-
-QImage FilterManager::setBrightness(const QImage &image, int brightness, int channelId)
-{
-  //16.04
-  /*
-        Magick::Image *magickImage = d->fromQtImage(image);
-        magickImage->modulate(brightness + 100.0f, 100.0f, 100.0f);
-
-        QImage modifiedImage = d->toQtImage(magickImage);
-        delete magickImage;
+    Magick::Image *magickImage = d->fromQtImage(image);
+    magickImage->modulate(brightness + 100.0f, 100.0f, 100.0f);
 
-        return modifiedImage;
-  */
-  
-    Q_UNUSED(channelId);
-    QImage modifiedImage = image;
+    QImage modifiedImage = d->toQtImage(magickImage);
+    delete magickImage;
 
-    for(int i=0; i<modifiedImage.width(); i++)
-    {
-        for(int j=0; j<modifiedImage.height(); j++)
-        {
-            QColor color = modifiedImage.pixelColor(i,j);
-            color.setHsv(color.hue(), color.saturation(), changeBrightness(color.value(),brightness), color.alpha());
-            modifiedImage.setPixelColor(i, j, color);
-        }
-    }
     return modifiedImage;
 }
 
-QImage FilterManager::setSaturation(const QImage &image, int saturation, int channelId)
+QImage FilterManager::setSaturation(const QImage &image, int saturation)
 {
-    Q_UNUSED(channelId);
     Magick::Image *magickImage = d->fromQtImage(image);
     magickImage->modulate(100.0f, saturation + 100.0f, 100.0f);
 
@@ -653,9 +623,8 @@
     return modifiedImage;
 }
 
-QImage FilterManager::setContrast(const QImage &image, int contrast, int channelId)
+QImage FilterManager::setContrast(const QImage &image, int contrast)
 {
-    Q_UNUSED(channelId);
     Magick::Image *magickImage = d->fromQtImage(image);
     magickImage->contrast(contrast);
 
@@ -665,9 +634,8 @@
     return modifiedImage;
 }
 
-QImage FilterManager::setGamma(const QImage &image, double gamma, int channelId)
+QImage FilterManager::setGamma(const QImage &image, double gamma)
 {
-    Q_UNUSED(channelId);
     Magick::Image *magickImage = d->fromQtImage(image);
     magickImage->gamma(gamma, gamma, gamma);
 
@@ -770,10 +738,10 @@
     magickImage->floodFillColor(pos.x(), pos.y(), Magick::ColorRGB(0,0,0));
 
     QPolygon polygon;
-    for(int j=0; j<magickImage->rows(); j++)
+    for(unsigned int j=0; j<magickImage->rows(); j++)
     {
         bool marked = false;
-        for(int i=0; i<magickImage->columns(); i++)
+        for(unsigned int i=0; i<magickImage->columns(); i++)
         {
             if(color && magickImage->pixelColor(i,j) == targetColor)
             {
@@ -783,11 +751,9 @@
             if((i == magickImage->columns() - 1) && marked)
                 marked = false;
 
-            if(magickImage->pixelColor(i,j) == Magick::ColorRGB (0, 0, 0) && !marked ||
-               magickImage->pixelColor(i,j) != Magick::ColorRGB(0, 0, 0) && marked )
+            if( (magickImage->pixelColor(i,j) == Magick::ColorRGB (0, 0, 0) && !marked) || (magickImage->pixelColor(i,j) != Magick::ColorRGB(0, 0, 0) && marked) )
             {
                 polygon<<QPoint(i,j);
-                //marked = !marked;
                 break;
             }
         }
@@ -796,13 +762,12 @@
     for(int j=magickImage->rows(); j>0; j--)
     {
         bool marked = false;
-        for(int i=magickImage->columns(); i>0; i--)
+        for(unsigned int i=magickImage->columns(); i>0; i--)
         {
             if((i == magickImage->columns() - 1) && marked)
                 marked = false;
 
-            if(magickImage->pixelColor(i,j) == Magick::ColorRGB(0, 0, 0) && !marked ||
-               magickImage->pixelColor(i,j) != Magick::ColorRGB(0, 0, 0) && marked )
+            if((magickImage->pixelColor(i,j) == Magick::ColorRGB(0, 0, 0) && !marked) || (magickImage->pixelColor(i,j) != Magick::ColorRGB(0, 0, 0) && marked) )
             {
                 polygon<<QPoint(i,j);
                 break;
@@ -826,9 +791,9 @@
         return image;
 
     magickImage->colorFuzz(tolerance);
-    for(int j=0; j<magickImage->rows(); j++)
+    for(unsigned int j=0; j<magickImage->rows(); j++)
     {
-        for(int i=0; i<magickImage->columns(); i++)
+        for(unsigned int i=0; i<magickImage->columns(); i++)
         {
             Magick::Color color = magickImage->pixelColor(i,j);
             if(color.alpha() != 1.0f && color == targetColor)
diff -Nru photoflare-1.5.7/src/managers/FilterManager.h photoflare-1.6.0/src/managers/FilterManager.h
--- photoflare-1.5.7/src/managers/FilterManager.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/managers/FilterManager.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,14 +1,23 @@
-#ifndef FILTERMANAGER_H
-#define FILTERMANAGER_H
-
 /*
+    This file is part of Photoflare.
 
-  Filter manager class.
-
-  Some of the filters are implemented by ImageMagick through the Magick++ API.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef FILTERMANAGER_H
+#define FILTERMANAGER_H
+
 #include <QImage>
 
 class FilterManagerPrivate;
@@ -48,10 +57,10 @@
     QImage rotateCCW(const QImage &image);
     QImage rotateCW(const QImage &image);
 
-    QImage setBrightness(const QImage &image, int brightness, int channel);
-    QImage setSaturation(const QImage &image, int saturation, int channel);
-    QImage setContrast(const QImage &image, int contrast, int channel);
-    QImage setGamma(const QImage &image, double gamma, int channel);
+    QImage setBrightness(const QImage &image, int brightness);
+    QImage setSaturation(const QImage &image, int saturation);
+    QImage setContrast(const QImage &image, int contrast);
+    QImage setGamma(const QImage &image, double gamma);
 
     QImage emboss(const QImage &image);
     QImage trim(const QImage &image);
diff -Nru photoflare-1.5.7/src/managers/ToolManager.cpp photoflare-1.6.0/src/managers/ToolManager.cpp
--- photoflare-1.5.7/src/managers/ToolManager.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/managers/ToolManager.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Tools manager class. Handles the different drawing tools.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+//  Tools manager class. Handles the different drawing tools.
+
 #include "ToolManager.h"
 #include "./ColourPickerTool.h"
 #include "./PaintBrushTool.h"
diff -Nru photoflare-1.5.7/src/managers/ToolManager.h photoflare-1.6.0/src/managers/ToolManager.h
--- photoflare-1.5.7/src/managers/ToolManager.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/managers/ToolManager.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,19 @@
 /*
+    This file is part of Photoflare.
 
-  Tools manager class. Handles the different drawing tools.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-*/
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
 
 #ifndef TOOLMANAGER_H
 #define TOOLMANAGER_H
diff -Nru photoflare-1.5.7/src/progress/batchprogress.cpp photoflare-1.6.0/src/progress/batchprogress.cpp
--- photoflare-1.5.7/src/progress/batchprogress.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/progress/batchprogress.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #include "batchprogress.h"
 #include "ui_batchprogress.h"
 
diff -Nru photoflare-1.5.7/src/progress/batchprogress.h photoflare-1.6.0/src/progress/batchprogress.h
--- photoflare-1.5.7/src/progress/batchprogress.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/progress/batchprogress.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef BATCHPREGRESS_H
 #define BATCHPREGRESS_H
 
diff -Nru photoflare-1.5.7/src/progress/QProgressIndicator.cpp photoflare-1.6.0/src/progress/QProgressIndicator.cpp
--- photoflare-1.5.7/src/progress/QProgressIndicator.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/progress/QProgressIndicator.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,11 +1,23 @@
 /*
+    This file is part of Photoflare.
 
-  Generic class to show progress.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <QPainter>
+//  Generic class to show progress.
 
+#include <QPainter>
 #include "QProgressIndicator.h"
 
 QProgressIndicator::QProgressIndicator(QWidget* parent)
diff -Nru photoflare-1.5.7/src/progress/QProgressIndicator.h photoflare-1.6.0/src/progress/QProgressIndicator.h
--- photoflare-1.5.7/src/progress/QProgressIndicator.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/progress/QProgressIndicator.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef QPROGRESSINDICATOR_H
 #define QPROGRESSINDICATOR_H
 
diff -Nru photoflare-1.5.7/src/Settings.cpp photoflare-1.6.0/src/Settings.cpp
--- photoflare-1.5.7/src/Settings.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/Settings.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Settings class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Settings class for the PhotoFlare application.
+
 #include <QSettings>
 #include <QRect>
 
@@ -27,6 +40,7 @@
         compressionDefaultValue = settings.value("compressionDefaultValue").toString();
         historyLimit = settings.value("historyLimit").toString();
         dockLayout = settings.value("dockLayout").toString();
+        zoomDirection = settings.value("zoomDirection").toString();
         memDialogParams = settings.value("memorizeParamsEnabled").toBool();
         unit = settings.value("unit").toInt();
     }
@@ -58,6 +72,7 @@
     QString compressionDefaultValue;
     QString historyLimit;
     QString dockLayout;
+    QString zoomDirection;
     bool memDialogParams;
     int unit;
     QSettings settings;
@@ -97,7 +112,8 @@
     d->setValue("compressionDefaultEnabled", false);
     d->setValue("compressionDefaultValue", 90);
     d->setValue("compressionDialogEnabled", true);
-    d->setValue("dockLayout", "Right");
+    d->setValue("dockLayout", "0");
+    d->setValue("zoomDirection", "0");
     d->setValue("historyLimit", 24);
     d->setValue("memorizeParamsEnabled", true);
     d->setValue("prevOpened", false);
@@ -302,6 +318,17 @@
     return d->dockLayout;
 }
 
+void Settings::setZoomDirection(const QString val)
+{
+    d->zoomDirection = val;
+    d->setValue("zoomDirection",val);
+}
+
+QString Settings::getZoomDirection() const
+{
+    return d->zoomDirection;
+}
+
 void Settings::setMemParamsEnabled(bool enabled)
 {
     d->memDialogParams = enabled;
diff -Nru photoflare-1.5.7/src/Settings.h photoflare-1.6.0/src/Settings.h
--- photoflare-1.5.7/src/Settings.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/Settings.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
 /*
+    This file is part of Photoflare.
 
-  Settings class for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
 #include <QObject>
 
 #define SETTINGS Settings::instance()
@@ -52,6 +63,8 @@
     QString getHistoryLimit() const;
     void setDockLayout(const QString val);
     QString getDockLayout() const;
+    void setZoomDirection(const QString val);
+    QString getZoomDirection() const;
     void setMemParamsEnabled(bool enabled);
     bool getMemParamsEnabled() const;
     void setUnit(int);
diff -Nru photoflare-1.5.7/src/tools/BlurTool.cpp photoflare-1.6.0/src/tools/BlurTool.cpp
--- photoflare-1.5.7/src/tools/BlurTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/BlurTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  BlurTool - Blur while dragging the mouse.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// BlurTool - Blur while dragging the mouse.
+
 #include "BlurTool.h"
 #include "PaintWidget.h"
 
diff -Nru photoflare-1.5.7/src/tools/BlurTool.h photoflare-1.6.0/src/tools/BlurTool.h
--- photoflare-1.5.7/src/tools/BlurTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/BlurTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef BLURTOOL_H
 #define BLURTOOL_H
 
@@ -20,7 +37,7 @@
     void setRadius(int radius);
     void setPressure(int pressure);
 
-    QCursor getCursor();
+    QCursor getCursor() override;
 
     void setCapStyle(Qt::PenCapStyle capStyle);
 
diff -Nru photoflare-1.5.7/src/tools/ColourPickerTool.cpp photoflare-1.6.0/src/tools/ColourPickerTool.cpp
--- photoflare-1.5.7/src/tools/ColourPickerTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/ColourPickerTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  ColourPickerTool - Select colours from the image for the ColourBoxWidget.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// ColourPickerTool - Select colours from the image for the ColourBoxWidget.
+
 #include "ColourPickerTool.h"
 #include "../mainwindow.h"
 #include "../widgets/PaintWidget.h"
diff -Nru photoflare-1.5.7/src/tools/ColourPickerTool.h photoflare-1.6.0/src/tools/ColourPickerTool.h
--- photoflare-1.5.7/src/tools/ColourPickerTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/ColourPickerTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef COLOURPICKERTOOL_H
 #define COLOURPICKERTOOL_H
 
diff -Nru photoflare-1.5.7/src/tools/EraserTool.cpp photoflare-1.6.0/src/tools/EraserTool.cpp
--- photoflare-1.5.7/src/tools/EraserTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/EraserTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  EraserTool - Erase pixels while dragging the mouse.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// EraserTool - Erase pixels while dragging the mouse.
+
 #include "EraserTool.h"
 #include "PaintWidget.h"
 
diff -Nru photoflare-1.5.7/src/tools/EraserTool.h photoflare-1.6.0/src/tools/EraserTool.h
--- photoflare-1.5.7/src/tools/EraserTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/EraserTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef ERASERTOOL_H
 #define ERASERTOOL_H
 
@@ -14,7 +31,7 @@
     int width() const;
     void onMousePress(const QPoint &pos, Qt::MouseButton button) override;
     void onMouseMove(const QPoint &pos) override;
-    QCursor getCursor();
+    QCursor getCursor() override;
 
 private:
     EraserToolPrivate *d;
diff -Nru photoflare-1.5.7/src/tools/LineTool.cpp photoflare-1.6.0/src/tools/LineTool.cpp
--- photoflare-1.5.7/src/tools/LineTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/LineTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  LineTool - Draw various lines on the image.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// LineTool - Draw various lines on the image.
+
 #include "LineTool.h"
 
 #include <QApplication>
diff -Nru photoflare-1.5.7/src/tools/LineTool.h photoflare-1.6.0/src/tools/LineTool.h
--- photoflare-1.5.7/src/tools/LineTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/LineTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef LINETOOL_H
 #define LINETOOL_H
 
@@ -16,7 +33,7 @@
     void onMouseMove(const QPoint &pos) override;
     void onMouseRelease(const QPoint &pos) override;
 
-    QCursor getCursor();
+    QCursor getCursor() override;
 public slots:
     void setPrimaryColor(const QColor &color);
     void setSecondaryColor(const QColor &color);
diff -Nru photoflare-1.5.7/src/tools/MagicWandTool.cpp photoflare-1.6.0/src/tools/MagicWandTool.cpp
--- photoflare-1.5.7/src/tools/MagicWandTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/MagicWandTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  MagicWandTool - Select areas on the image.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// MagicWandTool - Select areas on the image.
+
 #include "MagicWandTool.h"
 #include "../mainwindow.h"
 #include "../widgets/PaintWidget.h"
diff -Nru photoflare-1.5.7/src/tools/MagicWandTool.h photoflare-1.6.0/src/tools/MagicWandTool.h
--- photoflare-1.5.7/src/tools/MagicWandTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/MagicWandTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef MAGICWANDTTOOL_H
 #define MAGICWANDTTOOL_H
 
diff -Nru photoflare-1.5.7/src/tools/PaintBrushAdvTool.cpp photoflare-1.6.0/src/tools/PaintBrushAdvTool.cpp
--- photoflare-1.5.7/src/tools/PaintBrushAdvTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/PaintBrushAdvTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  PaintBrushAdvTool - Paint with different brush styles.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+//  PaintBrushAdvTool - Paint with different brush styles.
+
 #include "PaintBrushAdvTool.h"
 
 #include <QPainter>
diff -Nru photoflare-1.5.7/src/tools/PaintBrushAdvTool.h photoflare-1.6.0/src/tools/PaintBrushAdvTool.h
--- photoflare-1.5.7/src/tools/PaintBrushAdvTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/PaintBrushAdvTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef PAINTBRUSHADVTOOL_H
 #define PAINTBRUSHADVTOOL_H
 
@@ -27,7 +44,7 @@
     void setFade(bool fade);
     void setStep(int step);
 
-    QCursor getCursor();
+    QCursor getCursor() override;
 
     void onMousePress(const QPoint &pos, Qt::MouseButton button) override;
     void onMouseMove(const QPoint &pos) override;
diff -Nru photoflare-1.5.7/src/tools/PaintBrushTool.cpp photoflare-1.6.0/src/tools/PaintBrushTool.cpp
--- photoflare-1.5.7/src/tools/PaintBrushTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/PaintBrushTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  PaintBrushTool - Paint using basic styles.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// PaintBrushTool - Paint using basic styles.
+
 #include <QPainter>
 #include "PaintBrushTool.h"
 
diff -Nru photoflare-1.5.7/src/tools/PaintBrushTool.h photoflare-1.6.0/src/tools/PaintBrushTool.h
--- photoflare-1.5.7/src/tools/PaintBrushTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/PaintBrushTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef PAINTBRUSHTOOL_H
 #define PAINTBRUSHTOOL_H
 
@@ -26,7 +43,7 @@
     void setPressure(int value) const;
     int pressure() const;
 
-    QCursor getCursor();
+    QCursor getCursor() override;
 
     void setCapStyle(Qt::PenCapStyle capStyle);
 
diff -Nru photoflare-1.5.7/src/tools/PaintBucketTool.cpp photoflare-1.6.0/src/tools/PaintBucketTool.cpp
--- photoflare-1.5.7/src/tools/PaintBucketTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/PaintBucketTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  PaintBucketTool - Flood fill areas.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// PaintBucketTool - Flood fill areas.
+
 #include "PaintBucketTool.h"
 #include "../mainwindow.h"
 #include "../widgets/PaintWidget.h"
@@ -31,3 +44,8 @@
             break;
     }
 }
+
+QCursor PaintBucketTool::getCursor()
+{
+    return QCursor(QPixmap (QString(":/cursors/assets/cursors/bucket.png")));
+}
diff -Nru photoflare-1.5.7/src/tools/PaintBucketTool.h photoflare-1.6.0/src/tools/PaintBucketTool.h
--- photoflare-1.5.7/src/tools/PaintBucketTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/PaintBucketTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef PAINTBUCKETTOOL_H
 #define PAINTBUCKETTOOL_H
 
@@ -13,6 +30,7 @@
     virtual ~PaintBucketTool();
 
     void onMousePress(const QPoint &pos, Qt::MouseButton button) override;
+    QCursor getCursor() override;
 
 signals:
     void floodFillPrimaryColor(const QPoint&);
diff -Nru photoflare-1.5.7/src/tools/PointerTool.cpp photoflare-1.6.0/src/tools/PointerTool.cpp
--- photoflare-1.5.7/src/tools/PointerTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/PointerTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  PointerTool - Selection and cropping.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// PointerTool - Selection and cropping.
+
 #include "PointerTool.h"
 
 #include <QApplication>
@@ -45,6 +58,7 @@
     : Tool(parent)
     , d(new PointerToolPrivate)
 {
+    this->setObjectName("PointerTool");
     setupRightClickMenu(false);
 }
 
@@ -57,7 +71,7 @@
 {
     const QRect &rect = QRect(d->firstPos, d->secondPos);
     d->secondPos = d->firstPos;
-    emit selectionChanged(QRect());
+    emit selectionChanged(QPolygon());
     emit crop(rect);
 }
 
@@ -113,6 +127,7 @@
     d->image = image;
     d->imagePos = QPoint(0,0);
     emit overlaid(m_paintDevice, d->image, QPainter::CompositionMode_SourceOver);
+    emit cursorChanged(Qt::OpenHandCursor);
 }
 
 void PointerTool::onMousePress(const QPoint &pos, Qt::MouseButton button)
@@ -171,10 +186,13 @@
                     emit cursorChanged(Qt::OpenHandCursor);
                 }
             }
-            break;
-        case Qt::RightButton: {
-                setupRightClickMenu(true);
-            }
+        break;
+        case Qt::RightButton:
+        {
+            setupRightClickMenu(true);
+        }
+        break;
+        default:
         break;
     }
 }
@@ -187,12 +205,22 @@
     {
         if(d->selectionMode == HAND)
         {
+            float scaledVal = 2.00;
+
+            if(m_scale < 0.5)
+            {
+                scaledVal = 5.00;
+            }
+            else if(m_scale > 1) {
+                scaledVal = 1.00;
+            }
+
             const QImage *image = dynamic_cast<QImage*>(m_paintDevice);
             QImage surface = QImage(image->size(), QImage::Format_ARGB32_Premultiplied);
             QPainter painter(&surface);
             painter.setCompositionMode(QPainter::CompositionMode_Source);
             painter.fillRect(surface.rect(), Qt::transparent);
-            QPen pen = QPen(QBrush(), (5*m_scale), Qt::DashLine);
+            QPen pen = QPen(QBrush(), (scaledVal), Qt::DashLine);
             pen.setColor(Qt::red);
             painter.setPen(pen);
 
@@ -269,7 +297,7 @@
     {
         if(d->firstPos == d->secondPos)
         {
-            emit selectionChanged(QRect());
+            emit selectionChanged(QPolygon());
         }
         else
         {
@@ -301,6 +329,7 @@
 
 void PointerTool::onKeyPressed(QKeyEvent *keyEvent)
 {
+    Q_UNUSED(keyEvent);
     /*
     QRect rect(d->firstPos,d->secondPos);
 
diff -Nru photoflare-1.5.7/src/tools/PointerTool.h photoflare-1.6.0/src/tools/PointerTool.h
--- photoflare-1.5.7/src/tools/PointerTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/PointerTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef POINTERTOOL_H
 #define POINTERTOOL_H
 
diff -Nru photoflare-1.5.7/src/tools/SmudgeTool.cpp photoflare-1.6.0/src/tools/SmudgeTool.cpp
--- photoflare-1.5.7/src/tools/SmudgeTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/SmudgeTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  SmudgeTool - Smudge pixels while dragging the mouse.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// SmudgeTool - Smudge pixels while dragging the mouse.
+
 #include "SmudgeTool.h"
 #include "PaintWidget.h"
 
diff -Nru photoflare-1.5.7/src/tools/SmudgeTool.h photoflare-1.6.0/src/tools/SmudgeTool.h
--- photoflare-1.5.7/src/tools/SmudgeTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/SmudgeTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef SMUDGETOOL_H
 #define SMUDGETOOL_H
 
@@ -12,7 +29,7 @@
     SmudgeTool(QObject *parent = 0);
     ~SmudgeTool();
 
-    QCursor getCursor();
+    QCursor getCursor() override;
 
     void setRadius(int radius);
     void setPressure(int pressure);
diff -Nru photoflare-1.5.7/src/tools/SprayCanTool.cpp photoflare-1.6.0/src/tools/SprayCanTool.cpp
--- photoflare-1.5.7/src/tools/SprayCanTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/SprayCanTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #include "SprayCanTool.h"
 
 #include <QPainter>
diff -Nru photoflare-1.5.7/src/tools/SprayCanTool.h photoflare-1.6.0/src/tools/SprayCanTool.h
--- photoflare-1.5.7/src/tools/SprayCanTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/SprayCanTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef SPRAYCANTOOL_H
 #define SPRAYCANTOOL_H
 
@@ -25,7 +42,7 @@
     void onMousePress(const QPoint &pos, Qt::MouseButton button) override;
     void onMouseMove(const QPoint &pos) override;
     void onMouseRelease(const QPoint &pos) override;
-    QCursor getCursor();
+    QCursor getCursor() override;
 
 public slots:
     void setPrimaryColor(const QColor &color);
@@ -33,7 +50,7 @@
 
 private:
     void fillPattern();
-    void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) override;
 private:
     SprayCanToolPrivate *d;
 };
diff -Nru photoflare-1.5.7/src/tools/StampTool.cpp photoflare-1.6.0/src/tools/StampTool.cpp
--- photoflare-1.5.7/src/tools/StampTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/StampTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  StampTool - Clone an area of an image and paint it over the image.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// StampTool - Clone an area of an image and paint it over the image.
+
 #include "StampTool.h"
 #include "PaintWidget.h"
 
diff -Nru photoflare-1.5.7/src/tools/StampTool.h photoflare-1.6.0/src/tools/StampTool.h
--- photoflare-1.5.7/src/tools/StampTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/StampTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef STAMPTOOL_H
 #define STAMPTOOL_H
 
@@ -24,7 +41,7 @@
     void setPrecise(bool precise);
     void setDiffuse(bool diffuse);
 
-    QCursor getCursor();
+    QCursor getCursor() override;
 
     void setCapStyle(Qt::PenCapStyle capStyle);
 
diff -Nru photoflare-1.5.7/src/tools/TextTool.cpp photoflare-1.6.0/src/tools/TextTool.cpp
--- photoflare-1.5.7/src/tools/TextTool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/TextTool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  TextTool - Put text on the image. Tool not present in the Toolpalette but launched from the TextDialog.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// TextTool - Put text on the image. Tool not present in the Toolpalette but launched from the TextDialog.
+
 #include "TextTool.h"
 
 #include <QPainter>
@@ -22,7 +35,6 @@
 
     QPoint firstPos;
     QPoint secondPos;
-
     QRect textRect;
     QString text;
     QFont font;
@@ -75,7 +87,8 @@
 
 void TextTool::previewText()
 {
-    if (m_paintDevice) {
+    if (m_paintDevice)
+    {
         const QImage *image = dynamic_cast<QImage*>(m_paintDevice);
         QImage surface = QImage(image->size(), QImage::Format_ARGB32_Premultiplied);
 
@@ -102,7 +115,8 @@
 
 void TextTool::drawText()
 {
-    if (m_paintDevice) {
+    if (m_paintDevice)
+    {
         QPainter painter(m_paintDevice);
         painter.setPen(d->color);
         painter.setFont(d->font);
@@ -145,7 +159,8 @@
 void TextTool::onMouseMove(const QPoint &pos)
 {
     d->secondPos = pos;
-    if(d->previewMode) {
+    if(d->previewMode)
+    {
         d->textRect.moveTo(pos);
         previewText();
     }
@@ -153,9 +168,7 @@
 
 void TextTool::onMouseRelease(const QPoint &pos)
 {
-    if(d->previewMode &&
-       d->firstPos == d->secondPos &&
-       d->textRect.contains(pos))
+    if(d->previewMode && d->firstPos == d->secondPos && d->textRect.contains(pos))
     {
         emit editText(d->text, d->font, d->color);
     }
diff -Nru photoflare-1.5.7/src/tools/TextTool.h photoflare-1.6.0/src/tools/TextTool.h
--- photoflare-1.5.7/src/tools/TextTool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/TextTool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef TEXTTOOL_H
 #define TEXTTOOL_H
 
diff -Nru photoflare-1.5.7/src/tools/Tool.cpp photoflare-1.6.0/src/tools/Tool.cpp
--- photoflare-1.5.7/src/tools/Tool.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/Tool.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,11 +1,23 @@
 /*
+    This file is part of Photoflare.
 
-  Generic Tool class. All Tools will extend this class.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "Tool.h"
+// Generic Tool class. All Tools will extend this class.
 
+#include "Tool.h"
 #include <QPainter>
 
 Tool::Tool(QObject *parent)
diff -Nru photoflare-1.5.7/src/tools/Tool.h photoflare-1.6.0/src/tools/Tool.h
--- photoflare-1.5.7/src/tools/Tool.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/tools/Tool.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef TOOL_H
 #define TOOL_H
 
diff -Nru photoflare-1.5.7/src/toolSettings/BlurSettingsWidget.cpp photoflare-1.6.0/src/toolSettings/BlurSettingsWidget.cpp
--- photoflare-1.5.7/src/toolSettings/BlurSettingsWidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/BlurSettingsWidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Widget for BlurTool settings.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for BlurTool settings.
+
 #include "BlurSettingsWidget.h"
 #include "ui_BlurSettingsWidget.h"
 
diff -Nru photoflare-1.5.7/src/toolSettings/BlurSettingsWidget.h photoflare-1.6.0/src/toolSettings/BlurSettingsWidget.h
--- photoflare-1.5.7/src/toolSettings/BlurSettingsWidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/BlurSettingsWidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,25 @@
-#ifndef BLURSETTINGSWIDGET_H
-#define BLURSETTINGSWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Widget for BlurTool settings.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for BlurTool settings.
+
+#ifndef BLURSETTINGSWIDGET_H
+#define BLURSETTINGSWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/toolSettings/erasersettingswidget.cpp photoflare-1.6.0/src/toolSettings/erasersettingswidget.cpp
--- photoflare-1.5.7/src/toolSettings/erasersettingswidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/erasersettingswidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #include "erasersettingswidget.h"
 #include "ui_erasersettingswidget.h"
 
diff -Nru photoflare-1.5.7/src/toolSettings/erasersettingswidget.h photoflare-1.6.0/src/toolSettings/erasersettingswidget.h
--- photoflare-1.5.7/src/toolSettings/erasersettingswidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/erasersettingswidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef ERASERSETTINGSWIDGET_H
 #define ERASERSETTINGSWIDGET_H
 
diff -Nru photoflare-1.5.7/src/toolSettings/LineSettingsWidget.cpp photoflare-1.6.0/src/toolSettings/LineSettingsWidget.cpp
--- photoflare-1.5.7/src/toolSettings/LineSettingsWidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/LineSettingsWidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Widget for LineTool settings.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for LineTool settings.
+
 #include <QGraphicsPixmapItem>
 
 #include "LineSettingsWidget.h"
diff -Nru photoflare-1.5.7/src/toolSettings/LineSettingsWidget.h photoflare-1.6.0/src/toolSettings/LineSettingsWidget.h
--- photoflare-1.5.7/src/toolSettings/LineSettingsWidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/LineSettingsWidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,25 @@
-#ifndef LINESETTINGSWIDGET_H
-#define LINESETTINGSWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Widget for LineTool settings.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for LineTool settings.
+
+#ifndef LINESETTINGSWIDGET_H
+#define LINESETTINGSWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/toolSettings/MagicWandSettingsWidget.cpp photoflare-1.6.0/src/toolSettings/MagicWandSettingsWidget.cpp
--- photoflare-1.5.7/src/toolSettings/MagicWandSettingsWidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/MagicWandSettingsWidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Widget for MagicWandTool settings.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for MagicWandTool settings.
+
 #include "MagicWandSettingsWidget.h"
 #include "ui_MagicWandSettingsWidget.h"
 
diff -Nru photoflare-1.5.7/src/toolSettings/MagicWandSettingsWidget.h photoflare-1.6.0/src/toolSettings/MagicWandSettingsWidget.h
--- photoflare-1.5.7/src/toolSettings/MagicWandSettingsWidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/MagicWandSettingsWidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,25 @@
-#ifndef MAGICWANDSETTINGSWIDGET_H
-#define MAGICWANDSETTINGSWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Widget for MagicWandTool settings.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for MagicWandTool settings.
+
+#ifndef MAGICWANDSETTINGSWIDGET_H
+#define MAGICWANDSETTINGSWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/toolSettings/PaintBrushAdvSettingsWidget.cpp photoflare-1.6.0/src/toolSettings/PaintBrushAdvSettingsWidget.cpp
--- photoflare-1.5.7/src/toolSettings/PaintBrushAdvSettingsWidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/PaintBrushAdvSettingsWidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Widget for AdvancedPaintbrushTool settings.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for AdvancedPaintbrushTool settings.
+
 #include "PaintBrushAdvSettingsWidget.h"
 #include "ui_PaintBrushAdvSettingsWidget.h"
 
diff -Nru photoflare-1.5.7/src/toolSettings/PaintBrushAdvSettingsWidget.h photoflare-1.6.0/src/toolSettings/PaintBrushAdvSettingsWidget.h
--- photoflare-1.5.7/src/toolSettings/PaintBrushAdvSettingsWidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/PaintBrushAdvSettingsWidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,25 @@
-#ifndef PAINTBRUSHADVSETTINGSWIDGET_H
-#define PAINTBRUSHADVSETTINGSWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Widget for AdvancedPaintbrushTool settings.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+//Widget for AdvancedPaintbrushTool settings.
+
+#ifndef PAINTBRUSHADVSETTINGSWIDGET_H
+#define PAINTBRUSHADVSETTINGSWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/toolSettings/PaintBrushSettingsWidget.cpp photoflare-1.6.0/src/toolSettings/PaintBrushSettingsWidget.cpp
--- photoflare-1.5.7/src/toolSettings/PaintBrushSettingsWidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/PaintBrushSettingsWidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Widget for PaintBrushTool settings.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for PaintBrushTool settings.
+
 #include "PaintBrushSettingsWidget.h"
 #include "ui_PaintBrushSettingsWidget.h"
 
diff -Nru photoflare-1.5.7/src/toolSettings/PaintBrushSettingsWidget.h photoflare-1.6.0/src/toolSettings/PaintBrushSettingsWidget.h
--- photoflare-1.5.7/src/toolSettings/PaintBrushSettingsWidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/PaintBrushSettingsWidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,25 @@
-#ifndef PAINTBRUSHSETTINGSWIDGET_H
-#define PAINTBRUSHSETTINGSWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Widget for PaintBrushTool settings.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for PaintBrushTool settings.
+
+#ifndef PAINTBRUSHSETTINGSWIDGET_H
+#define PAINTBRUSHSETTINGSWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/toolSettings/pointersettingswidget.cpp photoflare-1.6.0/src/toolSettings/pointersettingswidget.cpp
--- photoflare-1.5.7/src/toolSettings/pointersettingswidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/pointersettingswidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #include "pointersettingswidget.h"
 #include "ui_pointersettingswidget.h"
 
@@ -12,7 +29,7 @@
 
     ui->checkBoxStroke->setHidden(true);
     ui->checkBoxFill->setHidden(true);
-    ui->square_sel->setDisabled(true);
+    ui->square_sel->setHidden(true); // Hide until we have more selection types available
     ui->circle_sel->setHidden(true);
 }
 
diff -Nru photoflare-1.5.7/src/toolSettings/pointersettingswidget.h photoflare-1.6.0/src/toolSettings/pointersettingswidget.h
--- photoflare-1.5.7/src/toolSettings/pointersettingswidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/pointersettingswidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef POINTERSETTINGSWIDGET_H
 #define POINTERSETTINGSWIDGET_H
 
diff -Nru photoflare-1.5.7/src/toolSettings/SmudgeSettingsWidget.cpp photoflare-1.6.0/src/toolSettings/SmudgeSettingsWidget.cpp
--- photoflare-1.5.7/src/toolSettings/SmudgeSettingsWidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/SmudgeSettingsWidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Widget for SmudgeTool settings.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for SmudgeTool settings.
+
 #include "SmudgeSettingsWidget.h"
 #include "ui_smudgesettingswidget.h"
 
diff -Nru photoflare-1.5.7/src/toolSettings/SmudgeSettingsWidget.h photoflare-1.6.0/src/toolSettings/SmudgeSettingsWidget.h
--- photoflare-1.5.7/src/toolSettings/SmudgeSettingsWidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/SmudgeSettingsWidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,25 @@
-#ifndef SMUDGESETTINGSWIDGET_H
-#define SMUDGESETTINGSWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Widget for SmudgeTool settings.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for SmudgeTool settings.
+
+#ifndef SMUDGESETTINGSWIDGET_H
+#define SMUDGESETTINGSWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/toolSettings/SprayCanSettingsWidget.cpp photoflare-1.6.0/src/toolSettings/SprayCanSettingsWidget.cpp
--- photoflare-1.5.7/src/toolSettings/SprayCanSettingsWidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/SprayCanSettingsWidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Widget for SprayCanTool settings.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for SprayCanTool settings.
+
 #include "SprayCanSettingsWidget.h"
 #include "ui_SprayCanSettingsWidget.h"
 
diff -Nru photoflare-1.5.7/src/toolSettings/SprayCanSettingsWidget.h photoflare-1.6.0/src/toolSettings/SprayCanSettingsWidget.h
--- photoflare-1.5.7/src/toolSettings/SprayCanSettingsWidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/SprayCanSettingsWidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,25 @@
-#ifndef SPRAYCANSETTINGSWIDGET_H
-#define SPRAYCANSETTINGSWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Widget for SprayCanTool settings.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for SprayCanTool settings.
+
+#ifndef SPRAYCANSETTINGSWIDGET_H
+#define SPRAYCANSETTINGSWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/toolSettings/StampSettingsWidget.cpp photoflare-1.6.0/src/toolSettings/StampSettingsWidget.cpp
--- photoflare-1.5.7/src/toolSettings/StampSettingsWidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/StampSettingsWidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,21 @@
 /*
+    This file is part of Photoflare.
 
-  Widget for StampTool settings.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for StampTool settings.
 
 #include "StampSettingsWidget.h"
 #include "ui_StampSettingsWidget.h"
diff -Nru photoflare-1.5.7/src/toolSettings/StampSettingsWidget.h photoflare-1.6.0/src/toolSettings/StampSettingsWidget.h
--- photoflare-1.5.7/src/toolSettings/StampSettingsWidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/toolSettings/StampSettingsWidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,25 @@
-#ifndef STAMPSETTINGSWIDGET_H
-#define STAMPSETTINGSWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Widget for StampTool settings.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget for StampTool settings.
+
+#ifndef STAMPSETTINGSWIDGET_H
+#define STAMPSETTINGSWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/widgets/brushtypecombobox.cpp photoflare-1.6.0/src/widgets/brushtypecombobox.cpp
--- photoflare-1.5.7/src/widgets/brushtypecombobox.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/brushtypecombobox.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Special combo to hold Brush Types.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Special combo to hold Brush Types.
+
 #include <QPainter>
 #include <QStyledItemDelegate>
 #include <QStyleOptionViewItem>
diff -Nru photoflare-1.5.7/src/widgets/brushtypecombobox.h photoflare-1.6.0/src/widgets/brushtypecombobox.h
--- photoflare-1.5.7/src/widgets/brushtypecombobox.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/brushtypecombobox.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef BRUSHTYPECOMBOBOX_H
-#define BRUSHTYPECOMBOBOX_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Special combo to hold Brush Types.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef BRUSHTYPECOMBOBOX_H
+#define BRUSHTYPECOMBOBOX_H
+
 #include <QComboBox>
 
 class QComboBoxEventsInterface
diff -Nru photoflare-1.5.7/src/widgets/colorboxwidget.cpp photoflare-1.6.0/src/widgets/colorboxwidget.cpp
--- photoflare-1.5.7/src/widgets/colorboxwidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/colorboxwidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Widget to choose colors.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Widget to choose colors.
+
 #include <QColorDialog>
 #include <QMouseEvent>
 
diff -Nru photoflare-1.5.7/src/widgets/colorboxwidget.h photoflare-1.6.0/src/widgets/colorboxwidget.h
--- photoflare-1.5.7/src/widgets/colorboxwidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/colorboxwidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef COLORBOXWIDGET_H
-#define COLORBOXWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Widget to choose colors.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef COLORBOXWIDGET_H
+#define COLORBOXWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/widgets/imagepositionwidget.cpp photoflare-1.6.0/src/widgets/imagepositionwidget.cpp
--- photoflare-1.5.7/src/widgets/imagepositionwidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/imagepositionwidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Image position widget for the PhotoFlare application.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Image position widget for the PhotoFlare application.
+
 #include "imagepositionwidget.h"
 #include "ui_imagepositionwidget.h"
 //#include <QDebug>
diff -Nru photoflare-1.5.7/src/widgets/imagepositionwidget.h photoflare-1.6.0/src/widgets/imagepositionwidget.h
--- photoflare-1.5.7/src/widgets/imagepositionwidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/imagepositionwidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef IMAGEPOSITIONWIDGET_H
-#define IMAGEPOSITIONWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Image position widget for the PhotoFlare application.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef IMAGEPOSITIONWIDGET_H
+#define IMAGEPOSITIONWIDGET_H
+
 #include <QWidget>
 
 namespace Ui {
diff -Nru photoflare-1.5.7/src/widgets/layermanager.cpp photoflare-1.6.0/src/widgets/layermanager.cpp
--- photoflare-1.5.7/src/widgets/layermanager.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/layermanager.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #include "layermanager.h"
 #include "ui_layermanager.h"
 
diff -Nru photoflare-1.5.7/src/widgets/layermanager.h photoflare-1.6.0/src/widgets/layermanager.h
--- photoflare-1.5.7/src/widgets/layermanager.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/layermanager.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef LAYERMANAGER_H
 #define LAYERMANAGER_H
 
diff -Nru photoflare-1.5.7/src/widgets/PaintWidget.cpp photoflare-1.6.0/src/widgets/PaintWidget.cpp
--- photoflare-1.5.7/src/widgets/PaintWidget.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/PaintWidget.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,27 +1,37 @@
 /*
+    This file is part of Photoflare.
 
-  Paint widget class. Handles the drawing area.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Paint widget class. Handles the drawing area.
+
 //#include <QDebug>
 
 #include <QLabel>
 #include <QPainter>
 #include <QScrollBar>
-#include <QMouseEvent>
-#include <QGraphicsView>
 #include <QGraphicsScene>
-#include <QGraphicsPixmapItem>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsProxyWidget>
 #include <QImageReader>
 
+#include "../Settings.h"
 #include "PaintWidget.h"
 #include "./Tool.h"
 
 #include "QProgressIndicator.h"
-#include "src/Settings.h"
 
 class PaintWidgetPrivate : public QGraphicsScene
 {
@@ -37,7 +47,6 @@
 
         isSelectionVisible = true;
         hotspotVisible = false;
-        selection = QRect();
     }
     ~PaintWidgetPrivate()
     {
@@ -65,12 +74,17 @@
         painter.drawImage(0, 0, image);
         if(isSelectionVisible)
         {
-            float scaledVal = 3.00/scale;
+            float scaledVal = 2.00;
             int cornerSize = 50;
 
             if(scale < 0.5)
             {
                 cornerSize = 100;
+                scaledVal = 5.00;
+            }
+            else if(scale > 1) {
+                cornerSize = 20;
+                scaledVal = 1.00;
             }
 
             //Draw the selection hotspots
@@ -184,7 +198,7 @@
         if (currentTool)
         {
             currentTool->onMouseRelease(QPoint(event->scenePos().x(), event->scenePos().y()));
-            if(imageChanged)
+            if(q->selection().size()==0 && imageChanged)
             {
                 q->onContentChanged();
                 q->contentChanged();
@@ -449,8 +463,19 @@
 {
     const QPointF p0scene = mapToScene(event->pos());
     float scaleFactor = 1.1f;
+    bool zoomDirection;
+
+    // Zoom in or out depending on user preference
+    if(SETTINGS->getZoomDirection()=="0")
+    {
+        zoomDirection = event->delta() > 0;
+    }
+    else
+    {
+        zoomDirection = event->delta() < 0;
+    }
 
-    if(event->delta() > 0)
+    if(zoomDirection)
     {
        d->scale = d->scale / scaleFactor;
        d->scale = (d->scale < 0.1f) ? 0.1f : d->scale;
diff -Nru photoflare-1.5.7/src/widgets/PaintWidget.h photoflare-1.6.0/src/widgets/PaintWidget.h
--- photoflare-1.5.7/src/widgets/PaintWidget.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/widgets/PaintWidget.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,12 +1,23 @@
-#ifndef PAINTWIDGET_H
-#define PAINTWIDGET_H
-
 /*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-  Paint widget class. Handles the drawing area.
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#ifndef PAINTWIDGET_H
+#define PAINTWIDGET_H
+
 #include <QGraphicsView>
 
 class PaintWidgetPrivate;
diff -Nru photoflare-1.5.7/src/workers/BatchProcessWorker.cpp photoflare-1.6.0/src/workers/BatchProcessWorker.cpp
--- photoflare-1.5.7/src/workers/BatchProcessWorker.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/workers/BatchProcessWorker.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,9 +1,22 @@
 /*
+    This file is part of Photoflare.
 
-  Worker class for the BatchDialog to process the files.
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+// Worker class for the BatchDialog to process the files.
+
 //#include <QDebug>
 #include <QFileInfo>
 
@@ -152,10 +165,10 @@
                 break;
         }
 
-        image = FilterManager::instance()->setBrightness(image, m_params->brightness(), m_params->brightnessChannel());
-        image = FilterManager::instance()->setSaturation(image, m_params->saturation(), m_params->saturationChannel());
-        image = FilterManager::instance()->setContrast(image, m_params->contrast(), m_params->contrastChannel());
-        image = FilterManager::instance()->setGamma(image, m_params->gamma(), m_params->gammaChannel());
+        image = FilterManager::instance()->setBrightness(image, m_params->brightness());
+        image = FilterManager::instance()->setSaturation(image, m_params->saturation());
+        image = FilterManager::instance()->setContrast(image, m_params->contrast());
+        image = FilterManager::instance()->setGamma(image, m_params->gamma());
 
         QString newFile = m_params->outDir() + "/" + QFileInfo(file).baseName()+m_params->outputFormat();
         emit fileProcessFinished(newFile, image);
diff -Nru photoflare-1.5.7/src/workers/BatchProcessWorker.h photoflare-1.6.0/src/workers/BatchProcessWorker.h
--- photoflare-1.5.7/src/workers/BatchProcessWorker.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/workers/BatchProcessWorker.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef BATCHPROCESSWORKER_H
 #define BATCHPROCESSWORKER_H
 
diff -Nru photoflare-1.5.7/src/workers/filterworker.cpp photoflare-1.6.0/src/workers/filterworker.cpp
--- photoflare-1.5.7/src/workers/filterworker.cpp	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/workers/filterworker.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,22 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+// Worker class for the application to apply the filters. (Single threaded - Not all filters work with OpenMP)
+
 #include "filterworker.h"
 #include "FilterManager.h"
 #include "PaintWidget.h"
@@ -30,35 +49,35 @@
 
     if(currentFilter == "gammacorrectminus")
     {
-        newImage = FilterManager::instance()->setGamma(currentImage, 0.9, 0);
+        newImage = FilterManager::instance()->setGamma(currentImage, 0.9);
     }
     else if(currentFilter == "gammacorrectplus")
     {
-        newImage = FilterManager::instance()->setGamma(currentImage, 1.1, 0);
+        newImage = FilterManager::instance()->setGamma(currentImage, 1.1);
     }
     else if(currentFilter == "saturationminus")
     {
-        newImage = FilterManager::instance()->setSaturation(currentImage, -15, 0);
+        newImage = FilterManager::instance()->setSaturation(currentImage, -15);
     }
     else if(currentFilter == "saturationplus")
     {
-        newImage = FilterManager::instance()->setSaturation(currentImage, +15, 0);
+        newImage = FilterManager::instance()->setSaturation(currentImage, +15);
     }
     else if(currentFilter == "contrastminus")
     {
-        newImage = FilterManager::instance()->setContrast(currentImage, 0.5, 0);
+        newImage = FilterManager::instance()->setContrast(currentImage, 0.5);
     }
     else if(currentFilter == "contrastplus")
     {
-        newImage = FilterManager::instance()->setContrast(currentImage, 1.0, 0);
+        newImage = FilterManager::instance()->setContrast(currentImage, 1.0);
     }
     else if(currentFilter == "brightminus")
     {
-        newImage = FilterManager::instance()->setBrightness(currentImage, -5, 0);
+        newImage = FilterManager::instance()->setBrightness(currentImage, -5);
     }
     else if(currentFilter == "brightplus")
     {
-        newImage = FilterManager::instance()->setBrightness(currentImage, 5, 0);
+        newImage = FilterManager::instance()->setBrightness(currentImage, 5);
     }
     else if(currentFilter == "flipHorz")
     {
diff -Nru photoflare-1.5.7/src/workers/filterworker.h photoflare-1.6.0/src/workers/filterworker.h
--- photoflare-1.5.7/src/workers/filterworker.h	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/src/workers/filterworker.h	2019-09-17 21:28:37.000000000 +0000
@@ -1,3 +1,20 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 #ifndef FILTERWORKER_H
 #define FILTERWORKER_H
 
diff -Nru photoflare-1.5.7/src/workers/filterworkermp.cpp photoflare-1.6.0/src/workers/filterworkermp.cpp
--- photoflare-1.5.7/src/workers/filterworkermp.cpp	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/src/workers/filterworkermp.cpp	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,276 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+// Worker class for the application to apply the filters. (Multi threaded using OpenMP)
+
+#include "filterworkermp.h"
+#include "FilterManager.h"
+#include "PaintWidget.h"
+#include <vector>
+#include <cmath>
+#include "omp.h"
+
+//#include <QDebug>
+
+FilterWorkerMP::FilterWorkerMP(QObject *parent) : QObject(parent)
+{
+
+}
+
+void FilterWorkerMP::setImage(QImage image)
+{
+    currentImage = image;
+}
+
+void FilterWorkerMP::setFilter(QString filter)
+{
+    currentFilter = filter;
+}
+
+void FilterWorkerMP::setDoubleVal(double v)
+{
+    currentDouble = v;
+}
+
+void FilterWorkerMP::process()
+{
+    QImage newImage = currentImage;
+
+    int maxThreads = omp_get_max_threads();
+    int w = currentImage.width();
+    int h = currentImage.height();
+
+    #pragma omp parallel shared(currentImage, newImage) firstprivate(maxThreads, w, h)
+{
+    #pragma omp for schedule(dynamic) nowait
+    for(int thread=0;thread<maxThreads;thread++) {
+        int top = std::ceil(h/float(maxThreads))*thread;
+        int bottom = std::min(h,int(std::ceil(h/float(maxThreads))*(thread+1)))-1;
+
+//        qDebug() << "iteration: " << thread;
+        QImage currentImageSlice = currentImage.copy(0,top,w,bottom-top);
+//        qDebug() << "args: " << 0 << ", " << top << ", " << w << ", " << bottom;
+        QImage newImageSlice(currentImageSlice);
+//        qDebug() << "current image dims: " +currentImageSlice.height() << ", " << currentImageSlice.width();
+
+        if(currentFilter == "gammacorrectminus")
+        {
+            newImageSlice = FilterManager::instance()->setGamma(currentImageSlice, 0.9);
+        }
+        else if(currentFilter == "gammacorrectplus")
+        {
+            newImageSlice = FilterManager::instance()->setGamma(currentImageSlice, 1.1);
+        }
+        else if(currentFilter == "saturationminus")
+        {
+            newImageSlice = FilterManager::instance()->setSaturation(currentImageSlice, -15);
+        }
+        else if(currentFilter == "saturationplus")
+        {
+            newImageSlice = FilterManager::instance()->setSaturation(currentImageSlice, +15);
+        }
+        else if(currentFilter == "contrastminus")
+        {
+            newImageSlice = FilterManager::instance()->setContrast(currentImageSlice, 0.5);
+        }
+        else if(currentFilter == "contrastplus")
+        {
+            newImageSlice = FilterManager::instance()->setContrast(currentImageSlice, 1.0);
+        }
+        else if(currentFilter == "brightminus")
+        {
+            newImageSlice = FilterManager::instance()->setBrightness(currentImageSlice, -5);
+        }
+        else if(currentFilter == "brightplus")
+        {
+            newImageSlice = FilterManager::instance()->setBrightness(currentImageSlice, 5);
+        }
+        else if(currentFilter == "flipHorz")
+        {
+            newImageSlice = FilterManager::instance()->flipHorz(currentImageSlice);
+        }
+        else if(currentFilter == "flipVert")
+        {
+            newImageSlice = FilterManager::instance()->flipVert(currentImageSlice);
+        }
+        else if(currentFilter == "rotateCCW")
+        {
+            newImageSlice = FilterManager::instance()->rotateCCW(currentImageSlice);
+        }
+        else if(currentFilter == "rotateCW")
+        {
+            newImageSlice = FilterManager::instance()->rotateCW(currentImageSlice);
+        }
+        else if(currentFilter == "trim")
+        {
+            newImageSlice = FilterManager::instance()->trim(currentImageSlice);
+        }
+        else if(currentFilter == "dropShadow")
+        {
+            newImageSlice = FilterManager::instance()->dropShadow(currentImageSlice, 5, 40, Qt::black,0,10);
+        }
+        else if(currentFilter == "autoLevels")
+        {
+            newImageSlice = FilterManager::instance()->autoLevels(currentImageSlice);
+        }
+        else if(currentFilter == "autoContrast")
+        {
+            newImageSlice = FilterManager::instance()->autoContrast(currentImageSlice);
+        }
+        else if(currentFilter == "negative")
+        {
+            newImageSlice = FilterManager::instance()->negative(currentImageSlice);
+        }
+        else if(currentFilter == "setOpacity")
+        {
+            newImageSlice = FilterManager::instance()->setOpacity(currentImageSlice,currentDouble);
+        }
+        else if(currentFilter == "soften")
+        {
+            newImageSlice = FilterManager::instance()->soften(currentImageSlice);
+        }
+        else if(currentFilter == "blur")
+        {
+            newImageSlice = FilterManager::instance()->blur(currentImageSlice);
+        }
+        else if(currentFilter == "sharpen")
+        {
+            newImageSlice = FilterManager::instance()->sharpen(currentImageSlice);
+        }
+        else if(currentFilter == "reinforce")
+        {
+            newImageSlice = FilterManager::instance()->reinforce(currentImageSlice);
+        }
+        else if(currentFilter == "dustreduction")
+        {
+            newImageSlice = FilterManager::instance()->dustreduction(currentImageSlice);
+        }
+        else if(currentFilter == "deSpeckle")
+        {
+            newImageSlice = FilterManager::instance()->deSpeckle(currentImageSlice);
+        }
+        else if(currentFilter == "gaussianNoise")
+        {
+            newImageSlice = FilterManager::instance()->gaussianNoise(currentImageSlice);
+        }
+        else if(currentFilter == "impulseNoise")
+        {
+            newImageSlice = FilterManager::instance()->impulseNoise(currentImageSlice);
+        }
+        else if(currentFilter == "laplacianNoise")
+        {
+            newImageSlice = FilterManager::instance()->laplacianNoise(currentImageSlice);
+        }
+        else if(currentFilter == "poissonNoise")
+        {
+            newImageSlice = FilterManager::instance()->poissonNoise(currentImageSlice);
+        }
+        else if(currentFilter == "grayscale")
+        {
+            newImageSlice = FilterManager::instance()->grayscale(currentImageSlice);
+        }
+        else if(currentFilter == "oldPhoto")
+        {
+            newImageSlice = FilterManager::instance()->oldPhoto(currentImageSlice);
+        }
+        else if(currentFilter == "sepia")
+        {
+            newImageSlice = FilterManager::instance()->sepia(currentImageSlice);
+        }
+        else if(currentFilter == "equalizeColours")
+        {
+            newImageSlice = FilterManager::instance()->equalizeColours(currentImageSlice);
+        }
+        else if(currentFilter == "normalize")
+        {
+            newImageSlice = FilterManager::instance()->normalize(currentImageSlice);
+        }
+        else if(currentFilter == "blackwhite")
+        {
+            newImageSlice = FilterManager::instance()->blackwhite(currentImageSlice);
+        }
+        else if(currentFilter == "oil")
+        {
+            newImageSlice = FilterManager::instance()->oilPaint(currentImageSlice);
+        }
+        else if(currentFilter == "charcoal")
+        {
+            newImageSlice = FilterManager::instance()->charcoal(currentImageSlice);
+        }
+        else if(currentFilter == "solarize")
+        {
+            newImageSlice = FilterManager::instance()->solarize(currentImageSlice);
+        }
+        else if(currentFilter == "motionBlur")
+        {
+            newImageSlice = FilterManager::instance()->motionBlur(currentImageSlice);
+        }
+        else if(currentFilter == "swirl")
+        {
+            newImageSlice = FilterManager::instance()->swirl(currentImageSlice);
+        }
+        else if(currentFilter == "wave")
+        {
+            newImageSlice = FilterManager::instance()->wave(currentImageSlice);
+        }
+        else if(currentFilter == "implode")
+        {
+            newImageSlice = FilterManager::instance()->implode(currentImageSlice);
+        }
+        else if(currentFilter == "explode")
+        {
+            newImageSlice = FilterManager::instance()->explode(currentImageSlice);
+        }
+        else if(currentFilter == "cropToCenter")
+        {
+            newImageSlice = FilterManager::instance()->cropToCenter(currentImageSlice);
+        }
+        else if(currentFilter == "simpleFrame")
+        {
+            newImageSlice = FilterManager::instance()->simpleFrame(currentImageSlice);
+        }
+        else if(currentFilter == "advFrame")
+        {
+            newImageSlice = FilterManager::instance()->advFrame(currentImageSlice);
+        }
+        else if(currentFilter == "emboss")
+        {
+            newImageSlice = FilterManager::instance()->emboss(currentImageSlice);
+        }
+        else if(currentFilter == "monoChromeEdges")
+        {
+            newImageSlice = FilterManager::instance()->monoChromeEdges(currentImageSlice);
+        }
+        else if(currentFilter == "colourthreshold")
+        {
+            newImageSlice = FilterManager::instance()->colourthreshold(currentImageSlice);
+        }
+
+
+        for(int y=0; y<bottom-top;y++)
+        {
+            int outputY = y+top;
+            for(int x=0;x<w;x++)
+            {
+                newImage.setPixel(x,outputY,newImageSlice.pixel(x,y));
+            }
+        }
+    }
+}
+
+    emit filterProcessFinished(newImage);
+}
diff -Nru photoflare-1.5.7/src/workers/filterworkermp.h photoflare-1.6.0/src/workers/filterworkermp.h
--- photoflare-1.5.7/src/workers/filterworkermp.h	1970-01-01 00:00:00.000000000 +0000
+++ photoflare-1.6.0/src/workers/filterworkermp.h	2019-09-17 21:28:37.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+    This file is part of Photoflare.
+
+    Photoflare is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photoflare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photoflare.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#ifndef FILTERWORKERMP_H
+#define FILTERWORKERMP_H
+
+#include <QObject>
+#include "../mainwindow.h"
+
+class FilterWorkerMP : public QObject
+{
+    Q_OBJECT
+public:
+    //FilterWorker();
+    explicit FilterWorkerMP(QObject *parent = 0);
+    void setParent(MainWindow* parent){m_parent = parent;}
+    void setImage(QImage image);
+    void setFilter(QString filter);
+    void setDoubleVal(double v);
+
+public slots:
+    void process();
+
+signals:
+    void filterProcessFinished(QImage image);
+
+private:
+    MainWindow* m_parent;
+    QImage currentImage;
+    QString currentFilter;
+    double currentDouble;
+};
+
+#endif // FILTERWORKERMP_H
diff -Nru photoflare-1.5.7/.travis.yml photoflare-1.6.0/.travis.yml
--- photoflare-1.5.7/.travis.yml	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/.travis.yml	2019-09-17 21:28:37.000000000 +0000
@@ -1,15 +1,15 @@
 language: cpp
 compiler: gcc
 sudo: require
-dist: trusty
+dist: xenial
 
 before_install:
-    - sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-trusty -y
+    - sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-xenial -y
     - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
     - sudo apt-get update
     
 install:
-    - sudo apt-get -y install libc6 qt510base qt510tools gcc-8
+    - sudo apt-get -y install libc6 libgl1-mesa-dev qt510base qt510tools gcc-8 libomp-dev
     - source /opt/qt5*/bin/qt5*-env.sh
 
 script:
diff -Nru photoflare-1.5.7/versions/stable.json photoflare-1.6.0/versions/stable.json
--- photoflare-1.5.7/versions/stable.json	2019-02-17 22:50:48.000000000 +0000
+++ photoflare-1.6.0/versions/stable.json	2019-09-17 21:28:37.000000000 +0000
@@ -1 +1 @@
-1.5.6.1
+1.5.9