diff --git a/KritaFAQ.rst b/KritaFAQ.rst
index f2779f1ac..b9d0c1a0e 100644
--- a/KritaFAQ.rst
+++ b/KritaFAQ.rst
@@ -1,483 +1,488 @@
 .. .. meta::
    :description:
         Frequently asked Krita Questions.
 
 .. metadata-placeholder
 
    :authors: - Scott Petrovic
              - Wolthera van Hövell tot Westerflier <griffinvalley@gmail.com>
              - Raghavendra Kamath <raghu@raghukamath.com>
              - Boudewijn Rempt <boud@valdyas.org>
              - Alvin Wong
              - Dmitry Kazakov
              - Timothée Giet
              - Tokiedian
              - Nmaghfurusman
              - RJ Quiralta
              - Tyson Tan
    :license: GNU free documentation license 1.3 or later.
 
 .. index:: FAQ, Frequently Asked Questions
 .. _faq:
 .. _KritaFAQ:
 
 
 #########
 Krita FAQ
 #########
 
 This page contains common problems people have with Krita. Note that we assume that you are using the latest version of Krita. Please verify that to make sure.
 
 .. contents::
 
 General
 =======
 
 General questions
 
 What is Krita?
 --------------
 
 This is our vision for the development of Krita:
 
     Krita is a free and open source cross-platform application that offers an end-to-end solution for creating digital art files from scratch. Krita is optimized for frequent, prolonged and focused use.
     Explicitly supported fields of painting are illustrations, concept art, matte painting, textures, comics and animations.
     Developed together with users, Krita is an application that supports their actual needs and workflow. Krita supports open standards and interoperates with other applications.
 
 Is it possible to use Krita in my own language, not English?
 ------------------------------------------------------------
 
 Krita should automatically use the system language. If that is not the case, please follow these steps:
 
 #. Settings --> Switch Application Language. A small window will appear.
 #. Click Primary language and select your language.
 #. Click OK to close the window.
 #. Restart krita and it will be displayed in your selected language!
 
 If this doesn't work, you might have to add a fall-back language as well. This is a bug, but we haven't found the solution yet.
 
 Does Krita have layer clip or clipping mask?
 --------------------------------------------
 
 Krita has no clipping mask, but it has a clipping feature called
 inherit alpha. Let's see :ref:`this page <clipping_masks_and_alpha_inheritance>` and learn how to do
 clipping in Krita!
 
 Windows: OBS can't record the Krita OpenGL canvas
 -------------------------------------------------
 
 The possible workarounds for this is to do either of the following:
 
 #. Turn off OpenGL in Settings --> Configure Krita --> Display.
 #. Or don't use the hardware accelerated mode (game recording mode) in
    OBS, thus capturing the whole desktop instead of attempting to capture
    only Krita.
 
 You might also be able to work around the problem by using the ANGLE renderer instead of native OpenGL.
 
 Where are the configuration files stored?
 -----------------------------------------
 
 These are stored at the following places for the following operating
 systems:
 
 Linux
     :file:`$HOME/.config/kritarc`
 Windows
     :file:`%APPDATA%\\Local\\kritarc`
 MacOS X
     :file:`$HOME/Library/Preferences/kritarc`
 
 The kritarc file is the configuration file. Krita does not store settings in the Windows registry.
 
 Resetting Krita configuration
 -----------------------------
 
 You can reset the Krita configuration in following way:
 
 -  For Krita 3.0 and later: Delete/rename the kritarc file, found here:
 
     Linux
         :file:`$HOME/.config/kritarc`
     Windows
         :file:`%LOCALAPPDATA%\\kritarc`
     MacOS X
         :file:`$HOME/Library/Preferences/kritarc`
 
 There can be two other files you might want to remove: kritaopenglrc and
 kritadisplayrc.
 
 If the configuration was causing a crash, don't delete the mentioned file, but instead rename and
 send it to us in order for us to figure what caused the crash.
 .. 
 If you have installed Krita through the Windows store, the kritarc file will be in another location
 
 :file:`%LOCALAPPDATA%\\Packages\\49800Krita_{RANDOM STRING}\\LocalCache\\Local\\kritarc`
 
 The random string depends on your installation/
 
 Windows users have a habit of uninstalling and reinstalling applications to solve problems. Unless the problem is that the installation was corrupted by a virus scanner or drive failure, that will NOT work. Uninstalling Krita then reinstalling replaces the bytes on your drive with exactly the same bytes that were there before. It doesn't reset anything, least of all Krita's settings.
 
 Where are my resources stored?
 ------------------------------
 
 Linux
     :file:`$HOME/.local/share/krita/`
 Windows
     :file:`%APPDATA%\\krita\\`
 Mac OS X
     :file:`~/Library/Application Support/Krita/`
 
 If you installed Krita in the Windows Store, your custom resources will be in a location like:
     :file:`%LOCALAPPDATA%\\Packages\\49800Krita_{RANDOM STRING}\\LocalCache\Roaming\krita`
     
 Krita tells me it can't find some files and then closes, what should I do?
 --------------------------------------------------------------------------
 
 Causes for this could be the following:
 
 -  It might be that your download got corrupted and is missing files (common with bad wifi and bad internet connection in general), in that case, try to find a better internet connection before trying to download again. Krita should be around 80 to 100 mb in size when downloading.
 -  It might be that something went wrong during installation. Check whether your harddrive is full and reinstall Krita with at least 120 MB of empty space. If not, and the problem still occurs, there might be something odd going on with your device and it's recommended to find a computer expert to diagnose what is the problem.
 -  Some unzippers don't unpack our zipfiles correctly. The native ones on windows, OSX and most linux distributions should be just fine, and we recommend using them.
 -  You manually, using a file manager deleted or moved resources around, and thus Krita cannot find them anymore.
 
 What Graphics Cards does Krita support?
 ---------------------------------------
 
 Krita can use OpenGL to accelerate painting and canvas zooming, rotation and panning. Nvidia and recent Intel GPUs give the best results. Make sure your OpenGL drivers support OpenGL 3.2 as the minimum. AMD/ATI GPU’s are known to be troublesome, especially with the proprietary drivers on Linux. However, it works perfectly with the Radeon free driver on linux for supported AMD GPU. Try to get a graphics card that can support OpenGL 3.2 or above for the best results, some examples:
 
 .. Following graphics cards have been suggested by Tyson Tan on the basis that they all support 3.2
 
 Intel
     Intel 3rd Generation HD Graphics, IvyBridge or Bay-Trail microarchitecture, released in 2012. Commonly available products: Celeron J1x00, N2x00, Celeron (G)1xx0, Pentium J2x00, N3500, Pentium (G)2xx0, Core i3/5/7-3xx0.
 AMD/ATI
     Radeon HD 2000 family, TeraScale 1 microarchitecture, Released in 2007. Commonly available products: Radeon HD 2400 PRO, Radeon HD 2600 PRO, etc.
 Nvidia
     GeForce 8 family, Tesla microarchitecture, released in 2006. Commonly available products: GeForce 8400 GS, GeForce 8800 GTS, 9800 GTX, GTS 250, etc.
 
 *For Krita 3.3 or later:* Krita on Windows can use Direct3D 11 for graphics acceleration (through ANGLE). This is enabled automatically on systems with an Intel GPU.
 
 I can't edit text from PSD files created by Photoshop
 -----------------------------------------------------
 
 There is no text support for psd file yet. The text will appear rasterized and converted into a paint layer.
 
 How much memory does my image take?
 -----------------------------------
 
 For simple images, its easy to calculate: you multiply width \* height \* channels \* size of the channels (so, for a 1000×1000 16 bit integer rgba image: 1000 x 1000 x 4 x 2). You multiply this by the number of layers plus two (one for the image, one for the display). If you add masks, filter layers or clone layers, it gets more complicated.
 
 Why do I get a checkerboard pattern when I use the eraser?
 ----------------------------------------------------------
 
 You’re probably used to Gimp or Photoshop. The default background or first layer in these applications doesn’t have an alpha channel by default. Thus, on their background layer, the eraser paints in the background color.
 
 In Krita, all layers have an alpha channel, if you want to paint in the background color, you should simply do it in a layer above the first one (Layer 1), that would prevent  you from erasing the white background color, making the checkerboard visible. You get the same effect in, say, gimp, if you create new image, add an alpha channel and then use the eraser tool. Most Krita users will actually start a sketch in Krita by adding a new blank layer first before doing anything else. (the INSert key is a useful shortcut here). That doesn’t use extra memory, since a blank layer or a layer with a default color just takes one pixel worth of memory.
 
 Windows: Can I use Krita with Sandboxie?
 ----------------------------------------
 
 No, this is not recommended. Sandboxie causes stuttering and freezes due to the way it intercepts calls for resources on disk.
 
 Windows: Krita cannot save
 --------------------------
 
 If the message is "File not found. Check the file name and try again.", you probably have Controlled Folder Access enabled.
 
 -  Select Start  > Settings .
 -   Choose Update & security  > Windows Defender.
 -   Select Open Windows Defender Security Center.
 -   Select Virus & threat protection, and then choose Virus & threat protection settings.
 -   Under Controlled folder access, turn it on or off.
 
 You can also whitelist Krita, following `these instructions <https://docs.microsoft.com/en-us/windows/security/threat-protection/windows-defender-exploit-guard/customize-controlled-folders-exploit-guard#allow-specific-apps-to-make-changes-to-controlled-folders>`_.
 
 Can krita work with 8 bit (indexed) images?
 -------------------------------------------
 
 No. Krita has been designed from the ground up to use real colors, not indexed palettes. There are no plans to support indexed color images, although Krita can export to some indexed color image formats, such as GIF. However, it does not offer detailed control over pixel values.
 
 
 How can I produce a backtrace on Windows?
 -----------------------------------------
 
 .. seealso::
 
     :ref:`Dr. Mingw debugger <dr_minw>`
 
 If you experience a crash on Windows, and can reproduce the crash, the bug report will be much more valuable if you can create a backtrace. A backtrace is somewhat akin to an airplane's blackbox, in that they tell what set of instructions your computer was running when it was crashing (where the crash happened), making it very useful to figure out why the crash happened.
 
 The :ref:`Dr. Mingw debugger <dr_minw>` is bundled with Krita. Please visit the page :ref:`Dr. Mingw debugger <dr_minw>` for instructions on getting a backtrace with it.
 
 Where can I find older versions of Krita?
 -----------------------------------------
 
 All the older versions of Krita that are still available can be found here:
 
 -  `Very old builds <http://download.kde.org/Attic/krita>`_
 
 On Windows, the Krita User Interface is too small on my HiDPI screen
 --------------------------------------------------------------------
 
 If you're using Windows, you can set the display scaling to 150% or 200%, and enable the experimental HiDPI support in the configurations:
 
 -  On the menu, select :menuselection:`Settings --> Configure Krita`
 -  On General page, switch to :guilabel:`Window` tab.
 -  Check :guilabel:`Enable Hi-DPI support`
 -  Restart Krita
 
 You can also change the toolbox icon size by right-clicking on the toolbox and selecting a size.
 
 
 Tablets
 =======
 
 What tablets does Krita support?
 --------------------------------
 
 Krita isn’t much fun without a pressure sensitive tablet. If the tablet has been properly configured, Krita should work out of the box. 
 
 On Windows, you need to either install the Wintab drivers for your tablet, or enable the Windows 8 Pointer Input option in Krita's settings.
 
 You can find a community curated list of tablets supported by krita :ref:`here <list_supported_tablets>`.
 
 If you're looking for information about tablets like the iPad or Android tablets, look :ref:`here <krita_android>`.
 
 
 What if your tablet is not recognized by Krita?
 -----------------------------------------------
 
 Linux
 ~~~~~
 
 We would like to see the full output of the following commands:
 
 #. ``lsmod``
 #. ``xinput``
 #. ``xinput list-props`` (id can be fetched from the item 2)
 #. Get the log of the tablet events (if applicable):
 
    #. Open a console application (e.g. Konsole on KDE)
    #. Set the amount of scrollback to 'unlimited' (for :program:`Konsole`: :menuselection:`Settings --> Edit Current Profile --> Scrolling --> Unlimited Scrollback`)
    #. Start Krita by typing 'krita' and create any document
    #. Press :kbd:`Ctrl + Shift + T`, you will see a message box telling the logging has started
    #. Try to reproduce your problem
    #. The console is now filled with the log. Attach it to a bug report
 
 #. Attach all this data to a bug report using public paste services like
    paste.kde.org
 
 Windows
 ~~~~~~~
 
 First check whether your tablet's driver is correctly installed. Often, a driver update, a Windows update or the installation of Razer gaming mouse driver breaks tablets.
 
 Then check whether switching to the Windows 8 Pointer API makes a difference: :menuselection:`Settings --> Configure Krita --> Tablet`.
 
 If you still have problems with Windows and your tablet, then we cannot help you without a tablet log.
 
 #. Install `DebugView <http://technet.microsoft.com/en-us/sysinternals/bb896647.aspx>`_ from the official Microsoft site
 #. Start :program:`DebugView`
 #. Start :program:`Krita`
 #. Press :kbd:`Ctrl + Shift + T`, you will see a message box telling the logging has started
 #. Try to reproduce your problem
 #. Go back to DebugView and save its output to a file. Attach this file
    to a bug report or paste it using services like paste.kde.org.
 
 However, in 100\% of the cases where Windows users have reported that their tablet didn't work over the past five years, the problem has been either a buggy driver or a broken driver installation, but not a bug in Krita.
    
    
 How to fix a tablet offset on multiple screen setup on Windows
 --------------------------------------------------------------
 
 If you see that your tablet pointer has an offset when working with Krita canvas, it might be highly probable that Krita got incorrect screen resolution from the system. That problem happens mostly when an external monitor is present and when either a monitor or a tablet was connected after the system boot.
 
 You can fix this issue manually by:
 
 #. Put your stylus away from the tablet.
 #. Start Krita without using a stylus, that is using a mouse or a keyboard.
 #. Press Shift key and hold it.
 #. Touch a tablet with your stylus so Krita would recognize it.
 
 You will see a special dialog asking for the real screen resolution. Choose the correct value or enter it manually and press OK.
 
 If you have a dual monitor setup and only the top half of the screen is reachable, you might have to enter the total width of both screens plus the double height of your monitor in this field.
 
 If this didn't work, and if you have a Wacom tablet, an offset in the canvas can be caused by a faulty Wacom preference file which is not removed or replaced by reinstalling the drivers.
 
 To fix it, use the “Wacom Tablet Preference File Utility” to clear all the preferences. This should allow Krita to detect the correct settings automatically.
 
 .. warning::
     This will reset your tablets configuration, thus you will need to recalibrate/reconfigure it.
 
 *For Krita 3.3 or later:* You can try to :ref:`enable “Windows 8+ Pointer Input” <tablet_settings>`, but some features might not work with it.
 
 Microsoft Surface Pro and N-Trig
 --------------------------------
 
 Krita 3.3.0 and later supports the Windows Pointer API (Windows Ink) natively. Your Surface Pro or other N-Trig enabled pen tablet should work out of the box with Krita after you enable Windows Ink in :menuselection:`Settings --> Configure Krita --> Tablet`.
 
 Tablet Pro and the Surface Pro
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Unlike Wacom's Companion, the Surface line of tablets doesn't have working hardware buttons. Tablet Pro is a (non-free) utility that puts virtual buttons on screen. Krita 3.1 and above will have predefined shortcut profiles to work with Tablet Pro.
 
 http://tabletpro.net/
 
 See http://www.youtube.com/watch?v=WKXZgYqC3tI for instructions.
 
 Weird stuff happens on Windows, like ripples, rings, squiggles or poltergeists
 ------------------------------------------------------------------------------
 
 Windows comes with a lot of settings to make it work with a pen. All these settings can be annoying. This tool can help you set the settings correctly when you're using a tablet:
 
 https://github.com/saveenr/Fix_My_Pen/releases
 
+Touch doesn't seem to work on Windows
+-------------------------------------
+
+You might have to disable and enable the touch driver: go to the device manager. (Click the Start button and type device manager). Choose HID (User interface devices or something like that). Choose Intel(R) Precise Touch Device. Right click, Disable it. Right click, Enable it.
+
 Toolbox
 =======
 
 Toolbox missing
 ---------------
 
 You can reset the Workspace by pressing the right most button on the toolbar, the Workspace switcher, and click on a desired Workspace from the list.
 
 Or you can right-click on any docker title bar or open space in any toolbar, and select Toolbox. It's the first option.
 
 Also, you can check the Settings menu, it has got a lot of interesting stuff, then go to the Dockers menu and select Toolbox.
 
 Tool icons size is too big
 --------------------------
 
 Right click the toolbox to set the size.
 
 Krita can't get maximized
 -------------------------
 
 This happens when your dockers are placed in such a way that the window cannot be made less high. Rearrange your Workspace.
 
 Resources
 =========
 
 Is there a way to restore a default brush that I have mistakenly overwritten with new settings to default?
 ----------------------------------------------------------------------------------------------------------
 
 Yes. First go to the resource folder, which is in
 
 Linux
     :file:`$HOME/.local/share/krita/`
 Windows
     :file:`user\\Appdata\\Roaming\\krita\\` or :file:`%APPDATA%\\Roaming\\krita\\`
 OSX
     :file:`~/Library/Application Support/Krita/`
 
 You can easily do this by going into :menuselection:`Settings --> Manage Resources --> Open Resource Folder`.
 
 Then go into the paintoppressets folder and remove the latest created
 file that you made of your preset.
 
 After that go back to the resources folder and edit the blacklist file to
 remove the previous paintoppreset so Krita will load it. (Yes, it is a
 bit of a convoluted system, but at the least you don't lose your
 brushes)
 
 How do I set favorite presets?
 ------------------------------
 
 Right-click a brush in the brush docker and assign it a tag. Then right-click on canvas to call popup palette, click the second right-most icon on the bottom-right of the palette, now you can pick the tag which contains the brush you assigned to it.
 
 Can Krita load Photoshop Brushes?
 ---------------------------------
 
 Yes, but there are limitations. You can load ABR files by using the by using the Import button in the Predefined brush tab in the brush editor. Since Adobe hasn’t disclosed the file format specification, we depend on reverse-engineering to figure out what to load, and currently that’s limited to basic features.
 
 Krita is slow
 =============
 
 There is a myriad of reasons why this might be. Below is a short checklist.
 
 -  Something else is hogging the cpu.
 -  You are running Windows, and have 3rdparty security software like Sandboxie or Total Defender installed
 -  you are working on images that are too big for your hardware (dimensions, channel depth or number of layers)
 -  you do not have canvas acceleration enabled
 
 Please also check this page: https://phabricator.kde.org/T7199
 
 Slow start-up
 -------------
 
 You probably have too many resources installed. Deactivate some bundles under :menuselection:`Settings --> Manage Resources`.
 
 If you're using Windows with the portable zip file, Windows will scan all files every time you start Krita. That takes ages. Either use the installer or tell Microsoft Security Essentials to make an exception for Krita.
 
 Slow Brushes
 ------------
 
 -  Check if you accidentally turned on the stabilizer in the tool options docker.
 -  Try another scaling mode like trilinear. :menuselection:`Settings --> Configure Krita --> Display`.
 -  Try a lower channel depth than 16-bit.
 -  For NVidia, try a 16-bit floating point color space.
 -  For older AMD CPU's (Krita 2.9.10 and above), turn off the vector optimizations that are broken on AMD CPUs. :menuselection:`Settings --> Configure Krita --> Performance`. This isn't needed if you've got an AMD threadrippercpu.
 -  It's a fairly memory hungry program, so 2GB of ram is the minimum, and 4 gig is the preferable minimum.
 -  Check that nothing else is hogging your CPU
 -  Check that Instant Preview is enabled if you're using bigger brushes (but for very small brushes, make sure is disabled).
 -  Set brush precision to 3 or auto.
 -  Use a larger value for brush spacing.
 -  If all of this fails, record a video and post a link and description on the Krita forum.
 -  Check whether OpenGL is enabled, and if it isn't, enable it. If it is enabled, and you are on Windows, try the Angle renderer. Or disable it.
 
 Slowdown after a been working for a while
 -----------------------------------------
 
 Once you have the slowdown, click on the image-dimensions in the status bar. It will tell you how much RAM Krita is using, if it has hit the limit, or whether it has started swapping. Swapping can slow down a program a lot, so either work on smaller images or turn up the maximum amount of ram in :menuselection:`Settings --> Configure Krita --> Performance --> Advanced Tab`.
 
 Tools
 =====
 
 Why does the Transform Tool give a good result and then get blurry upon finalizing?
 -----------------------------------------------------------------------------------
 
 The transform tool makes a preview that you edit before computing the finalized version. As this preview is using the screen resolution rather than the image resolution, it may feel that the result is blurry compared to the preview. See https://forum.kde.org/viewtopic.php?f=139&t=127269 for more info.
 
 
 License, rights and the Krita Foundation
 ========================================
 
 Who owns Krita?
 ---------------
 
 The Stichting Krita Foundation owns the Krita trademark. The copyright on the source code is owned by everyone who has worked on the source code.
 
 Who and what is Kiki?
 ---------------------
 
 Kiki is a cybersquirrel. She’s our mascot and has been designed by Tyson Tan. We choose a squirrel when we discovered that ‘krita’ is the Albanian word for Squirrel.
 
 Why is Krita Free?
 ------------------
 
 Krita is developed as `free software <http://www.gnu.org/>`_ within the KDE community. We believe that good tools should be available for all artists. You can also buy Krita on the Windows Store if you want to support Krita's development or want to have automatic updates to newer versions.
 
 Can I use Krita commercially?
 -----------------------------
 
 Yes. What you create with Krita is your sole property. You own your work and can license your art however you want. Krita’s GPL license applies to Krita’s source code. Krita can be used commercially by artists for any purpose, by studios to make concept art, textures, or vfx, by game artists to work on commercial games, by scientists for research, and by students in educational institutions.
 
 If you modify Krita itself, and distribute the result, you have to share your modifications with us. Krita’s GNU GPL license guarantees you this freedom. Nobody is ever permitted to take it away.
 
 .. _krita_android:
 .. _krita_ios:
 
 Can I get Krita for iPad? for Android?
 --------------------------------------
 
 Not at this point in time.
 
 Who translates Krita
 --------------------
 
 Krita is a `KDE application <http://www.kde.org/>`_ — and proud of it! That means that Krita’s translations are done by `KDE localization teams <http://i18n.kde.org/>`_. If you want to help out, join the team for your language! There is another way you can help out making Krita look good in any language, and that is join the development team and fix issues within the code that make Krita harder to translate.
 
 Reference
 =========
 
 https://answers.launchpad.net/krita-ru/+faqs
diff --git a/conf.py b/conf.py
index bd8a1678d..796aa537c 100644
--- a/conf.py
+++ b/conf.py
@@ -1,357 +1,357 @@
 # -*- coding: utf-8 -*-
 #
 # Configuration file for the Sphinx documentation builder.
 #
 # This file does only contain a selection of the most common options. For a
 # full list see the documentation:
 # http://www.sphinx-doc.org/en/stable/config
 
 # -- Path setup --------------------------------------------------------------
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 
 
 # -- Project information -----------------------------------------------------
 
 project = 'Krita Manual'
 propername = 'Krita Manual'
 description = 'The official Krita Documentation'
 copyright = 'licensed under the GNU Free Documentation License 1.3+ unless stated otherwise'
 author = 'Krita Foundation'
 
 import os
 import subprocess
 
 # Get the git description if possible, to put it in the footer.
 
 try:
     gitcommitfriendly = subprocess.check_output(["git", "describe", "--always"]).decode("utf-8").strip()
 except subprocess.CalledProcessError as exc:
     gitcommitfriendly = None
 
 # We use the full githash for the epub identifier, if not, use the release number.
 try:
     gitcommithash = subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode("utf-8").strip()
 except subprocess.CalledProcessError as exc:
     gitcommithash = release
 
 # The short X.Y version
 version = '4.1'
 # The full version, including alpha/beta/rc tags
-release = '4.1.3'
+release = '4.1.7'
 
 
 # -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #
 # needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
     'sphinx.ext.intersphinx',
     'sphinx.ext.coverage',
     'sphinx.ext.ifconfig',
     'sphinx.ext.viewcode',
     'sphinx.ext.githubpages',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
 source_suffix = '.rst'
 
 # The master toctree document.
 master_doc = 'index'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
 language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path .
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 html_extra_path = ['.htaccess', '404.php'] # copy over .htaccess file to each langaguge
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
 # A string of reStructuredText that will be included at the end of every source file that is read.
 # This is a possible place to add substitutions that should be available in every file (another being rst_prolog).
 rst_epilog = """
 .. |mouseleft| image:: /images/icons/Krita_mouse_left.png 
 
 .. |mouseright| image:: /images/icons/Krita_mouse_right.png 
 
 .. |mousemiddle| image:: /images/icons/Krita_mouse_middle.png 
 
 .. |mousescroll| image:: /images/icons/Krita_mouse_scroll.png
 
 .. |toolshapeselection| image:: /images/icons/shape_select_tool.svg
 
 .. |toolshapeedit| image:: /images/icons/shape_edit_tool.svg
 
 .. |tooltext| image:: /images/icons/text-tool.svg
 
 .. |toolcalligraphy| image:: /images/icons/calligraphy_tool.svg
 
 .. |toolgradientedit| image:: /images/icons/gradient_edit_tool.svg
 
 .. |toolpatternedit| image:: /images/icons/pattern_tool.svg
 
 .. |toolfreehandbrush| image:: /images/icons/freehand_brush_tool.svg
 
 .. |toolline| image:: /images/icons/line_tool.svg
 
 .. |toolrectangle| image:: /images/icons/rectangle_tool.svg
 
 .. |toolellipse| image:: /images/icons/ellipse_tool.svg
 
 .. |toolpolygon| image:: /images/icons/polygon_tool.svg
 
 .. |toolpolyline| image:: /images/icons/polyline_tool.svg
 
 .. |toolbeziercurve| image:: /images/icons/bezier_curve.svg
 
 .. |toolfreehandpath| image:: /images/icons/freehand_path_tool.svg
 
 .. |tooldyna| image:: /images/icons/dyna_tool.svg
 
 .. |toolmultibrush| image:: /images/icons/multibrush_tool.svg
 
 .. |toolassistant| image:: /images/icons/assistant_tool.svg
 
 .. |toolmove| image:: /images/icons/move_tool.svg
 
 .. |tooltransform| image:: /images/icons/transform_tool.svg
 
 .. |toolgrid| image:: /images/icons/grid_tool.svg
 
 .. |toolperspectivegrid| image:: /images/icons/perspectivegrid_tool.svg
 
 .. |toolmeasure| image:: /images/icons/measure_tool.svg
 
 .. |toolcolorpicker| image:: /images/icons/color_picker_tool.svg
 
 .. |toolfill| image:: /images/icons/fill_tool.svg
 
 .. |toolgradient| image:: /images/icons/gradient_drawing_tool.svg
 
 .. |toolcolorizemask| image:: /images/icons/colorizemask_tool.svg
 
 .. |toolsmartpatch| image:: /images/icons/smart_patch_tool.svg
 
 .. |toolcrop| image:: /images/icons/crop_tool.svg
 
 .. |toolselectrect| image:: /images/icons/rectangular_select_tool.svg
 
 .. |toolselectellipse| image:: /images/icons/elliptical_select_tool.svg
 
 .. |toolselectpolygon| image:: /images/icons/polygonal_select_tool.svg
 
 .. |toolselectpath| image:: /images/icons/path_select_tool.svg
 
 .. |toolselectoutline| image:: /images/icons/outline_select_tool.svg
 
 .. |toolselectcontiguous| image:: /images/icons/contiguous_select_tool.svg
 
 .. |toolselectsimilar| image:: /images/icons/similar_select_tool.svg
 
 .. |toolpan| image:: /images/icons/pan_tool.svg
 
 .. |toolzoom| image:: /images/icons/zoom_tool.svg
 
 """
 
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
 html_theme = 'theme'
 html_theme_path = ['.'] # make sphinx search for themes in current dir
 
 # the favicon has a property to set it in the documentation, but we don't need to use this
 # sphinx appears to automatically search in the theme folder and find the file
 #html_favicon = './theme/static/images/favicon.ico'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 #
 html_theme_options = {
 	'sticky_navigation': True,
 	'collapse_navigation': True,
 	'prev_next_buttons_location': 'bottom'
 }
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['theme/static']
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
 #
 # The default sidebars (for documents that don't match any pattern) are
 # defined by theme itself.  Builtin themes are using these templates by
 # default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
 # 'searchbox.html']``.
 #
 # html_sidebars = {}
 
 html_title = project + " version " + release
 
 html_context = {
     'build_id': os.getenv('BUILD_NUMBER', None),
     'build_url': os.getenv('BUILD_URL', None),
     'commit' : gitcommitfriendly
 }
 
 
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'documentationProjectNamedoc'
 
 
 # -- Options for LaTeX output ------------------------------------------------
 
 latex_engine = 'xelatex'
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
     'maxlistdepth': '8',
     'figure_align':'ht!',
 
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
 
     # Additional stuff for the LaTeX preamble.
     #
     'preamble': r'''
 \usepackage[export]{adjustbox}
 \let\oincludegraphics\includegraphics
 \renewcommand{\includegraphics}[2][]{
     \oincludegraphics[#1,max width=\linewidth,max height=\textheight]{#2}
 }
     ''',
     'tableofcontents':'\sphinxtableofcontents',
 
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'kritaManual.tex', project,
      author, 'manual'),
 ]
 latex_show_pagerefs=True
 # copy latex scripts to build dir
 latex_additional_files = [
     "latexImageMakefile",
 ]
 
 # -- Internationalization Options --------------------------------------------
 
 locale_dirs = ['locale/']   # Where the PO files will be stored at
 gettext_compact = False     # optional.
 gettext_additional_targets = ['image'] # allows images to be translatable
 
 
 
 # -- Options for manual page output ------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
     (master_doc, project, propername,
      [author], 1)
 ]
 
 
 # -- Options for Texinfo output ----------------------------------------------
 
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
     (master_doc, project, propername,
      author, project, description,
      'Manual'),
 ]
 
 
 # -- Options for Epub output -------------------------------------------------
 
 # Bibliographic Dublin Core info.
 # filename
 # epub_basename = project.replace(' ', '_') + '_' + language
 epub_title = project+" "+version
 epub_description = description
 
 # Technically speaking dublincore accepts multiple author and contributor elements, but
 # the sphinx builder only accepts one.
 epub_author = author
 epub_publisher = author
 epub_copyright = copyright
 
 
 epub_cover = ('_static/images/manual_cover.png', '')
 
 # The unique identifier of the text. This can be a ISBN number
 # or the project homepage.
 # The above is false and perhaps a mistake in sphinx' documentation.
 # epub_uid maps to id, which is the dc identifier id
 # which in turn should be the used scheme.
 
 if os.getenv('BUILD_ID', None) is None:
     # There is no uniform resource name for git, but just randomly pasting a githash is bad form.
     epub_identifier = 'git:'+gitcommithash
     epub_uid = 'githash'
     if gitcommithash == release:
         epub_uid = 'release'
         # there's also no urn for releases, as technically some database thing should be used for that.
         epub_identifier = '_'.join(['Krita_Manual_Build', language, release])
 else:
     epub_uid = 'url'
     epub_identifier = os.getenv('BUILD_URL', '')
 
 # Not actually used anywhere? Docs say that this should be what the epub uid is used for but...
 epub_scheme = 'URL'
 
 # A list of files that should not be packed into the epub file.
 epub_exclude_files = ['search.html', '.htaccess', '404.xhtml']
 
 epub_tocscope = 'includehidden'
 
 # -- Extension configuration -------------------------------------------------
 
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {'https://docs.python.org/': None}
diff --git a/images/en/flat-coloring/Krita_filling_lineart_color_to_alpha.png b/images/en/flat-coloring/Krita_filling_lineart_color_to_alpha.png
new file mode 100644
index 000000000..94bc64cb3
Binary files /dev/null and b/images/en/flat-coloring/Krita_filling_lineart_color_to_alpha.png differ
diff --git a/images/en/flat-coloring/Krita_filling_lineart_mask_1.png b/images/en/flat-coloring/Krita_filling_lineart_mask_1.png
new file mode 100644
index 000000000..783b52ed9
Binary files /dev/null and b/images/en/flat-coloring/Krita_filling_lineart_mask_1.png differ
diff --git a/images/en/flat-coloring/Krita_filling_lineart_mask_2.png b/images/en/flat-coloring/Krita_filling_lineart_mask_2.png
new file mode 100644
index 000000000..7d6039181
Binary files /dev/null and b/images/en/flat-coloring/Krita_filling_lineart_mask_2.png differ
diff --git a/images/en/flat-coloring/Krita_filling_lineart_mask_3.png b/images/en/flat-coloring/Krita_filling_lineart_mask_3.png
new file mode 100644
index 000000000..86115292b
Binary files /dev/null and b/images/en/flat-coloring/Krita_filling_lineart_mask_3.png differ
diff --git a/images/en/flat-coloring/Krita_filling_lineart_selection_1.png b/images/en/flat-coloring/Krita_filling_lineart_selection_1.png
new file mode 100644
index 000000000..be9338d37
Binary files /dev/null and b/images/en/flat-coloring/Krita_filling_lineart_selection_1.png differ
diff --git a/images/en/flat-coloring/Krita_filling_lineart_selection_2.png b/images/en/flat-coloring/Krita_filling_lineart_selection_2.png
new file mode 100644
index 000000000..4c0774f8b
Binary files /dev/null and b/images/en/flat-coloring/Krita_filling_lineart_selection_2.png differ
diff --git a/index.rst b/index.rst
index 80f0e272c..b1b1cc22d 100644
--- a/index.rst
+++ b/index.rst
@@ -1,53 +1,55 @@
 
 
 #########################################
   Welcome to the Krita |version| Manual!
 #########################################
 
 Welcome to Krita's documentation page. Krita is a sketching and painting program designed for digital artists.
 
 As you learn about Krita, keep in mind that it is not intended as a replacement for Photoshop. This means that the other programs may have more features than Krita for image manipulation tasks, such as stitching together photos, while Krita's tools are most relevant to digital painting, concept art, illustration, and texturing. This fact accounts for a great deal of Krita's design.
 
+`The manual as epub <https://docs.krita.org/en/epub/KritaManual.epub>`_
+
 +------------------------------------------------+------------------------------------------+
 | .. image:: /images/en/Hero_userManual.jpg      | .. image:: /images/en/Hero_tutorials.jpg |
 |                                                |                                          |
 |:ref:`user_manual`                              |:ref:`tutorials`                          |
 |                                                |                                          |
 |Discover Krita’s features through an            |Learn through developer and user          |
 |online manual. Guides to help you               |generated tutorials to see Krita          |
 |transition from other applications.             |in action.                                |
 +------------------------------------------------+------------------------------------------+
 | .. image:: /images/en/Hero_getting_started.jpg | .. image:: /images/en/Hero_reference.jpg |
 |                                                |                                          |
 |:ref:`getting_started`                          |:ref:`reference_manual`                   |
 |                                                |                                          |
 |New to Krita and don't know where to start?     |A quick run-down of all of the tools that |
 |                                                |are available                             |
 +------------------------------------------------+------------------------------------------+
 | .. image:: /images/en/Hero_general.jpg         | .. image:: /images/en/Hero_faq.jpg       |
 |                                                |                                          |
 |:ref:`general_concepts`                         |:ref:`faq`                                |
 |                                                |                                          |
 |Learn about general art and technology          |Find answers to the most common questions |
 |concepts that are not specific to Krita.        |about Krita and what it offers.           |
 +------------------------------------------------+------------------------------------------+
 | .. image:: /images/en/Hero_resources.jpg       |                                          |
 |                                                |                                          |
 |:ref:`resources_page`                           |:ref:`genindex`                           |
 |                                                |                                          |
-|Textures and Brush packs to help add            |An index of the manual for searching      |
-|variety to your artwork.                        |terms by browsing.                        |
+|Textures, brush packs, and python plugins       |An index of the manual for searching      |
+|to help add variety to your artwork.            |terms by browsing.                        |
 +------------------------------------------------+------------------------------------------+
 
 .. toctree::
    :maxdepth: 2
    :hidden:
 
    user_manual
    general_concepts
    reference_manual
    tutorials
    KritaFAQ
    contributors_manual
    resources_page
 
diff --git a/resources_page.rst b/resources_page.rst
index 5d060f601..67c37d34a 100644
--- a/resources_page.rst
+++ b/resources_page.rst
@@ -1,105 +1,136 @@
 .. meta::
    :description:
         Resource Packs for Krita.
 
 .. metadata-placeholder
 
    :authors: - Wolthera van Hövell tot Westerflier <griffinvalley@gmail.com>
              - Scott Petrovic
              - Kamath Raghavendra
              - Nathan Lovato
    :license: GNU free documentation license 1.3 or later.
 
 
 .. _resources_page:
 
 =========
 Resources
 =========
 
 Brush Packs
 -----------
 
 .. list-table::
 
         * - .. figure:: /images/en/resource_packs/Resources-deevadBrushes.jpg
                :target: https://github.com/Deevad/deevad-krita-brushpresets
                
                David Revoy
           - .. figure:: /images/en/resource_packs/Resources-mirandaBrushes.jpg
                :target: http://www.ramonmiranda.com/2013/09/krita-training-vol-2-muses-dvd-preset.html
                
                Ramon Miranda
           - .. figure:: /images/en/resource_packs/Resources-conceptBrushes.jpg
                :target: https://forum.kde.org/viewtopic.php?f=274&t=127423
                
                Concept art & Illustration Pack
           - .. figure:: /images/en/resource_packs/Resources-aldyBrushes.jpg
                :target: http://al-dy.deviantart.com/art/Aldys-Brush-Pack-for-Krita-196128561
                
                Al-dy
         * - .. figure:: /images/en/resource_packs/Resources-meemodrawsBrushes.jpg
                :target: http://meemodraws.deviantart.com/art/Krita-Brush-Pack-311306611
                
                Meemodraws
           - .. figure:: /images/en/resource_packs/Resources-cazuBrushes.jpg
                :target: http://www.pcazorla.com/2014/01/15/cazu-brush-collection-v2-for-krita/
                
                Cazu Brush Collection
           - .. figure:: /images/en/resource_packs/Resources-stalcryBrushes.jpg
                :target: http://stalcry.deviantart.com/art/Krita-Custom-Brushes-350338351
                
                Stalcry
           - .. figure:: /images/en/resource_packs/Resources-woltheraBrushes.jpg
                :target: https://forum.kde.org/viewtopic.php?f=274&t=125125
                
                Wolthera
         * - .. figure:: /images/en/resource_packs/Resources-nylnook.jpg
                :target: http://nylnook.com/en/blog/krita-brushes-pack-v2/
                
                Nylnook
           - .. figure:: /images/en/resource_packs/Resources-hushcoilBrushes.png
                :target: http://hushcoil.tumblr.com/kritabrushes/
                
                Hushcoil
           - .. figure:: /images/en/resource_packs/Resources-raghukamathBrushes.png
                :target: https://github.com/raghukamath/krita-brush-presets
                
                Raghukamath
           - .. figure:: /images/en/resource_packs/Resources-GDQuestBrushes.jpeg
                :target: https://github.com/GDquest/free-krita-brushes/releases/
                
                GDQuest
         * - .. figure:: /images/en/resource_packs/Resources-iForce73Brushes.png
                :target: https://www.deviantart.com/iforce73/art/Environments-2-0-759523252
                
                Iforce73
           -  --
           -  
           -
 
 Texture Packs
 -------------
 
 .. list-table::
 
         * - .. figure:: /images/en/resource_packs/Resources-deevadTextures.jpg
                :target: https://www.davidrevoy.com/article156/texture-pack-1
                
                David Revoy
           - .. figure:: /images/en/resource_packs/Resources-deevadTextures2.jpg
                :target: https://www.davidrevoy.com/article263/five-traditional-textures
 
                David Revoy
 
 External tutorials
 ------------------
 
 .. list-table::
 
         * - .. figure:: /images/en/resource_packs/simon_pixel_art_course.png
                :target: https://www.udemy.com/learn-to-create-pixel-art-from-zero/?couponCode=OTHER_75
                
                Simón Sanchez' "Learn to Create Pixel Art from Zero" course on Udemy
 
-               
+User-made Python Plugins
+------------------
+To install and manage your plugins, visit the :ref:`krita_python_plugin_howto` area. See the second area on how to get Krita to recognize your plugin.
+
+**Direct Eraser Plugin** - http://www.mediafire.com/file/sotzc2keogz0bor/Krita+Direct+Eraser+Plugin.zip
+
+**Tablet Controls Docker** - https://github.com/tokyogeometry/tabui
+
+**On-screen Canvas Shortcuts** - https://github.com/qeshi/henriks-onscreen-krita-shortcut-buttons/tree/master/henriks_krita_buttons
+
+**Spine FIle Format Export** - https://github.com/chartinger/krita-unofficial-spine-export
+
+**GDQuest - Designer Tools** - https://github.com/GDquest/Krita-designer-tools
+
+**AnimLayers (Animate with Layers)** - https://github.com/thomaslynge/krita-plugins
+
+**Art Revision Control (using GIT)** - https://github.com/abeimler/krita-plugin-durra
+
+**Krita Plugin generator** - https://github.com/cg-cnu/vscode-krita-plugin-generator
+
+**Bash Action (works with OSX and Linux)** - https://github.com/juancarlospaco/krita-plugin-bashactions#krita-plugin-bashactions
+
+**Reference Image Docker (old style)** - https://github.com/antoine-roux/krita-plugin-reference
+
+**Post images on Mastadon** - https://github.com/spaceottercode/kritatoot
+
+**Python auto-complete for text editors** - https://github.com/scottpetrovic/krita-python-auto-complete
+
+
+See Something We Missed?
+-----------
+Have a resource you made and want to to share it with other artists? Let us know in the forum or visit our chat room to discuss getting the resource added to here.
diff --git a/theme/layout.html b/theme/layout.html
index 8004bf1f4..740cf57a9 100644
--- a/theme/layout.html
+++ b/theme/layout.html
@@ -1,252 +1,254 @@
 {# TEMPLATE VAR SETTINGS #}
 {%- set url_root = pathto('', 1) %}
 {%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
 {%- if not embedded and docstitle %}
   {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
 {%- else %}
   {%- set titlesuffix = "" %}
 {%- endif %}
 {%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
 
 <!DOCTYPE html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="{{ lang_attr }}" > <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="{{ lang_attr }}" > <!--<![endif]-->
 <head>
   <meta charset="utf-8">
   {{ metatags }}
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   {% block htmltitle %}
   <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
   {% endblock %}
 
   {# FAVICON #}
   {% if favicon %}
     <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
   {% endif %}
   {# CANONICAL URL #}
   {% if theme_canonical_url %}
     <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
   {% endif %}
 
   {# CSS #}
 
   {# OPENSEARCH #}
   {% if not embedded %}
     {% if use_opensearch %}
       <link rel="search" type="application/opensearchdescription+xml"
             title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
             href="{{ pathto('_static/opensearch.xml', 1) }}"/>
     {% endif %}
 
   {% endif %}
 
   {# RTD hosts this file, so just load on non RTD builds #}
   {%- if not READTHEDOCS %}
     <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
   {%- endif %}
   <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
   {%- for css in css_files %}
     {%- if css|attr("rel") %}
   <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} />
     {%- else %}
   <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" />
     {%- endif %}
   {%- endfor %}
   {%- for cssfile in extra_css_files %}
     <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
   {%- endfor %}
 
   {%- block linktags %}
     {%- if hasdoc('about') %}
     <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
     {%- endif %}
     {%- if hasdoc('genindex') %}
     <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
     {%- endif %}
     {%- if hasdoc('search') %}
     <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
     {%- endif %}
     {%- if hasdoc('copyright') %}
     <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
     {%- endif %}
     {%- if next %}
     <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
     {%- endif %}
     {%- if prev %}
     <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
     {%- endif %}
   {%- endblock %}
   {%- block extrahead %} {% endblock %}
 
   {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
   <script src="{{ pathto('_static/js/modernizr.min.js', 1) }}"></script>
 
 </head>
 
 <body class="wy-body-for-nav">
 
   {% block extrabody %} {% endblock %}
   <div class="wy-grid-for-nav">
 
     {# SIDE NAV, TOGGLES ON MOBILE #}
     <nav data-toggle="wy-nav-shift" class="wy-nav-side">
       <div class="wy-side-scroll">
         <div class="wy-side-nav-search">
           {% block sidebartitle %}
        
            <a href="{{ pathto(master_doc) }}" class="icon icon-home">
 
 			<img src="{{ pathto('_static/images/sidebar-logo.png' , 1) }}" class="logo" alt="Logo"/>
            	
            <!--	{{  project  }} -->
 
 
           </a>
 
 
           {% include "searchbox.html" %}
 
           {% endblock %}
         </div>
 
         <div class="wy-side-nav-language-selector">
         	<p class="caption-text">
 	        	<select id="language-selector-container">
 	        		<option value="en">English</option>
 	        		<option value="fr">français</option>
 	        	</select>
         	</p>
         </div>
 
         <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
           {% block menu %}
             {#
               The singlehtml builder doesn't handle this toctree call when the
               toctree is empty. Skip building this for now.
             #}
             {% if 'singlehtml' not in builder %}
               {% set global_toc = toctree(maxdepth=theme_navigation_depth|int,
                                           collapse=theme_collapse_navigation|tobool,
                                           includehidden=theme_includehidden|tobool,
                                           titles_only=theme_titles_only|tobool) %}
             {% endif %}
             {% if global_toc %}
               {{ global_toc }}
             {% else %}
               <!-- Local TOC -->
               <div class="local-toc">{{ toc }}</div>
             {% endif %}
           {% endblock %}
         </div>
       </div>
     </nav>
 
     <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
 
-	<!-- start top banner area -->
+	<!-- start top banner area (for fundraisers or messages)
+
 	<div style="text-align: center; background-color: #333">
 		<a href="https://krita.org/en/fundraising-2018-campaign/" target="_self" onclick="ga('send', 'event', 'frontpage', 'button', 'Fundraiser 2018');">
 			<img src="https://krita.org/wp-content/themes/krita-org-theme/images/decoration/2018-fundraiser-banner.png" style="max-width: 100%">
 		</a>
 	</div>
-	<!-- end top banner area -->
+	
+	 end top banner area -->
 
       {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
       <nav class="wy-nav-top" aria-label="top navigation">
         {% block mobile_nav %}
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
           <a href="{{ pathto(master_doc) }}">{{ project }}</a>
         {% endblock %}
       </nav>
 
 
       <div class="wy-nav-content">
       {%- block content %}
         {% if theme_style_external_links|tobool %}
         <div class="rst-content style-external-links">
         {% else %}
         <div class="rst-content">
         {% endif %}
           {% include "breadcrumbs.html" %}
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
           {%- block document %}
            <div itemprop="articleBody">
             {% block body %}{% endblock %}
            </div>
            {% if self.comments()|trim %}
            <div class="articleComments">
             {% block comments %}{% endblock %}
            </div>
            {% endif%}
           </div>
           {%- endblock %}
           {% include "footer.html" %}
         </div>
       {%- endblock %}
       </div>
 
     </section>
 
   </div>
   {% include "versions.html" %}
 
   {% if not embedded %}
 
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'{{ url_root }}',
             VERSION:'{{ release|e }}',
             LANGUAGE:'{{ language }}',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
             HAS_SOURCE:  {{ has_source|lower }},
             SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
         };
     </script>
     {%- for scriptfile in script_files %}
       <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
     {%- endfor %}
 
   {% endif %}
 
   {# RTD hosts this file, so just load on non RTD builds #}
   {% if not READTHEDOCS %}
     <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
   {% endif %}
 
   <script type="text/javascript">
       jQuery(function () {
           {% if theme_sticky_navigation|tobool %}
           SphinxRtdTheme.Navigation.enableSticky();
           {% else %}
           SphinxRtdTheme.Navigation.enable();
           {% endif %}
       });
   </script>
 
   {%- block footer %} {% endblock %}
 
  <script type="text/javascript">
 	 var _paq=_paq||[];
 	 _paq.push(['setCookieDomain','*.krita.org']);
 	 _paq.push(['setDomains','*.krita.org']);
 	 _paq.push(['setDocumentTitle',document.domain+"/"+document.title]);
 	 _paq.push(['trackPageView']);
 	 _paq.push(['enableLinkTracking']);
 
 	 (function(){
 	 	var u="//stats.kde.org/";
 	    _paq.push(['setTrackerUrl',u+'piwik.php']);
 	    _paq.push(['setSiteId',13]);
 	    var d = document, g = d.createElement('script'),s=d.getElementsByTagName('script')[0];
 	    g.type = 'text/javascript';
 	    g.async = true;
 	    g.defer = true;
 	    g.src = u+'piwik.js';
 	    s.parentNode.insertBefore(g,s);
 	  })();
 </script> 
 <noscript><p><img src="//stats.kde.org/piwik.php?idsite=13" style="border:0;" alt="" /></p></noscript>
 
 </body>
 </html>
diff --git a/tutorials/flat-coloring.rst b/tutorials/flat-coloring.rst
index b1e3788d2..19f8493bd 100644
--- a/tutorials/flat-coloring.rst
+++ b/tutorials/flat-coloring.rst
@@ -1,246 +1,329 @@
 .. meta::
    :description lang=en:
         Common workflows used in Krita
 
 .. metadata-placeholder
    :authors: - Wolthera van Hövell tot Westerflier <griffinvalley@gmail.com>
    :license: GNU free documentation license 1.3 or later.
 
 .. _flat_coloring:
 
 =============
 Flat Coloring
 =============
 
 So you've got a cool black on white drawing, and now you want to color it! The thing we’ll aim for in this tutorial is to get your lineart colored in with flat colors. So no shading just yet. We’ll be going through some techniques for preparing the lineart, and we’ll be using the layer docker to put each colour on a separate layer, so we can easily access each colour when we add shading.
 
 .. note:: This tutorial is adapted from this `tutorial <http://theratutorial.tumblr.com/post/66584924501/flat-colouring-in-the-kingdom-of-2d-layers-are>`_ by it's original author.
 
 Understanding Layers
 --------------------
 
 To fill lineart comfortably, it's best to take advantage of the layerstack. The layer stack is pretty awesome, and it's one of those features that make digital art super-convenient.
 
 In traditional art, it is not uncommon to first draw the full background before drawing the subject. Or to first draw a line art and then colour it in. Computers have a similar way of working.
 
 In programming, if you tell a computer to draw a red circle, and then afterwards tell it to draw a smaller yellow circle, you will see the small yellow circle overlap the red circle. Switch the commands around, and you will not see the yellow circle at all: it was drawn before the red circle and thus ‘behind’ it.
 
 This is referred to as the “drawing order”. So like the traditional artist, the computer will first draw the images that are behind everything, and layer the subject and foreground on top of it. The layer docker is a way for you to control the drawing order of multiple images, so for example, you can have your lineart drawn later than your colors, meaning that the lines will be drawn over the colors, making it easier to make it neat!
 
 Other things that a layer stack can do are blending the colors of different layers differently with blending modes, using a filter in the layer stack, or using a mask that allows you to make parts transparent.
 
 .. tip:: Programmers talk about transparency as ''Alpha'', which is because the 'a' symbol is used to present transparency in the algorithms for painting one color on top of another. Usually when you see the word ''Alpha'' in a graphics program, just think of it as affecting the transparency.
 
 Preparing your line-art
 -----------------------
 
 Put the new layer underneath the layer containing the lineart(drag and drop or use the up/down arrows for that), and draw on it.
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart14.png
     :alt: layer structure for flatting in krita
 
 …And notice nothing happening. This is because the white isn’t transparent. You wouldn’t really want it to either, how else would you make convincing highlights? So what we first need to do to colour in our drawing is prepare our lineart. There’s several methods of doing so, each with varying qualities.
 
 The Multiply Blending Mode
 --------------------------
 
 So, typically, to get a black and white lineart usable for colouring, you can set the blending mode of the lineart layer to Multiply. You do this by selecting the layer and going to the drop down that says **Normal** and setting that to **Multiply**.
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart1.png
    :alt: blend mode setup of lineart flat coloring
 
 And then you should be able to see your colors!
 
 Multiply is not a perfect solution however. For example, if through some image editing magic I make the lineart blue, it results into this:
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart2.png
     :alt: effects of multiply blend mode
 
 This is because multiply literally multiplies the colors. So it uses maths!
 
 What it first does is take the values of the RGB channels, then divides them by the max(because we're in 8bit, this is 255), a process we call normalising. Then it multiplies the normalised values. Finally, it takes the result and multiplies it with 255 again to get the result values.
 
 .. list-table::
     :header-rows: 1
 
     * -
       - Pink
       - Pink(normalised)
       - Blue
       - Blue(normalised)
       - Normalised, multiplied
       - Result
     * - Red
       - 222
       - 0.8705
       - 92
       - 0.3607
       - 0.3139
       - 80
     * - Green
       - 144
       - 0.5647
       - 176
       - 0.6902
       - 0.3897
       - 99
     * - Blue
       - 123
       - 0.4823
       - 215
       - 0.8431
       - 0.4066
       - 103
 
 This isn't completely undesirable, and a lot of artists use this effect to add a little richness to their colors.
 
 Advantages
 """"""""""
 
 Easy, can work to your benefit even with coloured lines by softening the look of the lines while keeping nice contrast.
 
 Disadvantages
 """""""""""""
 
 Not actually transparent. Is a little funny with coloured lines.
 
+Using Selections
+----------------
+
+The second method is one where we'll make it actually transparent. In other programs this would be done via the channel docker, but Krita doesn't do custom channels, instead it uses Selection Masks to store custom selections.
+
+1. duplicate your lineart layer.
+
+2. convert the duplicate to a selection mask. |mouseright| the layer, then :menuselection:`Convert --> to Selection Mask`.
+
+    .. image:: /images/en/flat-coloring/Krita_filling_lineart_selection_1.png
+
+3. Invert the selection mask. :menuselection:`Select --> Invert Selection`.
+
+4. Make a new layer, and do :menuselection:`Edit --> Fill with foreground color`.
+
+    .. image:: /images/en/flat-coloring/Krita_filling_lineart_selection_2.png
+
+And you should now have the line art on a seperate layer.
+
+Advantages
+""""""""""
+
+Actual transparency.
+
+Disadvantages
+"""""""""""""
+
+Doesn't work when the lineart is coloured.
+
+Using Masks
+-----------
+
+This is a simpler variation of the above.
+
+1. Make a filled layer underneath the lineart layer.
+
+    .. image:: /images/en/flat-coloring/Krita_filling_lineart_mask_1.png
+
+2. Convert the lineart layer to a transparency mask |mouseright| the layer, then :menuselection:`Convert --> to Transparency Mask`.
+
+    .. image:: /images/en/flat-coloring/Krita_filling_lineart_mask_2.png
+
+3. Invert the transparency mask by going to :menuselection:`Filter --> Adjust --> Invert`
+
+    .. image:: /images/en/flat-coloring/Krita_filling_lineart_mask_3.png
+
+Advantages
+""""""""""
+
+Actual transparency. You can also very easily doodle a pattern on the filled layer where the mask is on without affecting the transparency.
+
+Disadvantages
+"""""""""""""
+
+Doesn't work when the lineart is coloured already. We can still get faster.
+
+Using Color to Alpha
+--------------------
+
+By far the fastest way to get transparent lineart.
+
+1. Select the line art layer and apply the color to alpha filter. :menuselection:`Filter --> Colors --> Color to Alpha`. The default values should be sufficient for lineart.
+
+.. image:: /images/en/flat-coloring/Krita_filling_lineart_color_to_alpha.png
+
+Advantages
+""""""""""
+
+Actual transparency. Works with coloured line art as well, because it removes the white specifically.
+
+Disadvantages
+"""""""""""""
+
+You'll have to lock the layer transparency or seperate out the alpha via the rightclick menu if you want to easily color it.
+
+
+Colouring the image
+===================
+
+Much like preparing the line art, there's many different ways of colouring a layer.
+
+You could for example fill in everything by hand, but while that is very precise it also takes a lot of work. Let's take a look at the other options, shall we?
+
 Fill Tool
 ---------
 
 .. image:: /images/icons/fill_tool.svg
     :alt: fill-tool icon
 
 In most cases the fill-tool can’t deal with the anti-aliasing(the soft edge in your lineart to make it more smooth when zoomed out) In Krita you have the grow-shrink option. Setting that to say… 2 expands the colour two pixels.
 
 Threshold decides when the fill-tool should consider a different colour pixel to be a border. And the feathering adds a extra soft border to the fill.
 
 Now, if you click on a gapless-part of the image with your preferred colour…(Remember to set the opacity to 1.0!)
 
 Depending on your lineart, you can do flats pretty quickly. But setting the threshold low can result in little artifacts around where lines meet:
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart7.png
     :alt: colors filled with fill tool
 
 However, setting the threshold high can end with the fill not recognising some of the lighter lines. Besides these little artifacts can be removed with the brush easily.
 
 Advantages
 """"""""""
 
 Pretty darn quick depending on the available settings.
 
 Disadvantages
 """""""""""""
 
 Again, not great with gaps or details. And it works best with aliased line-art.
 
 Selections
 ----------
 
 Selections work using the selection tools.
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart15.png
     :alt: selecting with selection tools for filling color
 
 For example with the :ref:`bezier_curve_selection_tool` you can easily select a curved area, and the with :kbd:`Shift` + |mouseleft| (not |mouseleft| + :kbd:`Shift`, there's a difference!) you can easily add to an existing selection.
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart16.png
     :alt: selection mask in Krita
 
 You can also edit the selection if you have :menuselection:`Select --> Show Global Selection Mask` turned on. Then you can select the global selection mask, and paint on it. (Above with the alternative selection mode, activated in the lower-left corner of the stats bar)
 
 When done, select the color you want to fill it with and press :kbd:`shift` + `backspace`.
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart17.png
     :alt: filling color in selection
 
 You can save selections in selection masks by |mouseright| a layer, and then going to :menuselection:`Add --> Local Selection`. You first need to deactivate a selection by pressing the circle before adding a new selection.
 
 This can serve as an alternative way to split out different parts of the image, which is good for more painterly pieces:
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart18.png
     :alt: result of coloring made with the help of selection tools
 
 Advantages
 """"""""""
 
 A bit more precise than filling.
 
 Disadvantages
 """""""""""""
 
 Previewing your color isn't as easy.
 
 Geometric tools
 ---------------
 
 So you have a tool for making rectangles or circles. And in the case of Krita, a tool for bezier curves.
 Select the path tool (|path tool|), and set the tool options to fill=foreground and outline=none. Make sure that your opacity is set to 1.00(fully opaque).
 
 .. |path tool| image:: /images/icons/bezier_curve.svg
 
 By clicking and holding, you can influence how curvy a line draw with the path tool is going to be. Letting go of the mouse button confirms the action, and then you’re free to draw the next point.
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart8.png
     :alt: filling color in lineart using path tool
 
 You can also erase with a geometric tool. Just press :kbd:`E` or the eraser button.
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart9.png
     :alt: erasing with path tool
 
 Advantages
 """"""""""
 
 Quicker than using the brush or selections. Also decent with lineart that contains gaps.
 
 Disadvantages
 """""""""""""
 
 Fiddly details aren’t easy to fill in with this. So I recommend skipping those and filling them in later with a brush.
 
 Colorize Mask
 -------------
 
 So, this is a bit of an odd one. In the original tutorial, you'll see I'm suggesting using G'Mic, but that was a few years ago, and g'mic is a little unstable on windows. Therefore, the Krita developers have been attempting to make an internal tool doing the same.
 
 It is disabled in 3.1, but if you use 4.0 or later, it is in the toolbox. Check the Colorize Mask for more information.
 
 So it works like this:
 
 1. Select the colorize mask tool.
 2. Tick the layer you're using.
 3. Paint the colors your want to use on the colorize mask
 4. Click update to see the results:
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart10.png
     :alt: coloring with colorise mask
 
 When you are satisfied, |mouseright| the colorize mask, and go to :menuselection:`Convert --> Paint Layer`. This will turn the colorize mask to a generic paint layer. Then, you can fix the last issues by aking the lineart semi-transparent and painting the flaws away with a pixel art brush.
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart11.png
     :alt: result from the colorise mask
 
 Then, when you are done, split the layers via :menuselection:`Layers --> Split --> Split Layer`. There's a few options you can choose, but the following should be fine:
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart12.png
     :alt: slitting colors into islands
 
 Finally, press **Ok** and you should get the following. Each color patch it on a different layer, named by the palette in the menu and alpha locked, so you can start painting right away!
 
 .. image:: /images/en/flat-coloring/Krita_filling_lineart13.png
     :alt: resulting color islands from split layers
 
 Advantages
 """"""""""
 
 Works with anti aliased lineart. Really quick to get the base work done. Can auto-close gaps.
 
 Disadvantages
 """""""""""""
 
 No anti aliasing of it’s own. You have to choose between getting details right or the gaps auto-closed.
 
 Conclusion
 ----------
 
 I hope this has given you a good idea of how to fill in flats using the various techniques, as well as getting a hand of different Krita features. Remember that a good flat filled lineart is better than a badly shaded one, so keep practising to get the best out of these techniques!
diff --git a/untranslatable_pages/reporting_bugs.rst b/untranslatable_pages/reporting_bugs.rst
index 941c71a3b..01b343258 100644
--- a/untranslatable_pages/reporting_bugs.rst
+++ b/untranslatable_pages/reporting_bugs.rst
@@ -1,133 +1,133 @@
 .. meta::
     :description:
         Guide to Reporting Bugs.
 
 .. metadata-placeholder
 
     :authors: - Boudewijn Rempt <boud@valdyas.org>
     :license: GNU free documentation license 1.3 or later.
 
 .. _reporting_bugs:
 
 ==============
 Reporting Bugs
 ==============
 
 Krita is, together with many other projects, part of the KDE community. Therefore, bugs for Krita are tracked in KDE's bug tracker: `KDE's bug tracker <https://bugs.kde.org>`_. The bug tracker is a tool for Krita's developers to help them manage bugs in the software, prioritize them and plan fixes. It is not a place to get user support!
 
 The bug tracker contains two kinds of reports: bugs and wishes. Bugs are errors in Krita's code that interrupt using Krita. Wishes are feature requests: the reporder thinks some functionality is missing or would be cool to have.
 
 Do not just create a feature request in the bug tracker: follow `Feature Requests <https://krita.org/en/item/ways-to-help-krita-work-on-feature-requests/>`_ to learn how to create a good feature request.
 
 This guide will help you create a good bug report. If you take the time to create a good bug report, you have a much better chance of getting a developer to work on the issue. If there is not enough information to work with, or if the bug report is unreadable, a developer will not be able to understand and fix the issue.
 
 
 .. contents::
 
 Only Report Bugs
 ----------------
 
 A bug is a problem in Krita's code.
 
 - If you have problems with your drawing tablet, for instance no support for pressure, then that is unlikely to be a problem in Krita's code: it is almost certain to be a problem with your setup or the driver for your tablet.
-- If you've lost the toolbox
+- If you've lost the toolbox, that's not a bug.
 - If you have deleted your work, that is not a bug.
 - If Krita works differently from another application, that's not a bug.
 - If Krita works differently than you expected, that's not a bug.
 - If Krita is slower than you expected, that's not a bug.
 
 
 - If Krita crashes, that's a bug.
 - If a file you save comes out garbled, that's a bug.
 - If Krita stops working, that's a bug.
 - If Krita stops displaying correctly, that's a bug.
 
 
 Check the FAQ
 -------------
 
 If you've got a problem with Krita, first check the `FAQ <https://docs.krita.org/en/KritaFAQ.html>`_. See whether your problem is mentioned there. If it is, apply the solution. If that doesn't work for you, do not report a bug. Ask for help on `Krita's Forum <https://forums.kde.org>`_.
 
 Ask on Krita's Forum or IRC Chat Channel
 ----------------------------------------
 
 If uncertain, ask on `Krita's IRC chat channel <https://krita.org/en/irc/>`_ or the `Krita Forum <https://forum.kde.org/krita>`_.
 
 Krita's chat channel is maintained on irc.freenode.net. Developers and users hang out to discuss Krita's development and help people who have questions.
 
 .. important::
     Most Krita developers live in Europe, and the channel is very quiet when it's night in Europe. You also have to patient: it may take some time for people to notice your question even if they are awake.
 
 
 .. admonition:: Also ...
 
    Krita does not have a paid support staff. You will chat with volunteers, users and developers. It is not a help desk.
 
 
 But you can still ask your question, and the people in the channel are a friendly and helpful lot.
 
 
 Use the Latest Version of Krita
 -------------------------------
 
 Check Krita's website to see whether you are using the latest version of Krita. There are two "latest" versions:
 
 - Latest stable: check the `Download page <https://krita.org/download/>`_. Always try to reproduce your bug with this version.
 - Stable and Unstable Nightly builds. The stable nightly build is built from the last release plus all bug fixes done since the last release. This is called **Krita Plus*** The unstable nightly build contains new features and is straight from the development branch of Krita. This is called **Krita Next**. You can download these builds from the `Download page <https://krita.org/download/>`_.
 
 
 Check The Bug Tracker for Duplicates
 ------------------------------------
 
 This can be tricky: many bug reports are very unclear, have misleading subjects or are assigned to the wrong component. The Krita team tries to triage incoming bugs, fixing the subject, the component and asking for more information in case the bug is not clear.
 
 But please do try to check whether a problem has already been reported. If it is, please add your report as a comment to that bug ticket.
 
 
 Be Complete and Be Completely Clear
 -----------------------------------
 
 Give all information. That means that you should give information about your operating system, hardware, the version of Krita you're using and, of course about the problem.
 
 - Operating system: fill in the requisite field in the bug tracker's form
 - Version: fill in the requisite field in the bug tracker's form
 - Hardware information: copy the information from the Help -> System information for Bug Reports window into your report. Note how many displays you have.
 - If you are using a drawing tablet, tell us the brand and type.
 - Tell us what kind of image you were working on: the size, the resolution, the color model and channel depth.
 - If you are reporting a crash, attach a crash log. Follow `this link <https://docs.krita.org/en/reference_manual/dr_minw_debugger.html#dr-minw>`_ to learn how to get a crash log on Windows. On Linux, follow your distributions instructions to install debug symbols if you have installed Krita from a distribution package. It is not possible to create a useful crash log with Linux appimages.
 
 The problem needs to be clearly stated:
 - what happened,
 - what had you expected to happen instead
 - how the problem can be reproduced.
 
 Give a concise and short description, then enumerate the steps needed to reproduce the problem. If you cannot reproduce the problem, and it isn't a crash, think twice before making the report: the developers likely cannot reproduce it either.
 
 If at all possible, attach your original Krita file (the one that ends in .kra) to the bug report, or if it's too big, add a link for download. If you do that, make sure the file will be there for **years** to come: do not remove it.
 
 If you think it would be useful, you can also attach or link to a video. Note that the Krita developers and bug triagers are extremely busy, and that it takes less time to read a good description and a set of steps to reproduce than it takes to wach a video for clues for what is going on.
 
 When making a video or a screenshot, include the whole Krita windows, including the titlebar and the statusbar.
 
 You're Not Done After You Have Filed the Report
 -----------------------------------------------
 
 After you have filed your bug, mail will be sent out to all Krita developers and bug triagers. You do not have to go to the chat channel and tell us you created a bug.
 
 When a developer decides to investigate your report, they will start adding comments to the bug. There might be additional questions: please answer them as soon as possible.
 
 When the developer has come to a conclusion, they will **resolve** the bug. That is done by changing the resolution status in the bug tracker. These statuses are phrased in developer speak, that is to say, they might sound quite rude to you. There's nothing that we can do about that, so do not take it personally. The bug reporter should *never* change the status after a developer changed it.
 
 These are the most used statuses:
 
 - Unconfirmed: your bug has not been investigated yet, or nobody can reproduce your bug.
 - Confirmed: your bug is a bug, but there is no solution yet.
 - Assigned: your bug is a bug, someone is going to work on it. There probably will be a corresponding task on the https://phabricator.kde.org/project/view/8/ developer workboard.
 - Resolved/Fixed: your bug was a genuine problem in Krita's code. The developer has fixed the issue and the solution will be in the next release.
 - Duplicate: your bug has been reported before
 - Needinfo/WaitingForInfo. You need to provide more information. If you do not reply within a reasonable amount of time the bug will be closed.
 - Resolved/Invalid: your report was not about a bug.
 - Resolved/Upstream: the issue you observed is because of a bug in a library Krita uses, or a hardware driver, or your operating system. We cannot do anything about it.
 - Resolved/Downstream: Only on Linux. The issue you observed happens because your Linux distribution packages Krita in a way that causes problems.
 
 See also our chapter on `Bug Triaging <https://docs.krita.org/en/untranslatable_pages/triaging_bugs.html>`_
diff --git a/user_manual/getting_started/starting_krita.rst b/user_manual/getting_started/starting_krita.rst
index 60934ac65..059bac450 100644
--- a/user_manual/getting_started/starting_krita.rst
+++ b/user_manual/getting_started/starting_krita.rst
@@ -1,103 +1,103 @@
 .. meta::
    :description:
         A simple guide to the first basic steps of using Krita: creating and saving an image.
 
 .. metadata-placeholder
 
    :authors: - Wolthera van Hövell tot Westerflier <griffinvalley@gmail.com>
              - Raghavendra Kamath <raghavendr.raghu@gmail.com>
              - Scott Petrovic
              - DMarquant
              - Vancemoss
              - Bugsbane
              - Hamlet 1977
              - Lifeling
              - Yurchor
    :license: GNU free documentation license 1.3 or later.
 
 .. index:: Getting started, Save, Load, New
 .. _starting_with_krita:
 
 Starting Krita
 ==============
 
 There will be no canvas or new document open by default. To create a new canvas you have to create a new document from the :guilabel:`File` menu or |mouseleft| on the empty area in the center to open the new file dialog box. If you want to open an existing image, either use :menuselection:`File --> Open` or drag the image from your computer into Krita's window.
 
 .. image:: /images/en/Starting-krita.png
    :width: 800
 
 Creating a New Document
 -----------------------
 
 A new document can be created as follows.
 
-# Click on :guilabel:`File` from the application menu at the top.
-# Then click on :guilabel:`New`. Or you can do this by pressing :kbd:`Ctrl + N`.
-# Now you will get a New Document dialog box as shown below:
+#. Click on :guilabel:`File` from the application menu at the top.
+#. Then click on :guilabel:`New`. Or you can do this by pressing :kbd:`Ctrl + N`.
+#. Now you will get a New Document dialog box as shown below:
 
 .. image:: /images/en/Krita_newfile.png
 
 Krita is a pretty complex program that can handle a lot of different files, so let's go through this step by step:
 
 Custom Document
 ~~~~~~~~~~~~~~~
 
 From this section you can create a document according to your requirements: you can specify the dimensions, color model, depth, resolution, etc.
 
 In the top-most field of the :guilabel:`Dimensions` tab, you can define a name for your new document. This name will appear in the metadata of the file, and Krita will use it for the auto-save functionality as well. If you leave it empty, the document will be referred to as 'Unnamed' by default.
 
 From the Predefined drop-down you can select predefined pixel sizes and PPI (pixels per inch).
 
 You can set custom dimensions and the orientation of the document from the input fields below the predefined drop-down. This can also be saved as a new predefined preset for your future use by giving a name in the Save As field and clicking on the Save button.
 
 Below we find the Color section of the new document dialog box, where you can select the color model and the bit-depth. Check :ref:`color_management_settings` for more info.
 
 On the :guilabel:`Content` tab, you can select the background color and the amount of layers you want in the new document. Krita remembers the amount of layers you picked last time, so be careful.
 
 Finally, there's a description box, useful to note down what you are going to do.
 
 Create From Clipboard
 ~~~~~~~~~~~~~~~~~~~~~
 
 This section allows you to create a document from an image that is in your clipboard, like a screenshot. It will have all the fields set to match the clipboard image.
 
 Templates:
 ~~~~~~~~~~
 
 These are separate categories where we deliver special defaults. Templates are just .kra files which are saved in a special location, so they can be pulled up by Krita quickly.
 
 You can make your own template file from any .kra file, by using :menuselection:`File --> Create Template From Image` in the top menu. This will add your current document as a new template, including all its properties along with the layers and layer contents.
 
 Once you have created a new document according to your preference, you should now have a white canvas in front of you (or whichever background color you chose in the dialog).
 
 How to use brushes
 ------------------
 
 Now, just press on the canvas part. If everything's correct, you should be able to draw on the canvas!
 The brush tool should be selected by default when you start Krita, but if for some reason it is not, you can click on this |toolfreehandbrush| icon from the toolbar and activate the brush tool.
 
 Of course, you'd want to use different brushes. On your right, there's a docker named Brush Presets (or on top, press :kbd:`f6` to find this one) with all these cute squares with pens and crayons.
 
 If you want to tweak the presets, check the Brush Editor in the toolbar. You can also access the Brush Editor with :kbd:`F5`.
 
 .. image:: /images/en/Krita_Brush_Preset_Docker.png
 
 Tick any of the squares to choose a brush, and then draw on the canvas. To change color, click the triangle in the Advanced Color Selector docker.
 
 Erasing
 -------
 
 There are brush presets for erasing, but it is often faster to use the eraser toggle. By toggling the :kbd:`E` key, your current brush switches between erasing and painting.
 
 This erasing method works with most of the tools. You can erase using the line tool, rectangle tool, and even the gradient tool.
 
 Saving and opening files
 ------------------------
 
 Now, once you have figured out how to draw something in Krita, you may want to save it. The save option is in the same place as it is in all other computer programs: the top-menu of :guilabel:`File`, and then :guilabel:`Save`.
 
 Select the folder you want to have your drawing, and select the file format you want to use ('.kra' is Krita's default format, and will save everything). And then hit :guilabel:`Save`. Some older versions of Krita have a bug and require you to manually type the extension.
 
 If you want to show off your image on the internet, check out the :ref:`saving_for_the_web` tutorial.
 
 Check out :ref:`navigation` for further basic information, :ref:`basic_concepts` for an introduction as Krita as a medium, or just go out and explore Krita!
diff --git a/user_manual/python_scripting/krita_python_plugin_howto.rst b/user_manual/python_scripting/krita_python_plugin_howto.rst
index 48f6337b8..566757bcb 100644
--- a/user_manual/python_scripting/krita_python_plugin_howto.rst
+++ b/user_manual/python_scripting/krita_python_plugin_howto.rst
@@ -1,358 +1,358 @@
 .. meta::
    :description:
         Guide on all the specifics of creating Krita python plugins.
 
 .. metadata-placeholder
 
    :authors: - Wolthera van Hövell tot Westerflier <griffinvalley@gmail.com>
              - BrendanD
              - Scott Petrovic
              - Boudewijn Rempt <boud@valdyas.org>
              - TPaulssen
    :license: GNU free documentation license 1.3 or later.
 
 .. index:: Python, Python Scripting, Scripting, Plugin
 .. _krita_python_plugin_howto:
 
 =================================
 How to make a Krita Python plugin
 =================================
 
 You might have some neat scripts you have written in the Scripter Python runner, but maybe you want to do more with it and run it automatically for instance. Wrapping your script in a plugin can give you much more flexibility and power than running scripts from the Scripter editor.
 
 Okay, so even if you know python really well, there's some little details to getting Krita to recognize a python plugin. So this page will give an overview how to create the various types of python script unique to Krita.
 
 These mini-tutorials are written for people with a basic understanding of python, and in such a way to encourage experimentation instead of plainly copy and pasting code, so read the text carefully.
 
 Getting Krita to recognize your plugin
 --------------------------------------
 
 A script in Krita has two components - the script directory (holding your script's Python files) and a ".desktop" file that Krita uses to load and register your script. For Krita to load your script both of these must put be in the pykrita subdirectory of your Krita resources folder (on Linux  ~/.local/share/krita/pykrita). To find your resources folder start Krita and click the :menuselection:`Settings --> Manage Resources menu item`. This will open a dialog box. Click the button Open Resources Folder. This should open a file manager on your system at your Krita resources folder. See the `API <https://api.kde.org/extragear-api/graphics-apidocs/krita/libs/libkis/html/index.html>`_ docs under "Auto starting scripts".  If there is no pykrita subfolder in the Krita resources directory use your file manager to create one. 
 
 Scripts are identified by a file that ends in a .desktop extension that contain information about the script itself.
 
 Therefore, for each proper plugin you will need to create a folder, and a desktop file.
 
 The desktop file should look as follows::
 
     [Desktop Entry]
     Type=Service
     ServiceTypes=Krita/PythonPlugin
     X-KDE-Library=myplugin
     X-Python-2-Compatible=false
     X-Krita-Manual=myPluginManual.html
     Name=My Own Plugin
     Comment=Our very own plugin.
 
 Type
  This should always be service.
 ServiceTypes
  This should always be Krita/PythonPlugin for python plugins.
 X-KDE-Library
  This should be the name of the plugin folder you just created.
 X-Python-2-Compatible
  Whether it is python 2 compatible. If Krita was build with python 2 instead of 3 (``-DENABLE_PYTHON_2=ON`` in the cmake configuration), then this plugin will not show up in the list.
 X-Krita-Manual
  An Optional Value that will point to the manual item. This is shown in the Python Plugin manager. If it's `a HTML file it'll be shown as rich text <https://doc.qt.io/qt-5/richtext-html-subset.html>`_, if not, it'll be shown as plain text.
 Name
  The name that will show up in the Python Plugin Manager
 Comment
  The description that will show up in the Python Plugin Manager.
 
 Krita python plugins need to be python modules, so make sure there's an __init__.py script, containing something like...
 
 .. code:: python
 
     from .myplugin import *
 
 
 Where .myplugin is the name of the main file of your plugin. If you restart Krita, it now should show this in the Python Plugin Manager in the settings, but it will be grayed out, because there's no myplugin.py. If you hover over disabled plugins, you can see the error with them.
 
 Summary
 ^^^^^^^
 
 In summary, if you want to create a script called *myplugin*:
 
 - in your Krita *resources/pykrita* directory create
     - a folder called *myplugin*
     - a file called *myplugin.desktop*
 - in the *myplugin* folder create
     - a file called *__init__.py*
     - a file called *myplugin.py*
 - in the *__init__.py* file put this code:
 
 .. code:: python
 
     from .myplugin import *
 
 - in the desktop file put this code::
 
     [Desktop Entry]
     Type=Service
     ServiceTypes=Krita/PythonPlugin
     X-KDE-Library=myplugin
     X-Python-2-Compatible=false
     Name=My Own Plugin
     Comment=Our very own plugin.
 
 - write your script in the ''myplugin/myplugin.py'' file.
 
 Creating an extension
 ---------------------
 
 `Extensions <https://api.kde.org/extragear-api/graphics-apidocs/krita/libs/libkis/html/classExtension.html>`_ are relatively simple python scripts that run on Krita start. They are made by extending the Extension class, and the most barebones extension looks like this:
 
 .. code:: python
 
     import sys
     from krita import *
 
     class MyExtension(Extension):
 
         def __init__(self, parent):
             #This is initialising the parent, always  important when subclassing.
             super().__init__(parent)
 
         def setup(self):
             pass
 
         def createActions(self, window):
             pass
 
     # And add the extension to Krita's list of extensions:
     Krita.instance().addExtension(MyExtension(Krita.instance())) 
 
 This code of course doesn't do anything. Typically, in createActions we add actions to Krita, so we can access our script from the :guilabel:`Tools` menu.
 
 First, let's create an `action <https://api.kde.org/extragear-api/graphics-apidocs/krita/libs/libkis/html/classAction.html>`_. We can do that easily with `Window.createAction() <https://api.kde.org/extragear-api/graphics-apidocs/krita/libs/libkis/html/classWindow.html#a72ec58e53844076c1461966c34a9115c>`_. Krita will call createActions for every Window that is created and pass the right window object that we have to use.
 
 So...
 
 .. code:: python
 
     def createActions(self, window):
         action = window.createAction("myAction", "My Script", "tools/scripts")
 
 
 "myAction"
  This should be replaced with an unique id that Krita will use to find the action.
 "My Script"
  This is what will be visible in the tools menu.
 
 if you now restart Krita, you will have an action called "My Script". It still doesn't do anything, because we haven't connected it to a script.
 
 So, lets make a simple export document script. Add the following to the extension class, make sure it is above where you add the extension to Krita:
 
 .. code:: python
 
     def exportDocument(self):
         # Get the document:
         doc =  Krita.instance().activeDocument()
         # Saving a non-existent document causes crashes, so lets check for that first.
         if doc is not None:
             # This calls up the save dialog. The save dialog returns a tuple.
             fileName = QFileDialog.getSaveFileName()[0]
             # And export the document to the fileName location.
             # InfoObject is a dictionary with specific export options, but when we make an empty one Krita will use the export defaults.
             doc.exportImage(fileName, InfoObject())
 
 
 And add the import for QFileDialog above with the imports:
 
 .. code:: python
 
     import sys
     from krita import *
     from PyQt5.QtWidgets import QFileDialog
 
 Then, to connect the action to the new export document:
 
 .. code:: python
 
     def createActions(self, window):
         action = window.createAction("myAction", "My Script")
         action.triggered.connect(self.exportDocument)
 
 
 This is an example of a `signal/slot connection <http://doc.qt.io/qt-5/signalsandslots.html>`_, which QT applications like Krita use a lot. We'll go over how to make our own signals and slots a bit later.
 
 Restart Krita and your new action ought to now export the document.
 
 Creating configurable keyboard shortcuts
 ----------------------------------------
 
 Now, your new action doesn't show up in :menuselection:`Settings --> configure Krita --> Keyboard Shortcuts`.
 
 Krita, for various reasons, only adds actions to the shortcuts menu when they are present in an .action file. The action file to get our action to be added to shortcuts should look like this:
 
 .. code:: xml
 
     <?xml version="1.0" encoding="UTF-8"?>
     <ActionCollection version="2" name="Scripts">
         <Actions category="Scripts">
             <text>My Scripts</text>
 
             <Action name="myAction">
             <icon></icon>
             <text>My Script</text>
             <whatsThis></whatsThis>
             <toolTip></toolTip>
             <iconText></iconText>
             <activationFlags>10000</activationFlags>
             <activationConditions>0</activationConditions>
             <shortcut>ctrl+alt+shift+p</shortcut>
             <isCheckable>false</isCheckable>
             <statusTip></statusTip>
             </Action>
         </Actions>
     </ActionCollection>
 
 
 <text>My Scripts</text>
  This will create a sub-category under scripts called "My Scripts" to add your shortcuts to.
 name
  This should be the unique id you made for your action when creating it in the setup of the extension.
 icon
  the name of a possible icon. These will only show up on KDE plasma, because Gnome and Windows users complained they look ugly.
 text
  The text that it will show in the shortcut editor.
 whatsThis
  The text it will show when a QT application specifically calls for 'what is this', which is a help action.
 toolTip
  The tool tip, this will show up on hover-over.
 iconText
  The text it will show when displayed in a toolbar. So for example, "Resize Image to New Size" could be shortened to "Resize Image" to save space, so we'd put that in here.
 activationFlags
  This determines when an action is disabled or not.
 activationConditions
  No clue
 shortcut
  Default shortcut.
 isCheckable
  Whether it is a checkbox or not.
 statusTip
  No Clue.
 
 Save this file as "myplugin.action" where myplugin is the name of your plugin. The action file should be saved, not in the pykrita resources folder, but rather in a resources folder named "actions". (So, share/pykrita is where the python plugins and desktop files go, and share/actions is where the action files go) Restart Krita. The shortcut should now show up in the shortcut action list.
 
 Creating a docker
 -----------------
 
 Creating a custom `docker <https://api.kde.org/extragear-api/graphics-apidocs/krita/libs/libkis/html/classDockWidget.html>`_ is much like creating an extension. Dockers are in some ways a little easier, but they also require more use of widgets. This is the barebones docker code:
 
 .. code:: python
 
     import sys
     from PyQt5.QtWidgets import *
     from krita import *
 
     class MyDocker(DockWidget):
 
         def __init__(self):
             super().__init__()
             self.setWindowTitle("My Docker")
 
         def canvasChanged(self, canvas):
             pass
 
     Krita.instance().addDockWidgetFactory(DockWidgetFactory("myDocker", DockWidgetFactoryBase.DockRight, MyDocker))
 
 The window title is how it will appear in the docker list in Krita. canvasChanged always needs to be present, but you don't have to do anything with it, so hence just 'pass'.
 
 For the addDockWidgetFactory...
 
 "myDocker"
  Replace this with an unique ID for your docker that Krita uses to keep track of it.
 DockWidgetFactoryBase.DockRight
  The location. These can be DockTornOff, DockTop, DockBottom, DockRight, DockLeft, or DockMinimized
 MyDocker
  Replace this with class name of the docker your wanna add.
 
 So, if we add our export document function we created in the extension section to this docker code, how do we allow the user to activate it? First, we'll need to do some QT GUI coding: Let's add a button!
 
 Krita standardly uses pyQT, but their documentation is pretty bad, mostly because the regular QT documentation is really good, and you'll often find that the pyQT documentation of a class, say, `QWidget <http://pyqt.sourceforge.net/Docs/PyQt4/qwidget.html>`_ is like a weird copy of the regular `QT documentation <http://doc.qt.io/qt-5/qwidget.html>`_ for that class.
 
 Anyway, what we need to do first is that we need to create a QWidget, it's not very complicated, under setWindowTitle, add:
 
 .. code:: python
 
     mainWidget = QWidget(self)
     self.setWidget(mainWidget)
 
 Then, we create a button:
 
 .. code:: python
 
     buttonExportDocument = QPushButton("Export Document", mainWidget)
 
 Now, to connect the button to our function, we'll need to look at the signals in the documentation. `QPushButton <http://doc.qt.io/qt-5/qpushbutton.html>`_ has no unique signals of it's own, but it does say it inherits 4 signals from `QAbstractButton <http://doc.qt.io/qt-5/qabstractbutton.html#signals>`_, which means that we can use those too. In our case, we want clicked.
 
 .. code:: python
 
     buttonExportDocument.clicked.connect(self.exportDocument)
 
 If we now restart Krita, we'll have a new docker and in that docker there's a button. Clicking on the button will call up the export function.
 
 However, the button looks aligned a bit oddly. That's because our mainWidget has no layout. Let's quickly do that:
 
 .. code:: python
 
     mainWidget.setLayout(QVBoxLayout())
     mainWidget.layout().addWidget(buttonExportDocument)
 
 Qt has several `layouts <http://doc.qt.io/qt-5/qlayout.html>`_, but the `QHBoxLayout and the QVBoxLayout <http://doc.qt.io/qt-5/qboxlayout.html>`_ are the easiest to use, they just arrange widgets horizontally or vertically.
 
 Restart Krita and the button should now be laid out nicely.
 
 PyQT Signals and Slots
 ----------------------
 
 We've already been using pyqt signals and slots already, but there's times where you want to create your own signals and slots.
 `As pyQt's documentation is pretty difficult to understand <http://pyqt.sourceforge.net/Docs/PyQt4/new_style_signals_slots.html>`_, and the way how signals and slots are created is very different from C++ qt, we're explaining it here:
 
 All python functions you make in pyQt can be understood as slots, meaning that they can be connected to signals like Action.triggered or QPushButton.clicked. However, QCheckBox has a signal for toggled, which sents a boolean. How do we get our function to accept that boolean?
 
 First, make sure you have the right import for making custom slots:
 
 ``from PyQt5.QtCore import pyqtSlot``
 
 (If there's from ``PyQt5.QtCore import *`` already in the list of imports, then you won't have to do this, of course)
 
 Then, you need to add a pyQt slot definition before your function:
 
 .. code:: python
 
     @pyqtSlot(bool)
-    def myFunction(self, enabled)
+    def myFunction(self, enabled):
         enabledString = "disabled"
         if (enabled == True):
             enabledString = "enabled"
         print("The checkbox is"+enabledString)
 
 
 Then, when you ave created your checkbox, you can do something like myCheckbox.toggled.connect(self.myFunction)
 
-Similarly, to make your own pyQT signals, you do the following:
+Similarly, to make your own PyQt signals, you do the following:
 
 .. code:: python
 
     # signal name is added to the member variables of the class
     signal_name = pyqtSignal(bool, name='signalName')
 
     def emitMySignal(self):
         # And this is how you trigger the signal to be emitted.
         self.signal_name.emit(True)
 
 
 and use the right import:
 
 ``from PyQt5.QtCore import pyqtSignal``
 
 To emit or create slots for objects that aren't standard python objects, you only have to put their names between quotation marks.
 
 Conclusion
 ----------
 
 Okay, so that covers all the Krita specific details for creating python plugins. It doesn't handle how to parse the pixel data, or best practices with documents, but if you have a little bit of experience with python you should be able to start creating your own plugins.
 
-As always, read the code carefully and read the API docs for python, krita and QT carefully to see what is possible, and you'll get pretty far.
+As always, read the code carefully and read the API docs for python, Krita and Qt carefully to see what is possible, and you'll get pretty far.