diff --git a/3rdparty/icontheme/cache.d b/3rdparty/icontheme/cache.d
deleted file mode 100644
index 74d0f7be..00000000
--- a/3rdparty/icontheme/cache.d
+++ /dev/null
@@ -1,454 +0,0 @@
-/**
- * This module provides class for loading and validating icon theme caches.
- *
- * Icon theme cache may be stored in icon-theme.cache files located in icon theme directory along with index.theme file.
- * These files are usually generated by $(LINK2 https://developer.gnome.org/gtk3/stable/gtk-update-icon-cache.html, gtk-update-icon-cache).
- * Icon theme cache can be used for faster and cheeper lookup of icons since it contains information about which icons exist in which sub directories.
- *
- * Authors:
- *  $(LINK2 https://github.com/FreeSlave, Roman Chistokhodov)
- * Copyright:
- *  Roman Chistokhodov, 2016
- * License:
- *  $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * See_Also:
- *  $(LINK2 https://github.com/GNOME/gtk/blob/master/gtk/gtkiconcachevalidator.c, GTK icon cache validator source code)
- * Note:
- *  I could not find any specification on icon theme cache, so I merely use gtk source code as reference to reimplement parsing of icon-theme.cache files.
- */
-
-
-module icontheme.cache;
-
-package {
-    import std.algorithm;
-    import std.bitmanip;
-    import std.exception;
-    import std.file;
-    import std.mmfile;
-    import std.path;
-    import std.range;
-    import std.system;
-    import std.typecons;
-    import std.traits;
-
-    import std.datetime : SysTime;
-
-    static if( __VERSION__ < 2066 ) enum nogc = 1;
-}
-
-private @nogc @trusted void swapByteOrder(T)(ref T t) nothrow pure  {
-
-    static if( __VERSION__ < 2067 ) { //swapEndian was not @nogc
-        ubyte[] bytes = (cast(ubyte*)&t)[0..T.sizeof];
-        for (size_t i=0; i<bytes.length/2; ++i) {
-            ubyte tmp = bytes[i];
-            bytes[i] = bytes[T.sizeof-1-i];
-            bytes[T.sizeof-1-i] = tmp;
-        }
-    } else {
-        t = swapEndian(t);
-    }
-}
-
-/**
- * Error occured while parsing icon theme cache.
- */
-class IconThemeCacheException : Exception
-{
-    this(string msg, string context = null, string file = __FILE__, size_t line = __LINE__, Throwable next = null) pure nothrow @safe {
-        super(msg, file, line, next);
-        _context = context;
-    }
-
-    /**
-     * Context where error occured. Usually it's the name of value that could not be read or is invalid.
-     */
-    @nogc @safe string context() const nothrow {
-        return _context;
-    }
-private:
-    string _context;
-}
-
-/**
- * Class representation of icon-theme.cache file contained icon theme cache.
- */
-final class IconThemeCache
-{
-    /**
-     * Read icon theme cache from memory mapped file and validate it.
-     * Throws:
-     *  $(B FileException) if could mmap file.
-     *  $(D IconThemeCacheException) if icon theme file is invalid.
-     */
-    @trusted this(string fileName) {
-        _mmapped = new MmFile(fileName);
-        this(_mmapped[], fileName, 0);
-    }
-
-    /**
-     * Read icon theme cache from data and validate it.
-     * Throws:
-     *  $(D IconThemeCacheException) if icon theme file is invalid.
-     */
-    @safe this(immutable(void)[] data, string fileName) {
-        this(data, fileName, 0);
-    }
-
-    private @trusted this(const(void)[] data, string fileName, int /* To avoid ambiguity */) {
-        _data = data;
-        _fileName = fileName;
-
-        _header.majorVersion = readValue!ushort(0, "major version");
-        if (_header.majorVersion != 1) {
-            throw new IconThemeCacheException("Unsupported version or the file is not icon theme cache", "major version");
-        }
-
-        _header.minorVersion = readValue!ushort(2, "minor version");
-        if (_header.minorVersion != 0) {
-            throw new IconThemeCacheException("Unsupported version or the file is not icon theme cache", "minor version");
-        }
-
-        _header.hashOffset = readValue!uint(4, "hash offset");
-        _header.directoryListOffset = readValue!uint(8, "directory list offset");
-
-        _bucketCount = iconOffsets().length;
-        _directoryCount = directories().length;
-
-        //Validate other data
-        foreach(dir; directories()) {
-            //pass
-        }
-
-        foreach(info; iconInfos) {
-            foreach(im; imageInfos(info.imageListOffset)) {
-
-            }
-        }
-    }
-
-    /**
-     * Sub directories of icon theme listed in cache.
-     * Returns: Range of directory const(char)[] names listed in cache.
-     */
-    @trusted auto directories() const {
-        auto directoryCount = readValue!uint(_header.directoryListOffset, "directory count");
-
-        return iota(directoryCount)
-                .map!(i => _header.directoryListOffset + uint.sizeof + i*uint.sizeof)
-                .map!(offset => readValue!uint(offset, "directory offset"))
-                .map!(offset => readString(offset, "directory name"));
-    }
-
-    /**
-     * Test if icon is listed in cache.
-     */
-    @trusted bool containsIcon(const(char)[] iconName) const
-    {
-        IconInfo info;
-        return findIconInfo(info, iconName);
-    }
-
-    /**
-     * Test if icon is listed in cache and belongs to specified subdirectory.
-     */
-    @trusted bool containsIcon(const(char)[] iconName, const(char)[] directory) const {
-        auto index = iconDirectories(iconName).countUntil(directory);
-        return index != -1;
-    }
-
-    /**
-     * Find all sub directories the icon belongs to according to cache.
-     * Returns: Range of directory const(char)[] names the icon belongs to.
-     */
-    @trusted auto iconDirectories(const(char)[] iconName) const
-    {
-        IconInfo info;
-        auto dirs = directories();
-        bool found = findIconInfo(info, iconName);
-        return imageInfos(info.imageListOffset, found).map!(delegate(ImageInfo im) {
-            if (im.index < dirs.length) {
-                return dirs[im.index];
-            } else {
-                throw new IconThemeCacheException("Invalid directory index", "directory index");
-            }
-        });
-    }
-
-    /**
-     * Path of cache file.
-     */
-    @nogc @safe fileName() const nothrow {
-        return _fileName;
-    }
-
-    /**
-     * Test if icon theme file is outdated, i.e. modification time of cache file is older than modification time of icon theme directory.
-     * Throws:
-     *  $(B FileException) on error accessing the file.
-     */
-    @trusted bool isOutdated() const {
-        return isOutdated(fileName());
-    }
-
-    /**
-     * Test if icon theme file is outdated, i.e. modification time of cache file is older than modification time of icon theme directory.
-     *
-     * This function is static and therefore can be used before actual reading and validating cache file.
-     * Throws:
-     *  $(B FileException) on error accessing the file.
-     */
-    static @trusted bool isOutdated(string fileName)
-    {
-        if (fileName.empty) {
-            throw new FileException("File name is empty, can't check if the cache is outdated");
-        }
-
-        SysTime pathAccessTime, pathModificationTime;
-        SysTime fileAccessTime, fileModificationTime;
-
-        getTimes(fileName, fileAccessTime, fileModificationTime);
-        getTimes(fileName.dirName, pathAccessTime, pathModificationTime);
-
-        return fileModificationTime < pathModificationTime;
-    }
-
-    unittest
-    {
-        assertThrown!FileException(isOutdated(""));
-    }
-
-    /**
-     * All icon names listed in cache.
-     * Returns: Range of icon const(char)[] names listed in cache.
-     */
-    @trusted auto icons() const {
-        return iconInfos().map!(info => info.name);
-    }
-
-private:
-    alias Tuple!(uint, "chainOffset", const(char)[], "name", uint, "imageListOffset") IconInfo;
-    alias Tuple!(ushort, "index", ushort, "flags", uint, "dataOffset") ImageInfo;
-
-    static struct IconThemeCacheHeader
-    {
-        ushort majorVersion;
-        ushort minorVersion;
-        uint hashOffset;
-        uint directoryListOffset;
-    }
-
-    @trusted auto iconInfos() const {
-        import std.typecons;
-
-        static struct IconInfos
-        {
-            this(const(IconThemeCache) cache)
-            {
-                _cache = rebindable(cache);
-                _iconInfos = _cache.bucketIconInfos();
-                _chainOffset = _iconInfos.front().chainOffset;
-                _fromChain = false;
-            }
-
-            bool empty()
-            {
-                return _iconInfos.empty;
-            }
-
-            auto front()
-            {
-                if (_fromChain) {
-                    auto info = _cache.iconInfo(_chainOffset);
-                    return info;
-                } else {
-                    auto info = _iconInfos.front;
-                    return info;
-                }
-            }
-
-            void popFront()
-            {
-                if (_fromChain) {
-                    auto info = _cache.iconInfo(_chainOffset);
-                    if (info.chainOffset != 0xffffffff) {
-                        _chainOffset = info.chainOffset;
-                    } else {
-                        _iconInfos.popFront();
-                        _fromChain = false;
-                    }
-                } else {
-                    auto info = _iconInfos.front;
-                    if (info.chainOffset != 0xffffffff) {
-                        _chainOffset = info.chainOffset;
-                        _fromChain = true;
-                    } else {
-                        _iconInfos.popFront();
-                    }
-                }
-            }
-
-            auto save() const {
-                return this;
-            }
-
-            uint _chainOffset;
-            bool _fromChain;
-            typeof(_cache.bucketIconInfos()) _iconInfos;
-            Rebindable!(const(IconThemeCache)) _cache;
-        }
-
-        return IconInfos(this);
-    }
-
-    @nogc @trusted static uint iconNameHash(const(char)[] iconName) pure nothrow
-    {
-        if (iconName.length == 0) {
-            return 0;
-        }
-
-        uint h = cast(uint)iconName[0];
-        if (h) {
-            for (size_t i = 1; i != iconName.length; i++) {
-                h = (h << 5) - h + cast(uint)iconName[i];
-            }
-        }
-        return h;
-    }
-
-    bool findIconInfo(out IconInfo info, const(char)[] iconName) const {
-        uint hash = iconNameHash(iconName) % _bucketCount;
-        uint chainOffset = readValue!uint(_header.hashOffset + uint.sizeof + uint.sizeof * hash, "chain offset");
-
-        while(chainOffset != 0xffffffff) {
-            auto curInfo = iconInfo(chainOffset);
-            if (curInfo.name == iconName) {
-                info = curInfo;
-                return true;
-            }
-            chainOffset = curInfo.chainOffset;
-        }
-        return false;
-    }
-
-    @trusted auto bucketIconInfos() const {
-        return iconOffsets().filter!(offset => offset != 0xffffffff).map!(offset => iconInfo(offset));
-    }
-
-    @trusted auto iconOffsets() const {
-        auto bucketCount = readValue!uint(_header.hashOffset, "bucket count");
-
-        return iota(bucketCount)
-                .map!(i => _header.hashOffset + uint.sizeof + i*uint.sizeof)
-                .map!(offset => readValue!uint(offset, "icon offset"));
-    }
-
-    @trusted auto iconInfo(size_t iconOffset) const {
-        return IconInfo(
-            readValue!uint(iconOffset, "icon chain offset"),
-            readString(readValue!uint(iconOffset + uint.sizeof, "icon name offset"), "icon name"),
-            readValue!uint(iconOffset + uint.sizeof*2, "image list offset"));
-    }
-
-    @trusted auto imageInfos(size_t imageListOffset, bool found = true) const {
-
-        uint imageCount = found ? readValue!uint(imageListOffset, "image count") : 0;
-        return iota(imageCount)
-                .map!(i => imageListOffset + uint.sizeof + i*(uint.sizeof + ushort.sizeof + ushort.sizeof))
-                .map!(offset => ImageInfo(
-                            readValue!ushort(offset, "image index"),
-                            readValue!ushort(offset + ushort.sizeof, "image flags"),
-                            readValue!uint(offset + ushort.sizeof*2, "image data offset"))
-                     );
-    }
-
-    @trusted T readValue(T)(size_t offset, string context = null) const if (isIntegral!T || isSomeChar!T)
-    {
-        if (_data.length >= offset + T.sizeof) {
-            T value = *(cast(const(T)*)_data[offset..(offset+T.sizeof)].ptr);
-            static if (endian == Endian.littleEndian) {
-                swapByteOrder(value);
-            }
-            return value;
-        } else {
-            throw new IconThemeCacheException("Value is out of bounds", context);
-        }
-    }
-
-    @trusted auto readString(size_t offset, string context = null) const {
-        if (offset > _data.length) {
-            throw new IconThemeCacheException("Beginning of string is out of bounds", context);
-        }
-
-        auto str = cast(const(char[]))_data[offset.._data.length];
-
-        size_t len = 0;
-        while (len<str.length && str[len] != '\0') {
-            ++len;
-        }
-        if (len == str.length) {
-            throw new IconThemeCacheException("String is not zero terminated", context);
-        }
-
-        return str[0..len];
-    }
-
-    IconThemeCacheHeader _header;
-    size_t _directoryCount;
-    size_t _bucketCount;
-
-    MmFile _mmapped;
-    string _fileName;
-    const(void)[] _data;
-}
-
-///
-version(iconthemeFileTest) unittest
-{
-    string cachePath = "./test/Tango/icon-theme.cache";
-    assert(cachePath.exists);
-
-    const(IconThemeCache) cache = new IconThemeCache(cachePath);
-    assert(cache.fileName == cachePath);
-    assert(cache.containsIcon("folder"));
-    assert(cache.containsIcon("folder", "24x24/places"));
-    assert(cache.containsIcon("edit-copy", "32x32/actions"));
-    assert(cache.iconDirectories("text-x-generic").canFind("32x32/mimetypes"));
-    assert(cache.directories().canFind("32x32/devices"));
-
-    auto icons = cache.icons();
-    assert(icons.canFind("folder"));
-    assert(icons.canFind("text-x-generic"));
-
-    try {
-        SysTime pathAccessTime, pathModificationTime;
-        SysTime fileAccessTime, fileModificationTime;
-
-        getTimes(cachePath, fileAccessTime, fileModificationTime);
-        getTimes(cachePath.dirName, pathAccessTime, pathModificationTime);
-
-        setTimes(cachePath, pathAccessTime, pathModificationTime);
-        assert(!IconThemeCache.isOutdated(cachePath));
-    }
-    catch(Exception e) {
-        // some environmental error, just ignore
-    }
-
-    try {
-        auto fileData = assumeUnique(std.file.read(cachePath));
-        assertNotThrown(new IconThemeCache(fileData, cachePath));
-    } catch(FileException e) {
-
-    }
-
-    immutable(ubyte)[] data = [0,2,0,0];
-    IconThemeCacheException thrown = collectException!IconThemeCacheException(new IconThemeCache(data, cachePath));
-    assert(thrown !is null, "Invalid cache must throw");
-    assert(thrown.context == "major version");
-
-    data = [0,1,0,1];
-    thrown = collectException!IconThemeCacheException(new IconThemeCache(data, cachePath));
-    assert(thrown !is null, "Invalid cache must throw");
-    assert(thrown.context == "minor version");
-}
diff --git a/3rdparty/icontheme/file.d b/3rdparty/icontheme/file.d
deleted file mode 100644
index 09357371..00000000
--- a/3rdparty/icontheme/file.d
+++ /dev/null
@@ -1,712 +0,0 @@
-/**
- * This module provides class for reading and accessing icon theme descriptions.
- *
- * Information about icon themes is stored in special files named index.theme and located in icon theme directory.
- *
- * Authors:
- *  $(LINK2 https://github.com/FreeSlave, Roman Chistokhodov)
- * Copyright:
- *  Roman Chistokhodov, 2015-2016
- * License:
- *  $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * See_Also:
- *  $(LINK2 http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html, Icon Theme Specification)
- */
-
-module icontheme.file;
-
-package
-{
-    import std.algorithm;
-    import std.array;
-    import std.conv;
-    import std.exception;
-    import std.path;
-    import std.range;
-    import std.string;
-    import std.traits;
-    import std.typecons;
-
-    static if( __VERSION__ < 2066 ) enum nogc = 1;
-}
-
-import icontheme.cache;
-
-public import inilike.file;
-import inilike.common;
-
-/**
- * Adapter of $(D inilike.file.IniLikeGroup) for easy access to icon subdirectory properties.
- */
-struct IconSubDir
-{
-    ///The type of icon sizes for the icons in the directory.
-    enum Type {
-        ///Icons can be used if the size differs at some threshold from the desired size.
-        Threshold,
-        ///Icons can be used if the size does not differ from desired.
-        Fixed,
-        ///Icons are scalable without visible quality loss.
-        Scalable
-    }
-
-    @safe this(const(IniLikeGroup) group) nothrow {
-        collectException(group.value("Size").to!uint, _size);
-        collectException(group.value("MinSize").to!uint, _minSize);
-        collectException(group.value("MaxSize").to!uint, _maxSize);
-
-        if (_minSize == 0) {
-            _minSize = _size;
-        }
-
-        if (_maxSize == 0) {
-            _maxSize = _size;
-        }
-
-        collectException(group.value("Threshold").to!uint, _threshold);
-        if (_threshold == 0) {
-            _threshold = 2;
-        }
-
-        _type = Type.Threshold;
-
-        string t = group.value("Type");
-        if (t.length) {
-            if (t == "Fixed") {
-                _type = Type.Fixed;
-            } else if (t == "Scalable") {
-                _type = Type.Scalable;
-            }
-        }
-
-        _context = group.value("Context");
-        _name = group.groupName();
-    }
-
-    @safe this(uint size, Type type = Type.Threshold, string context = null, uint minSize = 0, uint maxSize = 0, uint threshold = 2) nothrow pure
-    {
-        _size = size;
-        _context = context;
-        _type = type;
-        _minSize = minSize ? minSize : size;
-        _maxSize = maxSize ? maxSize : size;
-        _threshold = threshold;
-    }
-
-    /**
-     * The name of section in icon theme file and relative path to icons.
-     */
-    @nogc @safe string name() const nothrow pure {
-        return _name;
-    }
-
-    /**
-     * Nominal size of the icons in this directory.
-     * Returns: The value associated with "Size" key converted to an unsigned integer, or 0 if the value is not present or not a number.
-     */
-    @nogc @safe uint size() const nothrow pure {
-        return _size;
-    }
-
-    /**
-     * The context the icon is normally used in.
-     * Returns: The value associated with "Context" key.
-     */
-    @nogc @safe string context() const nothrow pure {
-        return _context;
-    }
-
-    /**
-     * The type of icon sizes for the icons in this directory.
-     * Returns: The value associated with "Type" key or Type.Threshold if not specified.
-     */
-    @nogc @safe Type type() const nothrow pure {
-        return _type;
-    }
-
-    /**
-     * The maximum size that the icons in this directory can be scaled to. Defaults to the value of Size if not present.
-     * Returns: The value associated with "MaxSize" key converted to an unsigned integer, or size() if the value is not present or not a number.
-     * See_Also: $(D size), $(D minSize)
-     */
-    @nogc @safe uint maxSize() const nothrow pure {
-        return _maxSize;
-    }
-
-    /**
-     * The minimum size that the icons in this directory can be scaled to. Defaults to the value of Size if not present.
-     * Returns: The value associated with "MinSize" key converted to an unsigned integer, or size() if the value is not present or not a number.
-     * See_Also: $(D size), $(D maxSize)
-     */
-    @nogc @safe uint minSize() const nothrow pure {
-        return _minSize;
-    }
-
-    /**
-     * The icons in this directory can be used if the size differ at most this much from the desired size. Defaults to 2 if not present.
-     * Returns: The value associated with "Threshold" key, or 2 if the value is not present or not a number.
-     */
-    @nogc @safe uint threshold() const nothrow pure {
-        return _threshold;
-    }
-private:
-    uint _size;
-    uint _minSize;
-    uint _maxSize;
-    uint _threshold;
-    Type _type;
-    string _context;
-    string _name;
-}
-
-final class IconThemeGroup : IniLikeGroup
-{
-    protected @nogc @safe this() nothrow {
-        super("Icon Theme");
-    }
-
-    /**
-     * Short name of the icon theme, used in e.g. lists when selecting themes.
-     * Returns: The value associated with "Name" key.
-     * See_Also: $(D IconThemeFile.internalName), $(D localizedDisplayName)
-     */
-    @safe string displayName() const nothrow pure {
-        return readEntry("Name");
-    }
-    /**
-     * Set "Name" to name escaping the value if needed.
-     */
-    @safe string displayName(string name) {
-        return writeEntry("Name", name);
-    }
-
-    ///Returns: Localized name of icon theme.
-    @safe string localizedDisplayName(string locale) const nothrow pure {
-        return readEntry("Name", locale);
-    }
-
-    /**
-     * Longer string describing the theme.
-     * Returns: The value associated with "Comment" key.
-     */
-    @safe string comment() const nothrow pure {
-        return readEntry("Comment");
-    }
-    /**
-     * Set "Comment" to commentary escaping the value if needed.
-     */
-    @safe string comment(string commentary) {
-        return writeEntry("Comment", commentary);
-    }
-
-    ///Returns: Localized comment.
-    @safe string localizedComment(string locale) const nothrow pure {
-        return readEntry("Comment", locale);
-    }
-
-    /**
-     * Whether to hide the theme in a theme selection user interface.
-     * Returns: The value associated with "Hidden" key converted to bool using isTrue.
-     */
-    @nogc @safe bool hidden() const nothrow pure {
-        return isTrue(value("Hidden"));
-    }
-    ///setter
-    @safe bool hidden(bool hide) {
-        this["Hidden"] = boolToString(hide);
-        return hide;
-    }
-
-    /**
-     * The name of an icon that should be used as an example of how this theme looks.
-     * Returns: The value associated with "Example" key.
-     */
-    @safe string example() const nothrow pure {
-        return readEntry("Example");
-    }
-    /**
-     * Set "Example" to example escaping the value if needed.
-     */
-    @safe string example(string example) {
-        return writeEntry("Example", example);
-    }
-
-    /**
-     * List of subdirectories for this theme.
-     * Returns: The range of values associated with "Directories" key.
-     */
-    @safe auto directories() const {
-        return IconThemeFile.splitValues(readEntry("Directories"));
-    }
-    ///setter
-    string directories(Range)(Range values) if (isInputRange!Range && isSomeString!(ElementType!Range)) {
-        return writeEntry("Directories", IconThemeFile.joinValues(values));
-    }
-
-    /**
-     * Names of themes that this theme inherits from.
-     * Returns: The range of values associated with "Inherits" key.
-     * Note: It does NOT automatically adds hicolor theme if it's missing.
-     */
-    @safe auto inherits() const {
-        return IconThemeFile.splitValues(readEntry("Inherits"));
-    }
-    ///setter
-    string inherits(Range)(Range values) if (isInputRange!Range && isSomeString!(ElementType!Range)) {
-        return writeEntry("Inherits", IconThemeFile.joinValues(values));
-    }
-
-protected:
-    @trusted override void validateKey(string key, string value) const {
-        if (!isValidDesktopFileKey(key)) {
-            throw new IniLikeEntryException("key is invalid", groupName(), key, value);
-        }
-    }
-}
-
-/**
- * Class representation of index.theme file containing an icon theme description.
- */
-final class IconThemeFile : IniLikeFile
-{
-    /**
-     * Policy about reading extension groups (those start with 'X-').
-     */
-    enum ExtensionGroupPolicy : ubyte {
-        skip, ///Don't save extension groups.
-        preserve ///Save extension groups.
-    }
-
-    /**
-     * Policy about reading groups with names which meaning is unknown, i.e. it's not extension nor relative directory path.
-     */
-    enum UnknownGroupPolicy : ubyte {
-        skip, ///Don't save unknown groups.
-        preserve, ///Save unknown groups.
-        throwError ///Throw error when unknown group is encountered.
-    }
-
-    ///Options to manage icon theme file reading
-    static struct IconThemeReadOptions
-    {
-        ///Base $(D inilike.file.IniLikeFile.ReadOptions).
-        IniLikeFile.ReadOptions baseOptions = IniLikeFile.ReadOptions(IniLikeFile.DuplicateGroupPolicy.skip);
-
-        alias baseOptions this;
-
-        /**
-         * Set policy about unknown groups. By default they are skipped without errors.
-         * Note that all groups still need to be preserved if desktop file must be rewritten.
-         */
-        UnknownGroupPolicy unknownGroupPolicy = UnknownGroupPolicy.skip;
-
-        /**
-         * Set policy about extension groups. By default they are all preserved.
-         * Set it to skip if you're not willing to support any extensions in your applications.
-         * Note that all groups still need to be preserved if desktop file must be rewritten.
-         */
-        ExtensionGroupPolicy extensionGroupPolicy = ExtensionGroupPolicy.preserve;
-
-        ///Setting parameters in any order, leaving not mentioned ones in default state.
-        @nogc @safe this(Args...)(Args args) nothrow pure {
-            foreach(arg; args) {
-                alias Unqual!(typeof(arg)) ArgType;
-                static if (is(ArgType == IniLikeFile.ReadOptions)) {
-                    baseOptions = arg;
-                } else static if (is(ArgType == UnknownGroupPolicy)) {
-                    unknownGroupPolicy = arg;
-                } else static if (is(ArgType == ExtensionGroupPolicy)) {
-                    extensionGroupPolicy = arg;
-                } else {
-                    baseOptions.assign(arg);
-                }
-            }
-        }
-
-        ///
-        unittest
-        {
-            IconThemeReadOptions options;
-
-            options = IconThemeReadOptions(
-                ExtensionGroupPolicy.skip,
-                UnknownGroupPolicy.preserve,
-                DuplicateKeyPolicy.skip,
-                DuplicateGroupPolicy.preserve,
-                No.preserveComments
-            );
-
-            assert(options.unknownGroupPolicy == UnknownGroupPolicy.preserve);
-            assert(options.extensionGroupPolicy == ExtensionGroupPolicy.skip);
-            assert(options.duplicateGroupPolicy == DuplicateGroupPolicy.preserve);
-            assert(options.duplicateKeyPolicy == DuplicateKeyPolicy.skip);
-            assert(!options.preserveComments);
-        }
-    }
-
-    ///
-    unittest
-    {
-        string contents =
-`[Icon Theme]
-Name=Theme
-[X-SomeGroup]
-Key=Value`;
-
-        alias IconThemeFile.IconThemeReadOptions IconThemeReadOptions;
-
-        auto iconTheme = new IconThemeFile(iniLikeStringReader(contents), IconThemeReadOptions(ExtensionGroupPolicy.skip));
-        assert(iconTheme.group("X-SomeGroup") is null);
-
-    contents =
-`[Icon Theme]
-Name=Theme
-[/invalid group]
-$=StrangeKey`;
-
-        iconTheme = new IconThemeFile(iniLikeStringReader(contents), IconThemeReadOptions(UnknownGroupPolicy.preserve, IniLikeGroup.InvalidKeyPolicy.save));
-        assert(iconTheme.group("/invalid group") !is null);
-        assert(iconTheme.group("/invalid group").value("$") == "StrangeKey");
-
-    contents =
-`[X-SomeGroup]
-Key=Value`;
-
-        auto thrown = collectException!IniLikeReadException(new IconThemeFile(iniLikeStringReader(contents)));
-        assert(thrown !is null);
-        assert(thrown.lineNumber == 0);
-
-        contents =
-`[Icon Theme]
-Valid=Key
-$=Invalid`;
-
-        assertThrown(new IconThemeFile(iniLikeStringReader(contents)));
-        assertNotThrown(new IconThemeFile(iniLikeStringReader(contents), IconThemeReadOptions(IniLikeGroup.InvalidKeyPolicy.skip)));
-
-        contents =
-`[Icon Theme]
-Name=Name
-[/invalidpath]
-Key=Value`;
-
-        assertThrown(new IconThemeFile(iniLikeStringReader(contents), IconThemeReadOptions(UnknownGroupPolicy.throwError)));
-        assertNotThrown(iconTheme = new IconThemeFile(iniLikeStringReader(contents), IconThemeReadOptions(UnknownGroupPolicy.preserve)));
-        assert(iconTheme.cachePath().empty);
-        assert(iconTheme.group("/invalidpath") !is null);
-    }
-
-protected:
-    @trusted static bool isDirectoryName(string groupName)
-    {
-        return groupName.pathSplitter.all!isValidFilename;
-    }
-
-    @trusted override IniLikeGroup createGroupByName(string groupName) {
-        if (groupName == "Icon Theme") {
-            _iconTheme = new IconThemeGroup();
-            return _iconTheme;
-        } else if (groupName.startsWith("X-")) {
-            if (_options.extensionGroupPolicy == ExtensionGroupPolicy.skip) {
-                return null;
-            } else {
-                return createEmptyGroup(groupName);
-            }
-        } else if (isDirectoryName(groupName)) {
-            return createEmptyGroup(groupName);
-        } else {
-            final switch(_options.unknownGroupPolicy) {
-                case UnknownGroupPolicy.skip:
-                    return null;
-                case UnknownGroupPolicy.preserve:
-                    return createEmptyGroup(groupName);
-                case UnknownGroupPolicy.throwError:
-                    throw new IniLikeException("Invalid group name: '" ~ groupName ~ "'. Must be valid relative path or start with 'X-'");
-            }
-        }
-    }
-public:
-    /**
-     * Reads icon theme from file.
-     * Throws:
-     *  $(B ErrnoException) if file could not be opened.
-     *  $(D inilike.file.IniLikeReadException) if error occured while reading the file.
-     */
-    @trusted this(string fileName, IconThemeReadOptions options = IconThemeReadOptions.init) {
-        this(iniLikeFileReader(fileName), options, fileName);
-    }
-
-    /**
-     * Reads icon theme file from range of IniLikeReader, e.g. acquired from iniLikeFileReader or iniLikeStringReader.
-     * Throws:
-     *  $(D inilike.file.IniLikeReadException) if error occured while parsing.
-     */
-    this(IniLikeReader)(IniLikeReader reader, IconThemeReadOptions options = IconThemeReadOptions.init, string fileName = null)
-    {
-        _options = options;
-        super(reader, fileName, options.baseOptions);
-        enforce(_iconTheme !is null, new IniLikeReadException("No \"Icon Theme\" group", 0));
-    }
-
-    ///ditto
-    this(IniLikeReader)(IniLikeReader reader, string fileName, IconThemeReadOptions options = IconThemeReadOptions.init)
-    {
-        this(reader, options, fileName);
-    }
-
-    /**
-     * Constructs IconThemeFile with empty "Icon Theme" group.
-     */
-    @safe this() {
-        super();
-        _iconTheme = new IconThemeGroup();
-    }
-
-    ///
-    unittest
-    {
-        auto itf = new IconThemeFile();
-        assert(itf.iconTheme());
-        assert(itf.directories().empty);
-    }
-
-    /**
-     * Removes group by name. This function will not remove "Icon Theme" group.
-     */
-    @safe override bool removeGroup(string groupName) nothrow {
-        if (groupName != "Icon Theme") {
-            return super.removeGroup(groupName);
-        }
-        return false;
-    }
-
-    /**
-     * The name of the subdirectory index.theme was loaded from.
-     * See_Also: $(D IconThemeGroup.displayName)
-     */
-    @trusted string internalName() const {
-        return fileName().absolutePath().dirName().baseName();
-    }
-
-    /**
-     * Some keys can have multiple values, separated by comma. This function helps to parse such kind of strings into the range.
-     * Returns: The range of multiple nonempty values.
-     * See_Also: $(D joinValues)
-     */
-    @trusted static auto splitValues(string values) {
-        return std.algorithm.splitter(values, ',').filter!(s => s.length != 0);
-    }
-
-    ///
-    unittest
-    {
-        assert(equal(IconThemeFile.splitValues("16x16/actions,16x16/animations,16x16/apps"), ["16x16/actions", "16x16/animations", "16x16/apps"]));
-        assert(IconThemeFile.splitValues(",").empty);
-        assert(IconThemeFile.splitValues("").empty);
-    }
-
-    /**
-     * Join range of multiple values into a string using comma as separator.
-     * If range is empty, then the empty string is returned.
-     * See_Also: $(D splitValues)
-     */
-    static string joinValues(Range)(Range values) if (isInputRange!Range && isSomeString!(ElementType!Range)) {
-        auto result = values.filter!( s => s.length != 0 ).joiner(",");
-        if (result.empty) {
-            return string.init;
-        } else {
-            return text(result);
-        }
-    }
-
-    ///
-    unittest
-    {
-        assert(equal(IconThemeFile.joinValues(["16x16/actions", "16x16/animations", "16x16/apps"]), "16x16/actions,16x16/animations,16x16/apps"));
-        assert(IconThemeFile.joinValues([""]).empty);
-    }
-
-    /**
-     * Iterating over subdirectories of icon theme.
-     * See_Also: $(D IconThemeGroup.directories)
-     */
-    @trusted auto bySubdir() const {
-        return directories().filter!(dir => group(dir) !is null).map!(dir => IconSubDir(group(dir))).array;
-    }
-
-    /**
-     * Icon Theme group in underlying file.
-     * Returns: Instance of "Icon Theme" group.
-     * Note: Usually you don't need to call this function since you can rely on alias this.
-     */
-    @nogc @safe inout(IconThemeGroup) iconTheme() nothrow inout {
-        return _iconTheme;
-    }
-
-    /**
-     * This alias allows to call functions related to "Icon Theme" group without need to call iconTheme explicitly.
-     */
-    alias iconTheme this;
-
-    /**
-     * Try to load icon cache. Loaded icon cache will be used on icon lookup.
-     * Returns: Loaded $(D icontheme.cache.IconThemeCache) object or null, if cache does not exist or invalid or outdated.
-     * Note: This function expects that icon theme has fileName.
-     * See_Also: $(D icontheme.cache.IconThemeCache), $(D icontheme.lookup.lookupIcon), $(D cache), $(D unloadCache), $(D cachePath)
-     */
-    @trusted auto tryLoadCache(Flag!"allowOutdated" allowOutdated = Flag!"allowOutdated".no) nothrow
-    {
-        string path = cachePath();
-
-        bool isOutdated = true;
-        collectException(IconThemeCache.isOutdated(path), isOutdated);
-
-        if (isOutdated && !allowOutdated) {
-            return null;
-        }
-
-        IconThemeCache myCache;
-        collectException(new IconThemeCache(path), myCache);
-
-        if (myCache !is null) {
-            _cache = myCache;
-        }
-        return myCache;
-    }
-
-    /**
-     * Unset loaded cache.
-     */
-    @nogc @safe void unloadCache() nothrow {
-        _cache = null;
-    }
-
-    /**
-     * Set cache object.
-     * See_Also: $(D tryLoadCache)
-     */
-    @nogc @safe IconThemeCache cache(IconThemeCache setCache) nothrow {
-        _cache = setCache;
-        return _cache;
-    }
-
-    /**
-     * The object of loaded cache.
-     * Returns: $(D icontheme.cache.IconThemeCache) object loaded via tryLoadCache or set by cache property.
-     */
-    @nogc @safe inout(IconThemeCache) cache() inout nothrow {
-        return _cache;
-    }
-
-    /**
-     * Path of icon theme cache file.
-     * Returns: Path to icon-theme.cache of corresponding cache file.
-     * Note: This function expects that icon theme has fileName. This function does not check if the cache file exists.
-     */
-    @trusted string cachePath() const nothrow {
-        auto f = fileName();
-        if (f.length) {
-            return buildPath(fileName().dirName, "icon-theme.cache");
-        } else {
-            return null;
-        }
-    }
-
-private:
-    IconThemeReadOptions _options;
-    IconThemeGroup _iconTheme;
-    IconThemeCache _cache;
-}
-
-///
-unittest
-{
-    string contents =
-`# First comment
-[Icon Theme]
-Name=Hicolor
-Name[ru]=Стандартная тема
-Comment=Fallback icon theme
-Comment[ru]=Резервная тема
-Hidden=true
-Directories=16x16/actions,32x32/animations,scalable/emblems
-Example=folder
-Inherits=gnome,hicolor
-
-[16x16/actions]
-Size=16
-Context=Actions
-Type=Threshold
-
-[32x32/animations]
-Size=32
-Context=Animations
-Type=Fixed
-
-[scalable/emblems]
-Context=Emblems
-Size=64
-MinSize=8
-MaxSize=512
-Type=Scalable
-
-# Will be saved.
-[X-NoName]
-Key=Value`;
-
-    string path = buildPath(".", "test", "Tango", "index.theme");
-
-    auto iconTheme = new IconThemeFile(iniLikeStringReader(contents), path);
-    assert(equal(iconTheme.leadingComments(), ["# First comment"]));
-    assert(iconTheme.displayName() == "Hicolor");
-    assert(iconTheme.localizedDisplayName("ru") == "Стандартная тема");
-    assert(iconTheme.comment() == "Fallback icon theme");
-    assert(iconTheme.localizedComment("ru") == "Резервная тема");
-    assert(iconTheme.hidden());
-    assert(equal(iconTheme.directories(), ["16x16/actions", "32x32/animations", "scalable/emblems"]));
-    assert(equal(iconTheme.inherits(), ["gnome", "hicolor"]));
-    assert(iconTheme.internalName() == "Tango");
-    assert(iconTheme.example() == "folder");
-    assert(iconTheme.group("X-NoName") !is null);
-
-    iconTheme.removeGroup("Icon Theme");
-    assert(iconTheme.group("Icon Theme") !is null);
-
-    assert(iconTheme.cachePath() == buildPath(".", "test", "Tango", "icon-theme.cache"));
-
-    assert(equal(iconTheme.bySubdir().map!(subdir => tuple(subdir.name(), subdir.size(), subdir.minSize(), subdir.maxSize(), subdir.context(), subdir.type() )),
-                 [tuple("16x16/actions", 16, 16, 16, "Actions", IconSubDir.Type.Threshold),
-                 tuple("32x32/animations", 32, 32, 32, "Animations", IconSubDir.Type.Fixed),
-                 tuple("scalable/emblems", 64, 8, 512, "Emblems", IconSubDir.Type.Scalable)]));
-
-    version(iconthemeFileTest)
-    {
-        string cachePath = iconTheme.cachePath();
-        assert(cachePath.exists);
-
-        auto cache = new IconThemeCache(cachePath);
-
-        assert(iconTheme.cache is null);
-        iconTheme.cache = cache;
-        assert(iconTheme.cache is cache);
-        iconTheme.unloadCache();
-        assert(iconTheme.cache is null);
-
-        assert(iconTheme.tryLoadCache(Flag!"allowOutdated".yes));
-    }
-
-    iconTheme.removeGroup("scalable/emblems");
-    assert(iconTheme.group("scalable/emblems") is null);
-
-    auto itf = new IconThemeFile();
-    itf.displayName = "Oxygen";
-    itf.comment = "Oxygen theme";
-    itf.hidden = true;
-    itf.directories = ["actions", "places"];
-    itf.inherits = ["locolor", "hicolor"];
-    assert(itf.displayName() == "Oxygen");
-    assert(itf.comment() == "Oxygen theme");
-    assert(itf.hidden());
-    assert(equal(itf.directories(), ["actions", "places"]));
-    assert(equal(itf.inherits(), ["locolor", "hicolor"]));
-}
diff --git a/3rdparty/icontheme/lookup.d b/3rdparty/icontheme/lookup.d
deleted file mode 100644
index 0c6e895c..00000000
--- a/3rdparty/icontheme/lookup.d
+++ /dev/null
@@ -1,735 +0,0 @@
-/**
- * Lookup of icon themes and icons.
- *
- * Note: All found icons are just paths. They are not verified to be valid images.
- *
- * Authors:
- *  $(LINK2 https://github.com/FreeSlave, Roman Chistokhodov)
- * Copyright:
- *  Roman Chistokhodov, 2015-2016
- * License:
- *  $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * See_Also:
- *  $(LINK2 http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html, Icon Theme Specification)
- */
-
-module icontheme.lookup;
-
-import icontheme.file;
-
-package {
-    import std.file;
-    import std.path;
-    import std.range;
-    import std.traits;
-    import std.typecons;
-}
-
-@trusted bool isDirNothrow(string dir) nothrow
-{
-    bool ok;
-    collectException(dir.isDir(), ok);
-    return ok;
-}
-
-@trusted bool isFileNothrow(string file) nothrow
-{
-    bool ok;
-    collectException(file.isFile(), ok);
-    return ok;
-}
-
-/**
- * Default icon extensions. This array includes .png and .xpm.
- * PNG is recommended format.
- * XPM is kept for backward compatibility.
- *
- * Note: Icon Theme Specificiation also lists .svg as possible format,
- * but it's less common to have SVG support for applications,
- * hence this format is defined as optional by specificiation.
- * If your application has proper support for SVG images,
- * array should include it in the first place as the most preferred format
- * because SVG images are scalable.
- */
-enum defaultIconExtensions = [".png", ".xpm"];
-
-/**
- * Find all icon themes in searchIconDirs.
- * Note:
- *  You may want to skip icon themes duplicates if there're different versions of the index.theme file for the same theme.
- * Returns:
- *  Range of paths to index.theme files represented icon themes.
- * Params:
- *  searchIconDirs = base icon directories to search icon themes.
- * See_Also: $(D icontheme.paths.baseIconDirs)
- */
-auto iconThemePaths(Range)(Range searchIconDirs)
-if(is(ElementType!Range : string))
-{
-    return searchIconDirs
-        .filter!(function(dir) {
-            bool ok;
-            collectException(dir.isDir, ok);
-            return ok;
-        }).map!(function(iconDir) {
-            return iconDir.dirEntries(SpanMode.shallow)
-                .map!(p => buildPath(p, "index.theme")).cache()
-                .filter!(isFileNothrow);
-        }).joiner;
-}
-
-///
-version(iconthemeFileTest) unittest
-{
-    auto paths = iconThemePaths(["test"]).array;
-    assert(paths.length == 3);
-    assert(paths.canFind(buildPath("test", "NewTango", "index.theme")));
-    assert(paths.canFind(buildPath("test", "Tango", "index.theme")));
-    assert(paths.canFind(buildPath("test", "hicolor", "index.theme")));
-}
-
-/**
- * Lookup index.theme files by theme name.
- * Params:
- *  themeName = theme name.
- *  searchIconDirs = base icon directories to search icon themes.
- * Returns:
- *  Range of paths to index.theme file corresponding to the given theme.
- * Note:
- *  Usually you want to use the only first found file.
- * See_Also: $(D icontheme.paths.baseIconDirs), $(D findIconTheme)
- */
-auto lookupIconTheme(Range)(string themeName, Range searchIconDirs)
-if(is(ElementType!Range : string))
-{
-    return searchIconDirs
-        .map!(dir => buildPath(dir, themeName, "index.theme")).cache()
-        .filter!(isFileNothrow);
-}
-
-/**
- * Find index.theme file by theme name.
- * Returns:
- *  Path to the first found index.theme file or null string if not found.
- * Params:
- *  themeName = Theme name.
- *  searchIconDirs = Base icon directories to search icon themes.
- * Returns:
- *  Path to the first found index.theme file corresponding to the given theme.
- * See_Also: $(D icontheme.paths.baseIconDirs), $(D lookupIconTheme)
- */
-auto findIconTheme(Range)(string themeName, Range searchIconDirs)
-{
-    auto paths = lookupIconTheme(themeName, searchIconDirs);
-    if (paths.empty) {
-        return null;
-    } else {
-        return paths.front;
-    }
-}
-
-/**
- * Find index.theme file for given theme and create instance of $(D icontheme.file.IconThemeFile). The first found file will be used.
- * Returns: $(D icontheme.file.IconThemeFile) object read from the first found index.theme file corresponding to given theme or null if none were found.
- * Params:
- *  themeName = theme name.
- *  searchIconDirs = base icon directories to search icon themes.
- *  options = options for $(D icontheme.file.IconThemeFile) reading.
- * Throws:
- *  $(B ErrnoException) if file could not be opened.
- *  $(B IniLikeException) if error occured while reading the file.
- * See_Also: $(D findIconTheme), $(D icontheme.paths.baseIconDirs)
- */
-IconThemeFile openIconTheme(Range)(string themeName,
-                                         Range searchIconDirs,
-                                         IconThemeFile.IconThemeReadOptions options = IconThemeFile.IconThemeReadOptions.init)
-{
-    auto path = findIconTheme(themeName, searchIconDirs);
-    return path.empty ? null : new IconThemeFile(to!string(path), options);
-}
-
-///
-version(iconthemeFileTest) unittest
-{
-    auto tango = openIconTheme("Tango", ["test"]);
-    assert(tango);
-    assert(tango.displayName() == "Tango");
-
-    auto hicolor = openIconTheme("hicolor", ["test"]);
-    assert(hicolor);
-    assert(hicolor.displayName() == "Hicolor");
-
-    assert(openIconTheme("Nonexistent", ["test"]) is null);
-}
-
-/**
- * Result of icon lookup.
- */
-struct IconSearchResult(IconTheme) if (is(IconTheme : const(IconThemeFile)))
-{
-    /**
-     * File path of found icon.
-     */
-    string filePath;
-    /**
-     * Subdirectory the found icon belongs to.
-     */
-    IconSubDir subdir;
-    /**
-     * $(D icontheme.file.IconThemeFile) the found icon belongs to.
-     */
-    IconTheme iconTheme;
-}
-
-/**
- * Lookup icon alternatives in icon themes. It uses icon theme cache wherever it's loaded. If searched icon is found in some icon theme all subsequent themes are ignored.
- *
- * This function may require many $(B stat) calls, so beware. Use subdirFilter to filter icons by $(D icontheme.file.IconSubDir) properties (e.g. by size or context) to decrease the number of searchable items and allocations. Loading $(D icontheme.cache.IconThemeCache) may also descrease the number of stats.
- *
- * Params:
- *  iconName = Icon name.
- *  iconThemes = Icon themes to search icon in.
- *  searchIconDirs = Case icon directories.
- *  extensions = Possible file extensions of needed icon file, in order of preference.
- *  sink = Output range accepting $(D IconSearchResult)s.
- *  reverse = Iterate over icon theme sub-directories in reverse way.
- *      Usually directories with larger icon size are listed the last,
- *      so this parameter may speed up the search when looking for the largest icon.
- * Note: Specification says that extension must be ".png", ".xpm" or ".svg", though SVG is not required to be supported. Some icon themes also contain .svgz images.
- * Example:
-----------
-lookupIcon!(subdir => subdir.context == "Places" && subdir.size >= 32)(
-    "folder", iconThemes, baseIconDirs(), [".png", ".xpm"],
-    delegate void (IconSearchResult!IconThemeFile item) {
-        writefln("Icon file: %s. Context: %s. Size: %s. Theme: %s", item.filePath, item.subdir.context, item.subdir.size, item.iconTheme.displayName);
-    });
-----------
- * See_Also: $(D icontheme.paths.baseIconDirs), $(D lookupFallbackIcon)
- */
-void lookupIcon(alias subdirFilter = (a => true), IconThemes, BaseDirs, Exts, OutputRange)(string iconName, IconThemes iconThemes, BaseDirs searchIconDirs, Exts extensions, OutputRange sink, Flag!"reverse" reverse = No.reverse)
-if (isInputRange!(IconThemes) && isForwardRange!(BaseDirs) && isForwardRange!(Exts) &&
-    is(ElementType!IconThemes : const(IconThemeFile)) && is(ElementType!BaseDirs : string) &&
-    is(ElementType!Exts : string) && isOutputRange!(OutputRange, IconSearchResult!(ElementType!IconThemes)))
-{
-    bool onExtensions(string themeBaseDir, IconSubDir subdir, ElementType!IconThemes iconTheme)
-    {
-        string subdirPath = buildPath(themeBaseDir, subdir.name);
-        if (!subdirPath.isDirNothrow) {
-            return false;
-        }
-        bool found;
-        foreach(extension; extensions) {
-            string path = buildPath(subdirPath, iconName ~ extension);
-            if (path.isFileNothrow) {
-                found = true;
-                put(sink, IconSearchResult!(ElementType!IconThemes)(path, subdir, iconTheme));
-            }
-        }
-        return found;
-    }
-
-    foreach(iconTheme; iconThemes) {
-        if (iconTheme is null || iconTheme.internalName().length == 0) {
-            continue;
-        }
-
-        string[] themeBaseDirs = searchIconDirs.map!(dir => buildPath(dir, iconTheme.internalName())).filter!(isDirNothrow).array;
-
-        bool found;
-
-        auto bySubdir = choose(reverse, iconTheme.bySubdir().retro(), iconTheme.bySubdir());
-        foreach(subdir; bySubdir) {
-            if (!subdirFilter(subdir)) {
-                continue;
-            }
-            foreach(themeBaseDir; themeBaseDirs) {
-                if (iconTheme.cache !is null && themeBaseDir == iconTheme.cache.fileName.dirName) {
-                    if (iconTheme.cache.containsIcon(iconName, subdir.name)) {
-                        found = onExtensions(themeBaseDir, subdir, iconTheme) || found;
-                    }
-                } else {
-                    found = onExtensions(themeBaseDir, subdir, iconTheme) || found;
-                }
-            }
-        }
-        if (found) {
-            return;
-        }
-    }
-}
-
-/**
- * Iterate over all icons in icon themes.
- * iconThemes is usually the range of the main theme and themes it inherits from.
- * Note: Usually if some icon was found in icon theme, it should be ignored in all subsequent themes, including sizes not presented in former theme.
- * Use subdirFilter to filter icons by $(D icontheme.file.IconSubDir) thus decreasing the number of searchable items and allocations.
- * Returns: Range of $(D IconSearchResult).
- * Params:
- *  iconThemes = icon themes to search icon in.
- *  searchIconDirs = base icon directories.
- *  extensions = possible file extensions for icon files.
- * Example:
--------------
-foreach(item; lookupThemeIcons!(subdir => subdir.context == "MimeTypes" && subdir.size >= 32)(iconThemes, baseIconDirs(), [".png", ".xpm"]))
-{
-    writefln("Icon file: %s. Context: %s. Size: %s", item.filePath, item.subdir.context, item.subdir.size);
-}
--------------
- * See_Also: $(D icontheme.paths.baseIconDirs), $(D lookupIcon), $(D openBaseThemes)
- */
-
-auto lookupThemeIcons(alias subdirFilter = (a => true), IconThemes, BaseDirs, Exts)(IconThemes iconThemes, BaseDirs searchIconDirs, Exts extensions)
-if (is(ElementType!IconThemes : const(IconThemeFile)) && is(ElementType!BaseDirs : string) && is (ElementType!Exts : string))
-{
-    return iconThemes.filter!(iconTheme => iconTheme !is null).map!(
-        iconTheme => iconTheme.bySubdir().filter!(subdirFilter).map!(
-            subdir => searchIconDirs.map!(
-                basePath => buildPath(basePath, iconTheme.internalName(), subdir.name)
-            ).filter!(isDirNothrow).map!(
-                subdirPath => subdirPath.dirEntries(SpanMode.shallow).filter!(
-                    filePath => filePath.isFileNothrow && extensions.canFind(filePath.extension)
-                ).map!(filePath => IconSearchResult!(ElementType!IconThemes)(filePath, subdir, iconTheme))
-            ).joiner
-        ).joiner
-    ).joiner;
-}
-
-/**
- * Iterate over all icons out of icon themes.
- * Returns: Range of found icon file paths.
- * Params:
- *  searchIconDirs = base icon directories.
- *  extensions = possible file extensions for icon files.
- * See_Also:
- *  $(D lookupFallbackIcon), $(D icontheme.paths.baseIconDirs)
- */
-auto lookupFallbackIcons(BaseDirs, Exts)(BaseDirs searchIconDirs, Exts extensions)
-if (isInputRange!(BaseDirs) && isForwardRange!(Exts) &&
-    is(ElementType!BaseDirs : string) && is(ElementType!Exts : string))
-{
-    return searchIconDirs.filter!(isDirNothrow).map!(basePath => basePath.dirEntries(SpanMode.shallow).filter!(
-        filePath => filePath.isFileNothrow && extensions.canFind(filePath.extension)
-    )).joiner;
-}
-
-/**
- * Lookup icon alternatives beyond the icon themes. May be used as fallback lookup, if lookupIcon returned empty range.
- * Returns: The range of found icon file paths.
- * Example:
-----------
-auto result = lookupFallbackIcon("folder", baseIconDirs(), [".png", ".xpm"]);
-----------
- * See_Also: $(D icontheme.paths.baseIconDirs), $(D lookupIcon), $(D lookupFallbackIcons)
- */
-auto lookupFallbackIcon(BaseDirs, Exts)(string iconName, BaseDirs searchIconDirs, Exts extensions)
-if (isInputRange!(BaseDirs) && isForwardRange!(Exts) &&
-    is(ElementType!BaseDirs : string) && is(ElementType!Exts : string))
-{
-    return searchIconDirs.map!(basePath =>
-        extensions
-            .map!(extension => buildPath(basePath, iconName ~ extension)).cache()
-            .filter!(isFileNothrow)
-    ).joiner;
-}
-
-/**
- * Find fallback icon outside of icon themes. The first found is returned.
- * See_Also: $(D lookupFallbackIcon), $(D icontheme.paths.baseIconDirs)
- */
-string findFallbackIcon(BaseDirs, Exts)(string iconName, BaseDirs searchIconDirs, Exts extensions)
-{
-    auto r = lookupFallbackIcon(iconName, searchIconDirs, extensions);
-    if (r.empty) {
-        return null;
-    } else {
-        return r.front;
-    }
-}
-
-///
-version(iconthemeFileTest) unittest
-{
-    assert(findFallbackIcon("pidgin", ["test"], defaultIconExtensions) == buildPath("test", "pidgin.png"));
-    assert(findFallbackIcon("nonexistent", ["test"], defaultIconExtensions).empty);
-}
-
-/**
- * Find icon closest of the size. It uses icon theme cache wherever possible. The first perfect match is used.
- * Params:
- *  iconName = Name of icon to search as defined by Icon Theme Specification (i.e. without path and extension parts).
- *  size = Preferred icon size to get.
- *  iconThemes = Range of $(D icontheme.file.IconThemeFile) objects.
- *  searchIconDirs = Base icon directories.
- *  extensions = Allowed file extensions.
- *  allowFallback = Allow searching for non-themed fallback if could not find icon in themes (non-themed icon can be any size).
- * Returns: Icon file path or empty string if not found.
- * Note: If icon of some size was found in the icon theme, this algorithm does not check following themes, even if they contain icons with closer size. Therefore the icon found in the more preferred theme always has presedence over icons from other themes.
- * See_Also: $(D icontheme.paths.baseIconDirs), $(D lookupIcon), $(D findFallbackIcon), $(D iconSizeDistance)
- */
-string findClosestIcon(alias subdirFilter = (a => true), IconThemes, BaseDirs, Exts)(string iconName, uint size, IconThemes iconThemes, BaseDirs searchIconDirs, Exts extensions, Flag!"allowFallbackIcon" allowFallback = Yes.allowFallbackIcon)
-{
-    uint minDistance = uint.max;
-    string closest;
-
-    lookupIcon!(delegate bool(const(IconSubDir) subdir) {
-        return minDistance != 0 && subdirFilter(subdir) && iconSizeDistance(subdir, size) <= minDistance;
-    })(iconName, iconThemes, searchIconDirs, extensions, delegate void(IconSearchResult!(ElementType!IconThemes) t) {
-        auto path = t.filePath;
-        auto subdir = t.subdir;
-        auto theme = t.iconTheme;
-
-        uint distance = iconSizeDistance(subdir, size);
-        if (distance < minDistance) {
-            minDistance = distance;
-            closest = path;
-        }
-    });
-
-    if (closest.empty && allowFallback) {
-        return findFallbackIcon(iconName, searchIconDirs, extensions);
-    } else {
-        return closest;
-    }
-}
-
-///
-version(iconthemeFileTest) unittest
-{
-    auto baseDirs = ["test"];
-    auto iconThemes = [openIconTheme("Tango", baseDirs), openIconTheme("hicolor", baseDirs)];
-
-    string found;
-
-    //exact match
-    found = findClosestIcon("folder", 32, iconThemes, baseDirs);
-    assert(found == buildPath("test", "Tango", "32x32/places", "folder.png"));
-
-    found = findClosestIcon("folder", 24, iconThemes, baseDirs);
-    assert(found == buildPath("test", "Tango", "24x24/devices", "folder.png"));
-
-    found = findClosestIcon!(subdir => subdir.context == "Places")("folder", 32, iconThemes, baseDirs);
-    assert(found == buildPath("test", "Tango", "32x32/places", "folder.png"));
-
-    found = findClosestIcon!(subdir => subdir.context == "Places")("folder", 24, iconThemes, baseDirs);
-    assert(found == buildPath("test", "Tango", "32x32/places", "folder.png"));
-
-    found = findClosestIcon!(subdir => subdir.context == "MimeTypes")("folder", 32, iconThemes, baseDirs);
-    assert(found.empty);
-
-    //hicolor has exact match, but Tango is more preferred.
-    found = findClosestIcon("folder", 64, iconThemes, baseDirs);
-    assert(found == buildPath("test", "Tango", "32x32/places", "folder.png"));
-
-    //find xpm
-    found = findClosestIcon("folder", 32, iconThemes, baseDirs, [".xpm"]);
-    assert(found == buildPath("test", "Tango", "32x32/places", "folder.xpm"));
-
-    //find big png, not exact match
-    found = findClosestIcon("folder", 200, iconThemes, baseDirs);
-    assert(found == buildPath("test", "Tango", "128x128/places", "folder.png"));
-
-    //svg is closer
-    found = findClosestIcon("folder", 200, iconThemes, baseDirs, [".png", ".svg"]);
-    assert(found == buildPath("test", "Tango", "scalable/places", "folder.svg"));
-
-    //lookup with fallback
-    found = findClosestIcon("pidgin", 96, iconThemes, baseDirs);
-    assert(found == buildPath("test", "pidgin.png"));
-
-    //lookup without fallback
-    found = findClosestIcon("pidgin", 96, iconThemes, baseDirs, defaultIconExtensions, No.allowFallbackIcon);
-    assert(found.empty);
-
-    found = findClosestIcon("text-plain", 48, iconThemes, baseDirs);
-    assert(found == buildPath("test", "hicolor", "48x48/mimetypes", "text-plain.png"));
-
-    found = findClosestIcon!(subdir => subdir.context == "MimeTypes")("text-plain", 48, iconThemes, baseDirs);
-    assert(found == buildPath("test", "hicolor", "48x48/mimetypes", "text-plain.png"));
-
-    found = findClosestIcon!(subdir => subdir.context == "Actions")("text-plain", 48, iconThemes, baseDirs);
-    assert(found.empty);
-}
-
-/**
- * ditto, but with predefined extensions and fallback allowed.
- * See_Also: $(D defaultIconExtensions)
- */
-string findClosestIcon(alias subdirFilter = (a => true), IconThemes, BaseDirs)(string iconName, uint size, IconThemes iconThemes, BaseDirs searchIconDirs)
-{
-    return findClosestIcon!subdirFilter(iconName, size, iconThemes, searchIconDirs, defaultIconExtensions);
-}
-
-/**
- * Find icon of the largest size. It uses icon theme cache wherever possible.
- * Params:
- *  iconName = Name of icon to search as defined by Icon Theme Specification (i.e. without path and extension parts).
- *  iconThemes = Range of $(D icontheme.file.IconThemeFile) objects.
- *  searchIconDirs = Base icon directories.
- *  extensions = Allowed file extensions.
- *  allowFallback = Allow searching for non-themed fallback if could not find icon in themes.
- * Returns: Icon file path or empty string if not found.
- * Note: If icon of some size was found in the icon theme, this algorithm does not check following themes, even if they contain icons with larger size. Therefore the icon found in the most preferred theme always has presedence over icons from other themes.
- * See_Also: $(D icontheme.paths.baseIconDirs), $(D lookupIcon), $(D findFallbackIcon)
- */
-string findLargestIcon(alias subdirFilter = (a => true), IconThemes, BaseDirs, Exts)(string iconName, IconThemes iconThemes, BaseDirs searchIconDirs, Exts extensions, Flag!"allowFallbackIcon" allowFallback = Yes.allowFallbackIcon)
-{
-    uint max = 0;
-    string largest;
-
-    lookupIcon!(delegate bool(const(IconSubDir) subdir) {
-        return subdirFilter(subdir) && subdir.size() >= max;
-    })(iconName, iconThemes, searchIconDirs, extensions, delegate void(IconSearchResult!(ElementType!IconThemes) t) {
-        auto path = t.filePath;
-        auto subdir = t.subdir;
-        auto theme = t.iconTheme;
-
-        if (subdir.size() > max) {
-            max = subdir.size();
-            largest = path;
-        }
-    }, Yes.reverse);
-
-    if (largest.empty && allowFallback) {
-        return findFallbackIcon(iconName, searchIconDirs, extensions);
-    } else {
-        return largest;
-    }
-}
-
-///
-version(iconthemeFileTest) unittest
-{
-    auto baseDirs = ["test"];
-    auto iconThemes = [openIconTheme("Tango", baseDirs), openIconTheme("hicolor", baseDirs)];
-
-    string found;
-
-    found = findLargestIcon("folder", iconThemes, baseDirs);
-    assert(found == buildPath("test", "Tango", "128x128/places", "folder.png"));
-
-    found = findLargestIcon("desktop", iconThemes, baseDirs);
-    assert(found == buildPath("test", "Tango", "32x32/places", "desktop.png"));
-
-    found = findLargestIcon("desktop", iconThemes, baseDirs, [".svg", ".png"]);
-    assert(found == buildPath("test", "Tango", "scalable/places", "desktop.svg"));
-
-    //lookup with fallback
-    found = findLargestIcon("pidgin", iconThemes, baseDirs);
-    assert(found == buildPath("test", "pidgin.png"));
-
-    //lookup without fallback
-    found = findLargestIcon("pidgin", iconThemes, baseDirs, defaultIconExtensions, No.allowFallbackIcon);
-    assert(found.empty);
-}
-
-/**
- * ditto, but with predefined extensions and fallback allowed.
- * See_Also: $(D defaultIconExtensions)
- */
-string findLargestIcon(alias subdirFilter = (a => true), IconThemes, BaseDirs)(string iconName, IconThemes iconThemes, BaseDirs searchIconDirs)
-{
-    return findLargestIcon!subdirFilter(iconName, iconThemes, searchIconDirs, defaultIconExtensions);
-}
-
-/**
- * Distance between desired size and minimum or maximum size value supported by icon theme subdirectory.
- */
-@nogc @safe uint iconSizeDistance(in IconSubDir subdir, uint matchSize) nothrow pure
-{
-    const uint size = subdir.size();
-    const uint minSize = subdir.minSize();
-    const uint maxSize = subdir.maxSize();
-    const uint threshold = subdir.threshold();
-
-    final switch(subdir.type()) {
-        case IconSubDir.Type.Fixed:
-        {
-            if (size > matchSize) {
-                return size - matchSize;
-            } else if (size < matchSize) {
-                return matchSize - size;
-            } else {
-                return 0;
-            }
-        }
-        case IconSubDir.Type.Scalable:
-        {
-            if (matchSize < minSize) {
-                return minSize - matchSize;
-            } else if (matchSize > maxSize) {
-                return matchSize - maxSize;
-            } else {
-                return 0;
-            }
-        }
-        case IconSubDir.Type.Threshold:
-        {
-            if (matchSize < size - threshold) {
-                return (size - threshold) - matchSize;
-            } else if (matchSize > size + threshold) {
-                return matchSize - (size + threshold);
-            } else {
-                return 0;
-            }
-        }
-    }
-}
-
-///
-unittest
-{
-    auto fixed = IconSubDir(32, IconSubDir.Type.Fixed);
-    assert(iconSizeDistance(fixed, fixed.size()) == 0);
-    assert(iconSizeDistance(fixed, 30) == 2);
-    assert(iconSizeDistance(fixed, 35) == 3);
-
-    auto threshold = IconSubDir(32, IconSubDir.Type.Threshold, "", 0, 0, 5);
-    assert(iconSizeDistance(threshold, threshold.size()) == 0);
-    assert(iconSizeDistance(threshold, threshold.size() - threshold.threshold()) == 0);
-    assert(iconSizeDistance(threshold, threshold.size() + threshold.threshold()) == 0);
-    assert(iconSizeDistance(threshold, 26) == 1);
-    assert(iconSizeDistance(threshold, 39) == 2);
-
-    auto scalable = IconSubDir(32, IconSubDir.Type.Scalable, "", 24, 48);
-    assert(iconSizeDistance(scalable, scalable.size()) == 0);
-    assert(iconSizeDistance(scalable, scalable.minSize()) == 0);
-    assert(iconSizeDistance(scalable, scalable.maxSize()) == 0);
-    assert(iconSizeDistance(scalable, 20) == 4);
-    assert(iconSizeDistance(scalable, 50) == 2);
-}
-
-/**
- * Check if matchSize belongs to subdir's size range.
- */
-@nogc @safe bool matchIconSize(in IconSubDir subdir, uint matchSize) nothrow pure
-{
-    const uint size = subdir.size();
-    const uint minSize = subdir.minSize();
-    const uint maxSize = subdir.maxSize();
-    const uint threshold = subdir.threshold();
-
-    final switch(subdir.type()) {
-        case IconSubDir.Type.Fixed:
-            return size == matchSize;
-        case IconSubDir.Type.Threshold:
-            return matchSize <= (size + threshold) && matchSize >= (size - threshold);
-        case IconSubDir.Type.Scalable:
-            return matchSize >= minSize && matchSize <= maxSize;
-    }
-}
-
-///
-unittest
-{
-    auto fixed = IconSubDir(32, IconSubDir.Type.Fixed);
-    assert(matchIconSize(fixed, fixed.size()));
-    assert(!matchIconSize(fixed, fixed.size() - 2));
-
-    auto threshold = IconSubDir(32, IconSubDir.Type.Threshold, "", 0, 0, 5);
-    assert(matchIconSize(threshold, threshold.size() + threshold.threshold()));
-    assert(matchIconSize(threshold, threshold.size() - threshold.threshold()));
-    assert(!matchIconSize(threshold, threshold.size() + threshold.threshold() + 1));
-    assert(!matchIconSize(threshold, threshold.size() - threshold.threshold() - 1));
-
-    auto scalable = IconSubDir(32, IconSubDir.Type.Scalable, "", 24, 48);
-    assert(matchIconSize(scalable, scalable.minSize()));
-    assert(matchIconSize(scalable, scalable.maxSize()));
-    assert(!matchIconSize(scalable, scalable.minSize() - 1));
-    assert(!matchIconSize(scalable, scalable.maxSize() + 1));
-}
-
-/**
- * Find icon closest to the given size among given alternatives.
- * Params:
- *  alternatives = range of $(D IconSearchResult)s, usually returned by $(D lookupIcon).
- *  matchSize = desired size of icon.
- */
-string matchBestIcon(Range)(Range alternatives, uint matchSize)
-{
-    uint minDistance = uint.max;
-    string closest;
-
-    foreach(t; alternatives) {
-        auto path = t[0];
-        auto subdir = t[1];
-        uint distance = iconSizeDistance(subdir, matchSize);
-        if (distance < minDistance) {
-            minDistance = distance;
-            closest = path;
-        }
-        if (minDistance == 0) {
-            return closest;
-        }
-    }
-
-    return closest;
-}
-
-private void openBaseThemesHelper(Range)(ref IconThemeFile[] themes, IconThemeFile iconTheme,
-                                      Range searchIconDirs,
-                                      IconThemeFile.IconThemeReadOptions options)
-{
-    foreach(name; iconTheme.inherits()) {
-        if (!themes.canFind!(function(theme, name) {
-            return theme.internalName == name;
-        })(name)) {
-            try {
-                IconThemeFile f = openIconTheme(name, searchIconDirs, options);
-                if (f) {
-                    themes ~= f;
-                    openBaseThemesHelper(themes, f, searchIconDirs, options);
-                }
-            } catch(Exception e) {
-
-            }
-        }
-    }
-}
-
-/**
- * Recursively find all themes the given theme is inherited from.
- * Params:
- *  iconTheme = Original icon theme to search for its base themes. Included as first element in resulting array.
- *  searchIconDirs = Base icon directories to search icon themes.
- *  fallbackThemeName = Name of fallback theme which is loaded the last. Not used if empty. It's NOT loaded twice if some theme in inheritance tree has it as base theme.
- *  options = Options for $(D icontheme.file.IconThemeFile) reading.
- * Returns:
- *  Array of unique $(D icontheme.file.IconThemeFile) objects represented base themes.
- */
-IconThemeFile[] openBaseThemes(Range)(IconThemeFile iconTheme,
-                                      Range searchIconDirs,
-                                      string fallbackThemeName = "hicolor",
-                                      IconThemeFile.IconThemeReadOptions options = IconThemeFile.IconThemeReadOptions.init)
-if(isForwardRange!Range && is(ElementType!Range : string))
-{
-    IconThemeFile[] themes;
-    openBaseThemesHelper(themes, iconTheme, searchIconDirs, options);
-
-    if (fallbackThemeName.length) {
-        auto fallbackFound = themes.filter!(theme => theme !is null).find!(theme => theme.internalName == fallbackThemeName);
-        if (fallbackFound.empty) {
-            IconThemeFile fallbackTheme;
-            collectException(openIconTheme(fallbackThemeName, searchIconDirs, options), fallbackTheme);
-            if (fallbackTheme) {
-                themes ~= fallbackTheme;
-            }
-        }
-    }
-
-    return themes;
-}
-
-///
-version(iconthemeFileTest) unittest
-{
-    auto tango = openIconTheme("NewTango", ["test"]);
-    auto baseThemes = openBaseThemes(tango, ["test"]);
-
-    assert(baseThemes.length == 2);
-    assert(baseThemes[0].internalName() == "Tango");
-    assert(baseThemes[1].internalName() == "hicolor");
-
-    baseThemes = openBaseThemes(tango, ["test"], null);
-    assert(baseThemes.length == 1);
-    assert(baseThemes[0].internalName() == "Tango");
-}
diff --git a/3rdparty/icontheme/package.d b/3rdparty/icontheme/package.d
deleted file mode 100644
index a6d6b062..00000000
--- a/3rdparty/icontheme/package.d
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Icon Theme Specification implementation.
- *
- * Authors:
- *  $(LINK2 https://github.com/FreeSlave, Roman Chistokhodov)
- * Copyright:
- *  Roman Chistokhodov, 2015-2016
- * License:
- *  $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * See_Also:
- *  $(LINK2 http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html, Icon Theme Specification)
- */
-
-module icontheme;
-
-public import icontheme.file;
-public import icontheme.lookup;
-public import icontheme.cache;
-public import icontheme.paths;
diff --git a/3rdparty/icontheme/paths.d b/3rdparty/icontheme/paths.d
deleted file mode 100644
index d71fb744..00000000
--- a/3rdparty/icontheme/paths.d
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * Getting paths where icon themes and icons are stored.
- *
- * Authors:
- *  $(LINK2 https://github.com/FreeSlave, Roman Chistokhodov)
- * Copyright:
- *  Roman Chistokhodov, 2015-2017
- * License:
- *  $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * See_Also:
- *  $(LINK2 http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html, Icon Theme Specification)
- */
-
-module icontheme.paths;
-
-private {
-    import std.algorithm;
-    import std.array;
-    import std.exception;
-    import std.path;
-    import std.range;
-    import std.traits;
-    import std.process : environment;
-    import isfreedesktop;
-}
-
-version(unittest) {
-    package struct EnvGuard
-    {
-        this(string env) {
-            envVar = env;
-            envValue = environment.get(env);
-        }
-
-        ~this() {
-            if (envValue is null) {
-                environment.remove(envVar);
-            } else {
-                environment[envVar] = envValue;
-            }
-        }
-
-        string envVar;
-        string envValue;
-    }
-}
-
-
-static if (isFreedesktop) {
-    import xdgpaths;
-
-    /**
-    * The list of base directories where icon thems should be looked for as described in $(LINK2 http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#directory_layout, Icon Theme Specification).
-    *
-    * $(BLUE This function is Freedesktop only).
-    * Note: This function does not provide any caching of its results. This function does not check if directories exist.
-    */
-    @safe string[] baseIconDirs() nothrow
-    {
-        string[] toReturn;
-        string homePath;
-        collectException(environment.get("HOME"), homePath);
-        if (homePath.length) {
-            toReturn ~= buildPath(homePath, ".icons");
-        }
-        toReturn ~= xdgAllDataDirs("icons");
-        toReturn ~= "/usr/share/pixmaps";
-        return toReturn;
-    }
-
-    ///
-    unittest
-    {
-        auto homeGuard = EnvGuard("HOME");
-        auto dataHomeGuard = EnvGuard("XDG_DATA_HOME");
-        auto dataDirsGuard = EnvGuard("XDG_DATA_DIRS");
-
-        environment["HOME"] = "/home/user";
-        environment["XDG_DATA_HOME"] = "/home/user/data";
-        environment["XDG_DATA_DIRS"] = "/usr/local/data:/usr/data";
-
-        assert(baseIconDirs() == ["/home/user/.icons", "/home/user/data/icons", "/usr/local/data/icons", "/usr/data/icons", "/usr/share/pixmaps"]);
-    }
-
-    /**
-     * Writable base icon path. Depends on XDG_DATA_HOME, so this is $HOME/.local/share/icons rather than $HOME/.icons
-     *
-     * $(BLUE This function is Freedesktop only).
-     * Note: it does not check if returned path exists and appears to be directory.
-     */
-    @safe string writableIconsPath() nothrow {
-        return xdgDataHome("icons");
-    }
-
-    ///
-    unittest
-    {
-        auto dataHomeGuard = EnvGuard("XDG_DATA_HOME");
-        environment["XDG_DATA_HOME"] = "/home/user/data";
-        assert(writableIconsPath() == "/home/user/data/icons");
-    }
-
-    ///
-    enum IconThemeNameDetector
-    {
-        none = 0,
-        fallback = 1, /// Use hardcoded fallback to detect icon theme name depending on the current desktop environment. Has lower priority than other methods.
-        gtk2 = 2, /// Use gtk2 settings to detect icon theme name. Has lower priority than gtk3.
-        gtk3 = 4, /// Use gtk3 settings to detect icon theme name.
-        automatic =  fallback | gtk2 | gtk3 /// Use all known means to detect icon theme name.
-    }
-    /**
-    * Try to detect the current icon name configured by user.
-    *
-    * $(BLUE This function is Freedesktop only).
-    * Note: There's no any specification on that so some heuristics are applied.
-    * Another note: It does not check if the icon theme with the detected name really exists on the file system.
-    */
-    @safe string currentIconThemeName(IconThemeNameDetector detector = IconThemeNameDetector.automatic) nothrow
-    {
-        @trusted static string fallbackIconThemeName()
-        {
-            string xdgCurrentDesktop = environment.get("XDG_CURRENT_DESKTOP");
-            switch(xdgCurrentDesktop) {
-                case "GNOME":
-                case "X-Cinnamon":
-                case "MATE":
-                    return "gnome";
-                case "LXDE":
-                    return "Adwaita";
-                case "XFCE":
-                    return "Tango";
-                case "KDE":
-                    return "oxygen"; //TODO: detect KDE version and set breeze if it's KDE5
-                default:
-                    return "Tango";
-            }
-        }
-        @trusted static string gtk2IconThemeName() nothrow
-        {
-            import std.stdio : File;
-            try {
-                auto home = environment.get("HOME");
-                if (!home.length) {
-                    return null;
-                }
-                string themeName;
-                auto gtkConfig = buildPath(home, ".gtkrc-2.0");
-                auto f = File(gtkConfig, "r");
-                foreach(line; f.byLine()) {
-                    auto splitted = line.findSplit("=");
-                    if (splitted[0] == "gtk-icon-theme-name") {
-                        if (splitted[2].length > 2 && splitted[2][0] == '"' && splitted[2][$-1] == '"') {
-                            return splitted[2][1..$-1].idup;
-                        }
-                        break;
-                    }
-                }
-            } catch(Exception e) {
-
-            }
-            return null;
-        }
-        @trusted static string gtk3IconThemeName() nothrow
-        {
-            import inilike.file;
-            try {
-                auto f = new IniLikeFile(xdgConfigHome("gtk-3.0/settings.ini"), IniLikeFile.ReadOptions(No.preserveComments));
-                auto settings = f.group("Settings");
-                if (settings)
-                    return settings.readEntry("gtk-icon-theme-name");
-            } catch(Exception e) {
-
-            }
-            return null;
-        }
-
-        try {
-            string themeName;
-            if (detector & IconThemeNameDetector.gtk3) {
-                themeName = gtk3IconThemeName();
-            }
-            if (!themeName.length && (detector & IconThemeNameDetector.gtk2)) {
-                themeName = gtk2IconThemeName();
-            }
-            if (!themeName.length && (detector & IconThemeNameDetector.fallback)) {
-                themeName = fallbackIconThemeName();
-            }
-            return themeName;
-        } catch(Exception e) {
-
-        }
-        return null;
-    }
-
-    unittest
-    {
-        auto desktopGuard = EnvGuard("XDG_CURRENT_DESKTOP");
-        environment["XDG_CURRENT_DESKTOP"] = "";
-        assert(currentIconThemeName(IconThemeNameDetector.fallback).length);
-        assert(currentIconThemeName(IconThemeNameDetector.none).length == 0);
-
-        version(iconthemeFileTest)
-        {
-            auto homeGuard = EnvGuard("HOME");
-            environment["HOME"] = "./test";
-
-            auto configGuard = EnvGuard("XDG_CONFIG_HOME");
-            environment["XDG_CONFIG_HOME"] = "./test";
-
-            assert(currentIconThemeName() == "gnome");
-            assert(currentIconThemeName(IconThemeNameDetector.gtk3) == "gnome");
-            assert(currentIconThemeName(IconThemeNameDetector.gtk2) == "oxygen");
-        }
-    }
-}
-
-/**
- * The list of icon theme directories based on data paths.
- * Returns: Array of paths with "icons" subdirectory appended to each data path.
- * Note: This function does not check if directories exist.
- */
-@trusted string[] baseIconDirs(Range)(Range dataPaths) if (isInputRange!Range && is(ElementType!Range : string))
-{
-    return dataPaths.map!(p => buildPath(p, "icons")).array;
-}
-
-///
-unittest
-{
-    auto dataPaths = ["share", buildPath("local", "share")];
-    assert(equal(baseIconDirs(dataPaths), [buildPath("share", "icons"), buildPath("local", "share", "icons")]));
-}
diff --git a/3rdparty/inilike/common.d b/3rdparty/inilike/common.d
deleted file mode 100644
index 79370531..00000000
--- a/3rdparty/inilike/common.d
+++ /dev/null
@@ -1,617 +0,0 @@
-/**
- * Common functions for dealing with entries in ini-like file.
- * Authors:
- *  $(LINK2 https://github.com/FreeSlave, Roman Chistokhodov)
- * Copyright:
- *  Roman Chistokhodov, 2015-2016
- * License:
- *  $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * See_Also:
- *  $(LINK2 http://standards.freedesktop.org/desktop-entry-spec/latest/index.html, Desktop Entry Specification)
- */
-
-module inilike.common;
-
-package {
-    import std.algorithm;
-    import std.range;
-    import std.string;
-    import std.traits;
-    import std.typecons;
-    import std.conv : to;
-
-    static if( __VERSION__ < 2066 ) enum nogc = 1;
-
-    auto keyValueTuple(String)(String key, String value)
-    {
-        alias KeyValueTuple = Tuple!(String, "key", String, "value");
-        return KeyValueTuple(key, value);
-    }
-}
-
-private @nogc @safe auto simpleStripLeft(inout(char)[] s) pure nothrow
-{
-    size_t spaceNum = 0;
-    while(spaceNum < s.length) {
-        const char c = s[spaceNum];
-        if (c == ' ' || c == '\t') {
-            spaceNum++;
-        } else {
-            break;
-        }
-    }
-    return s[spaceNum..$];
-}
-
-private @nogc @safe auto simpleStripRight(inout(char)[] s) pure nothrow
-{
-    size_t spaceNum = 0;
-    while(spaceNum < s.length) {
-        const char c = s[$-1-spaceNum];
-        if (c == ' ' || c == '\t') {
-            spaceNum++;
-        } else {
-            break;
-        }
-    }
-
-    return s[0..$-spaceNum];
-}
-
-
-/**
- * Test whether the string s represents a comment.
- */
-@nogc @safe bool isComment(const(char)[] s) pure nothrow
-{
-    s = s.simpleStripLeft;
-    return !s.empty && s[0] == '#';
-}
-
-///
-unittest
-{
-    assert( isComment("# Comment"));
-    assert( isComment("   # Comment"));
-    assert(!isComment("Not comment"));
-    assert(!isComment(""));
-}
-
-/**
- * Test whether the string s represents a group header.
- * Note: "[]" is not considered as valid group header.
- */
-@nogc @safe bool isGroupHeader(const(char)[] s) pure nothrow
-{
-    s = s.simpleStripRight;
-    return s.length > 2 && s[0] == '[' && s[$-1] == ']';
-}
-
-///
-unittest
-{
-    assert( isGroupHeader("[Group]"));
-    assert( isGroupHeader("[Group]    "));
-    assert(!isGroupHeader("[]"));
-    assert(!isGroupHeader("[Group"));
-    assert(!isGroupHeader("Group]"));
-}
-
-/**
- * Retrieve group name from header entry.
- * Returns: group name or empty string if the entry is not group header.
- */
-
-@nogc @safe auto parseGroupHeader(inout(char)[] s) pure nothrow
-{
-    s = s.simpleStripRight;
-    if (isGroupHeader(s)) {
-        return s[1..$-1];
-    } else {
-        return null;
-    }
-}
-
-///
-unittest
-{
-    assert(parseGroupHeader("[Group name]") == "Group name");
-    assert(parseGroupHeader("NotGroupName") == string.init);
-
-    assert(parseGroupHeader("[Group name]".dup) == "Group name".dup);
-}
-
-/**
- * Parse entry of kind Key=Value into pair of Key and Value.
- * Returns: tuple of key and value strings or tuple of empty strings if it's is not a key-value entry.
- * Note: this function does not check whether parsed key is valid key.
- */
-@nogc @trusted auto parseKeyValue(String)(String s) pure nothrow if (isSomeString!String && is(ElementEncodingType!String : char))
-{
-    auto t = s.findSplit("=");
-    auto key = t[0];
-    auto value = t[2];
-
-    if (key.length && t[1].length) {
-        return keyValueTuple(key, value);
-    }
-    return keyValueTuple(String.init, String.init);
-}
-
-///
-unittest
-{
-    assert(parseKeyValue("Key=Value") == tuple("Key", "Value"));
-    assert(parseKeyValue("Key=") == tuple("Key", string.init));
-    assert(parseKeyValue("=Value") == tuple(string.init, string.init));
-    assert(parseKeyValue("NotKeyValue") == tuple(string.init, string.init));
-
-    assert(parseKeyValue("Key=Value".dup) == tuple("Key".dup, "Value".dup));
-}
-
-private @nogc @safe bool simpleCanFind(in char[] str, char c) pure nothrow
-{
-    for (size_t i=0; i<str.length; ++i) {
-        if (str[i] == c) {
-            return true;
-        }
-    }
-    return false;
-}
-
-/**
- * Test whether the string is valid key, i.e. does not need escaping, is not a comment and not empty string.
- */
-@nogc @safe bool isValidKey(in char[] key) pure nothrow
-{
-    if (key.empty || key.simpleStripLeft.simpleStripRight.empty) {
-        return false;
-    }
-    if (key.isComment || key.simpleCanFind('=') || key.needEscaping()) {
-        return false;
-    }
-    return true;
-}
-
-///
-unittest
-{
-    assert(isValidKey("Valid key"));
-    assert(!isValidKey(""));
-    assert(!isValidKey("    "));
-    assert(!isValidKey("Sneaky\nKey"));
-    assert(!isValidKey("# Sneaky key"));
-    assert(!isValidKey("Sneaky=key"));
-}
-
-/**
-* Test whether the string is valid key in terms of Desktop File Specification.
-*
-* Not actually used in $(D inilike.file.IniLikeFile), but can be used in derivatives.
-* Only the characters A-Za-z0-9- may be used in key names.
-* Note: this function automatically separate key from locale. Locale is validated against isValidKey.
-* See_Also: $(LINK2 http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s02.html, Basic format of the file), $(D isValidKey)
-*/
-@nogc @safe bool isValidDesktopFileKey(in char[] desktopKey) pure nothrow {
-    auto t = separateFromLocale(desktopKey);
-    auto key = t[0];
-    auto locale = t[1];
-
-    if (locale.length && !isValidKey(locale)) {
-        return false;
-    }
-
-    @nogc @safe static bool isValidDesktopFileKeyChar(char c) pure nothrow {
-        return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-';
-    }
-
-    if (key.empty) {
-        return false;
-    }
-    for (size_t i = 0; i<key.length; ++i) {
-        if (!isValidDesktopFileKeyChar(key[i])) {
-            return false;
-        }
-    }
-    return true;
-}
-
-///
-unittest
-{
-    assert(isValidDesktopFileKey("Generic-Name"));
-    assert(isValidDesktopFileKey("Generic-Name[ru_RU]"));
-    assert(!isValidDesktopFileKey("Name$"));
-    assert(!isValidDesktopFileKey(""));
-    assert(!isValidDesktopFileKey("[ru_RU]"));
-    assert(!isValidDesktopFileKey("Name[ru\nRU]"));
-}
-
-/**
- * Test whether the entry value represents true.
- * See_Also: $(D isFalse), $(D isBoolean)
- */
-@nogc @safe bool isTrue(const(char)[] value) pure nothrow {
-    return (value == "true" || value == "1");
-}
-
-///
-unittest
-{
-    assert(isTrue("true"));
-    assert(isTrue("1"));
-    assert(!isTrue("not boolean"));
-}
-
-/**
- * Test whether the entry value represents false.
- * See_Also: $(D isTrue), $(D isBoolean)
- */
-@nogc @safe bool isFalse(const(char)[] value) pure nothrow {
-    return (value == "false" || value == "0");
-}
-
-///
-unittest
-{
-    assert(isFalse("false"));
-    assert(isFalse("0"));
-    assert(!isFalse("not boolean"));
-}
-
-/**
- * Check if the entry value can be interpreted as boolean value.
- * See_Also: $(D isTrue), $(D isFalse)
- */
-@nogc @safe bool isBoolean(const(char)[] value) pure nothrow {
-    return isTrue(value) || isFalse(value);
-}
-
-///
-unittest
-{
-    assert(isBoolean("true"));
-    assert(isBoolean("1"));
-    assert(isBoolean("false"));
-    assert(isBoolean("0"));
-    assert(!isBoolean("not boolean"));
-}
-
-/**
- * Convert bool to string. Can be used to set boolean values.
- * See_Also: $(D isBoolean)
- */
-@nogc @safe string boolToString(bool b) nothrow pure {
-    return b ? "true" : "false";
-}
-
-///
-unittest
-{
-    assert(boolToString(false) == "false");
-    assert(boolToString(true) == "true");
-}
-
-/**
- * Make locale name based on language, country, encoding and modifier.
- * Returns: locale name in form lang_COUNTRY.ENCODING@MODIFIER
- * See_Also: $(D parseLocaleName)
- */
-@safe String makeLocaleName(String)(
-    String lang, String country = null,
-    String encoding = null,
-    String modifier = null) pure
-if (isSomeString!String && is(ElementEncodingType!String : char))
-{
-    return lang ~ (country.length ? "_".to!String~country : String.init)
-                ~ (encoding.length ? ".".to!String~encoding : String.init)
-                ~ (modifier.length ? "@".to!String~modifier : String.init);
-}
-
-///
-unittest
-{
-    assert(makeLocaleName("ru", "RU") == "ru_RU");
-    assert(makeLocaleName("ru", "RU", "UTF-8") == "ru_RU.UTF-8");
-    assert(makeLocaleName("ru", "RU", "UTF-8", "mod") == "ru_RU.UTF-8@mod");
-    assert(makeLocaleName("ru", string.init, string.init, "mod") == "ru@mod");
-
-    assert(makeLocaleName("ru".dup, (char[]).init, (char[]).init, "mod".dup) == "ru@mod".dup);
-}
-
-/**
- * Parse locale name into the tuple of 4 values corresponding to language, country, encoding and modifier
- * Returns: Tuple!(string, "lang", string, "country", string, "encoding", string, "modifier")
- * See_Also: $(D makeLocaleName)
- */
-@nogc @trusted auto parseLocaleName(String)(String locale) pure nothrow if (isSomeString!String && is(ElementEncodingType!String : char))
-{
-    auto modifiderSplit = findSplit(locale, "@");
-    auto modifier = modifiderSplit[2];
-
-    auto encodongSplit = findSplit(modifiderSplit[0], ".");
-    auto encoding = encodongSplit[2];
-
-    auto countrySplit = findSplit(encodongSplit[0], "_");
-    auto country = countrySplit[2];
-
-    auto lang = countrySplit[0];
-
-    alias LocaleTuple = Tuple!(String, "lang", String, "country", String, "encoding", String, "modifier");
-
-    return LocaleTuple(lang, country, encoding, modifier);
-}
-
-///
-unittest
-{
-    assert(parseLocaleName("ru_RU.UTF-8@mod") == tuple("ru", "RU", "UTF-8", "mod"));
-    assert(parseLocaleName("ru@mod") == tuple("ru", string.init, string.init, "mod"));
-    assert(parseLocaleName("ru_RU") == tuple("ru", "RU", string.init, string.init));
-
-    assert(parseLocaleName("ru_RU.UTF-8@mod".dup) == tuple("ru".dup, "RU".dup, "UTF-8".dup, "mod".dup));
-}
-
-/**
- * Drop encoding part from locale (it's not used in constructing localized keys).
- * Returns: Locale string with encoding part dropped out or original string if encoding was not present.
- */
-@safe String dropEncodingPart(String)(String locale) pure nothrow if (isSomeString!String && is(ElementEncodingType!String : char))
-{
-    auto t = parseLocaleName(locale);
-    if (!t.encoding.empty) {
-        return makeLocaleName(t.lang, t.country, String.init, t.modifier);
-    }
-    return locale;
-}
-
-///
-unittest
-{
-    assert("ru_RU.UTF-8".dropEncodingPart() == "ru_RU");
-    string locale = "ru_RU";
-    assert(locale.dropEncodingPart() is locale);
-}
-
-/**
- * Construct localized key name from key and locale.
- * Returns: localized key in form key[locale] dropping encoding out if present.
- * See_Also: $(D separateFromLocale)
- */
-@safe String localizedKey(String)(String key, String locale) pure nothrow if (isSomeString!String && is(ElementEncodingType!String : char))
-{
-    if (locale.empty) {
-        return key;
-    }
-    return key ~ "[".to!String ~ locale.dropEncodingPart() ~ "]".to!String;
-}
-
-///
-unittest
-{
-    string key = "Name";
-    assert(localizedKey(key, "") == key);
-    assert(localizedKey("Name", "ru_RU") == "Name[ru_RU]");
-    assert(localizedKey("Name", "ru_RU.UTF-8") == "Name[ru_RU]");
-}
-
-/**
- * ditto, but constructs locale name from arguments.
- */
-@safe String localizedKey(String)(String key, String lang, String country, String modifier = null) pure if (isSomeString!String && is(ElementEncodingType!String : char))
-{
-    return key ~ "[".to!String ~ makeLocaleName(lang, country, String.init, modifier) ~ "]".to!String;
-}
-
-///
-unittest
-{
-    assert(localizedKey("Name", "ru", "RU") == "Name[ru_RU]");
-    assert(localizedKey("Name".dup, "ru".dup, "RU".dup) == "Name[ru_RU]".dup);
-}
-
-/**
- * Separate key name into non-localized key and locale name.
- * If key is not localized returns original key and empty string.
- * Returns: tuple of key and locale name.
- * See_Also: $(D localizedKey)
- */
-@nogc @trusted auto separateFromLocale(String)(String key) pure nothrow if (isSomeString!String && is(ElementEncodingType!String : char)) {
-    if (key.endsWith("]")) {
-        auto t = key.findSplit("[");
-        if (t[1].length) {
-            return tuple(t[0], t[2][0..$-1]);
-        }
-    }
-    return tuple(key, typeof(key).init);
-}
-
-///
-unittest
-{
-    assert(separateFromLocale("Name[ru_RU]") == tuple("Name", "ru_RU"));
-    assert(separateFromLocale("Name") == tuple("Name", string.init));
-
-    char[] mutableString = "Hello".dup;
-    assert(separateFromLocale(mutableString) == tuple(mutableString, typeof(mutableString).init));
-}
-
-/**
- * Choose the better localized value matching to locale between two localized values. The "goodness" is determined using algorithm described in $(LINK2 http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s04.html, Localized values for keys).
- * Params:
- *  locale = original locale to match to
- *  firstLocale = first locale
- *  firstValue = first value
- *  secondLocale = second locale
- *  secondValue = second value
- * Returns: The best alternative among two or empty string if none of alternatives match original locale.
- * Note: value with empty locale is considered better choice than value with locale that does not match the original one.
- */
-@nogc @trusted auto chooseLocalizedValue(String)(
-    String locale,
-    String firstLocale,  String firstValue,
-    String secondLocale, String secondValue) pure nothrow
-    if (isSomeString!String && is(ElementEncodingType!String : char))
-{
-    const lt = parseLocaleName(locale);
-    const lt1 = parseLocaleName(firstLocale);
-    const lt2 = parseLocaleName(secondLocale);
-
-    int score1, score2;
-
-    if (lt.lang == lt1.lang) {
-        score1 = 1 + ((lt.country == lt1.country) ? 2 : 0 ) + ((lt.modifier == lt1.modifier) ? 1 : 0);
-    }
-    if (lt.lang == lt2.lang) {
-        score2 = 1 + ((lt.country == lt2.country) ? 2 : 0 ) + ((lt.modifier == lt2.modifier) ? 1 : 0);
-    }
-
-    if (score1 == 0 && score2 == 0) {
-        if (firstLocale.empty && !firstValue.empty) {
-            return tuple(firstLocale, firstValue);
-        } else if (secondLocale.empty && !secondValue.empty) {
-            return tuple(secondLocale, secondValue);
-        } else {
-            return tuple(String.init, String.init);
-        }
-    }
-
-    if (score1 >= score2) {
-        return tuple(firstLocale, firstValue);
-    } else {
-        return tuple(secondLocale, secondValue);
-    }
-}
-
-///
-unittest
-{
-    string locale = "ru_RU.UTF-8@jargon";
-    assert(chooseLocalizedValue(string.init, "ru_RU", "Программист", "ru@jargon", "Кодер") == tuple(string.init, string.init));
-    assert(chooseLocalizedValue(locale, "fr_FR", "Programmeur", string.init, "Programmer") == tuple(string.init, "Programmer"));
-    assert(chooseLocalizedValue(locale, string.init, "Programmer", "de_DE", "Programmierer") == tuple(string.init, "Programmer"));
-    assert(chooseLocalizedValue(locale, "fr_FR", "Programmeur", "de_DE", "Programmierer") == tuple(string.init, string.init));
-
-    assert(chooseLocalizedValue(string.init, string.init, "Value", string.init, string.init) == tuple(string.init, "Value"));
-    assert(chooseLocalizedValue(locale, string.init, "Value", string.init, string.init) == tuple(string.init, "Value"));
-    assert(chooseLocalizedValue(locale, string.init, string.init, string.init, "Value") == tuple(string.init, "Value"));
-
-    assert(chooseLocalizedValue(locale, "ru_RU", "Программист", "ru@jargon", "Кодер") == tuple("ru_RU", "Программист"));
-    assert(chooseLocalizedValue(locale, "ru_RU", "Программист", "ru_RU@jargon", "Кодер") == tuple("ru_RU@jargon", "Кодер"));
-
-    assert(chooseLocalizedValue(locale, "ru", "Разработчик", "ru_RU", "Программист") == tuple("ru_RU", "Программист"));
-}
-
-/**
- * Check if value needs to be escaped. This function is currently tolerant to single slashes and tabs.
- * Returns: true if value needs to escaped, false otherwise.
- * See_Also: $(D escapeValue)
- */
-@nogc @safe bool needEscaping(String)(String value) nothrow pure if (isSomeString!String && is(ElementEncodingType!String : char))
-{
-    for (size_t i=0; i<value.length; ++i) {
-        const c = value[i];
-        if (c == '\n' || c == '\r') {
-            return true;
-        }
-    }
-    return false;
-}
-
-///
-unittest
-{
-    assert("new\nline".needEscaping);
-    assert(!`i have \ slash`.needEscaping);
-    assert("i like\rcarriage\rreturns".needEscaping);
-    assert(!"just a text".needEscaping);
-}
-
-/**
- * Escapes string by replacing special symbols with escaped sequences.
- * These symbols are: '\\' (backslash), '\n' (newline), '\r' (carriage return) and '\t' (tab).
- * Returns: Escaped string.
- * See_Also: $(D unescapeValue)
- */
-@trusted String escapeValue(String)(String value) pure if (isSomeString!String && is(ElementEncodingType!String : char)) {
-    return value.replace("\\", `\\`.to!String).replace("\n", `\n`.to!String).replace("\r", `\r`.to!String).replace("\t", `\t`.to!String);
-}
-
-///
-unittest
-{
-    assert("a\\next\nline\top".escapeValue() == `a\\next\nline\top`); // notice how the string on the right is raw.
-    assert("a\\next\nline\top".dup.escapeValue() == `a\\next\nline\top`.dup);
-}
-
-
-/**
- * Unescape value. If value does not need unescaping this function returns original value.
- * Params:
- *  value = string to unescape
- *  pairs = pairs of escaped characters and their unescaped forms.
- */
-@trusted inout(char)[] doUnescape(inout(char)[] value, in Tuple!(char, char)[] pairs) nothrow pure {
-    //little optimization to avoid unneeded allocations.
-    size_t i = 0;
-    for (; i < value.length; i++) {
-        if (value[i] == '\\') {
-            break;
-        }
-    }
-    if (i == value.length) {
-        return value;
-    }
-
-    auto toReturn = appender!(typeof(value))();
-    toReturn.put(value[0..i]);
-
-    for (; i < value.length; i++) {
-        if (value[i] == '\\' && i+1 < value.length) {
-            const char c = value[i+1];
-            auto t = pairs.find!"a[0] == b[0]"(tuple(c,c));
-            if (!t.empty) {
-                toReturn.put(t.front[1]);
-                i++;
-                continue;
-            }
-        }
-        toReturn.put(value[i]);
-    }
-    return toReturn.data;
-}
-
-unittest
-{
-    enum Tuple!(char, char)[] pairs = [tuple('\\', '\\')];
-    static assert(is(typeof(doUnescape("", pairs)) == string));
-    static assert(is(typeof(doUnescape("".dup, pairs)) == char[]));
-}
-
-
-/**
- * Unescapes string. You should unescape values returned by library before displaying until you want keep them as is (e.g., to allow user to edit values in escaped form).
- * Returns: Unescaped string.
- * See_Also: $(D escapeValue), $(D doUnescape)
- */
-@safe inout(char)[] unescapeValue(inout(char)[] value) nothrow pure
-{
-    static immutable Tuple!(char, char)[] pairs = [
-       tuple('s', ' '),
-       tuple('n', '\n'),
-       tuple('r', '\r'),
-       tuple('t', '\t'),
-       tuple('\\', '\\')
-    ];
-    return doUnescape(value, pairs);
-}
-
-///
-unittest
-{
-    assert(`a\\next\nline\top`.unescapeValue() == "a\\next\nline\top"); // notice how the string on the left is raw.
-    assert(`\\next\nline\top`.unescapeValue() == "\\next\nline\top");
-    string value = `nounescape`;
-    assert(value.unescapeValue() is value); //original is returned.
-    assert(`a\\next\nline\top`.dup.unescapeValue() == "a\\next\nline\top".dup);
-}
diff --git a/3rdparty/inilike/file.d b/3rdparty/inilike/file.d
deleted file mode 100644
index 0cffc7ad..00000000
--- a/3rdparty/inilike/file.d
+++ /dev/null
@@ -1,2555 +0,0 @@
-/**
- * Class representation of ini-like file.
- * Authors:
- *  $(LINK2 https://github.com/FreeSlave, Roman Chistokhodov)
- * Copyright:
- *  Roman Chistokhodov, 2015-2016
- * License:
- *  $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * See_Also:
- *  $(LINK2 http://standards.freedesktop.org/desktop-entry-spec/latest/index.html, Desktop Entry Specification)
- */
-
-module inilike.file;
-
-private {
-    import std.exception;
-    import inilike.common;
-}
-
-public import inilike.range;
-
-private @trusted string makeComment(string line) pure nothrow
-{
-    if (line.length && line[$-1] == '\n') {
-        line = line[0..$-1];
-    }
-    if (!line.isComment && line.length) {
-        line = '#' ~ line;
-    }
-    line = line.replace("\n", " ");
-    return line;
-}
-
-private @trusted IniLikeLine makeCommentLine(string line) pure nothrow
-{
-    return IniLikeLine.fromComment(makeComment(line));
-}
-
-/**
- * Container used internally by $(D IniLikeFile) and $(D IniLikeGroup).
- * Technically this is list with optional value access by key.
- */
-struct ListMap(K,V, size_t chunkSize = 32)
-{
-    ///
-    @disable this(this);
-
-    /**
-     * Insert key-value pair to the front of list.
-     * Returns: Inserted node.
-     */
-    Node* insertFront(K key, V value) {
-        Node* newNode = givePlace(key, value);
-        putToFront(newNode);
-        return newNode;
-    }
-
-    /**
-     * Insert key-value pair to the back of list.
-     * Returns: Inserted node.
-     */
-    Node* insertBack(K key, V value) {
-        Node* newNode = givePlace(key, value);
-        putToBack(newNode);
-        return newNode;
-    }
-
-    /**
-     * Insert key-value pair before some node in the list.
-     * Returns: Inserted node.
-     */
-    Node* insertBefore(Node* node, K key, V value) {
-        Node* newNode = givePlace(key, value);
-        putBefore(node, newNode);
-        return newNode;
-    }
-
-    /**
-     * Insert key-value pair after some node in the list.
-     * Returns: Inserted node.
-     */
-    Node* insertAfter(Node* node, K key, V value) {
-        Node* newNode = givePlace(key, value);
-        putAfter(node, newNode);
-        return newNode;
-    }
-
-    /**
-     * Add value at the start of list.
-     * Returns: Inserted node.
-     */
-    Node* prepend(V value) {
-        Node* newNode = givePlace(value);
-        putToFront(newNode);
-        return newNode;
-    }
-
-    /**
-     * Add value at the end of list.
-     * Returns: Inserted node.
-     */
-    Node* append(V value) {
-        Node* newNode = givePlace(value);
-        putToBack(newNode);
-        return newNode;
-    }
-
-    /**
-     * Add value before some node in the list.
-     * Returns: Inserted node.
-     */
-    Node* addBefore(Node* node, V value) {
-        Node* newNode = givePlace(value);
-        putBefore(node, newNode);
-        return newNode;
-    }
-
-    /**
-     * Add value after some node in the list.
-     * Returns: Inserted node.
-     */
-    Node* addAfter(Node* node, V value) {
-        Node* newNode = givePlace(value);
-        putAfter(node, newNode);
-        return newNode;
-    }
-
-    /**
-     * Move node to the front of list.
-     */
-    void moveToFront(Node* toMove)
-    {
-        if (_head is toMove) {
-            return;
-        }
-
-        pullOut(toMove);
-        putToFront(toMove);
-    }
-
-    /**
-     * Move node to the back of list.
-     */
-    void moveToBack(Node* toMove)
-    {
-        if (_tail is toMove) {
-            return;
-        }
-
-        pullOut(toMove);
-        putToBack(toMove);
-    }
-
-    /**
-     * Move node to the location before other node.
-     */
-    void moveBefore(Node* other, Node* toMove) {
-        if (other is toMove) {
-            return;
-        }
-
-        pullOut(toMove);
-        putBefore(other, toMove);
-    }
-
-    /**
-     * Move node to the location after other node.
-     */
-    void moveAfter(Node* other, Node* toMove) {
-        if (other is toMove) {
-            return;
-        }
-
-        pullOut(toMove);
-        putAfter(other, toMove);
-    }
-
-    /**
-     * Remove node from list. It also becomes unaccessible via key lookup.
-     */
-    void remove(Node* toRemove)
-    {
-        pullOut(toRemove);
-
-        if (toRemove.hasKey()) {
-            _dict.remove(toRemove.key);
-        }
-
-        if (_lastEmpty) {
-            _lastEmpty.next = toRemove;
-        }
-        toRemove.prev = _lastEmpty;
-        _lastEmpty = toRemove;
-    }
-
-    /**
-     * Remove value by key.
-     * Returns: true if node with such key was found and removed. False otherwise.
-     */
-    bool remove(K key) {
-        Node** toRemove = key in _dict;
-        if (toRemove) {
-            remove(*toRemove);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Remove the first node.
-     */
-    void removeFront() {
-        remove(_head);
-    }
-
-    /**
-     * Remove the last node.
-     */
-    void removeBack() {
-        remove(_tail);
-    }
-
-    /**
-     * Get list node by key.
-     * Returns: Found Node or null if container does not have node associated with key.
-     */
-    inout(Node)* getNode(K key) inout {
-        auto toReturn = key in _dict;
-        if (toReturn) {
-            return *toReturn;
-        }
-        return null;
-    }
-
-    private static struct ByNode(NodeType)
-    {
-    private:
-        NodeType* _begin;
-        NodeType* _end;
-
-    public:
-        bool empty() const {
-            return _begin is null || _end is null || _begin.prev is _end || _end.next is _begin;
-        }
-
-        auto front() {
-            return _begin;
-        }
-
-        auto back() {
-            return _end;
-        }
-
-        void popFront() {
-            _begin = _begin.next;
-        }
-
-        void popBack() {
-            _end = _end.prev;
-        }
-
-        @property auto save() {
-            return this;
-        }
-    }
-
-    /**
-     * Iterate over list nodes.
-     * See_Also: $(D byEntry)
-     */
-    auto byNode()
-    {
-        return ByNode!Node(_head, _tail);
-    }
-
-    ///ditto
-    auto byNode() const
-    {
-        return ByNode!(const(Node))(_head, _tail);
-    }
-
-    /**
-     * Iterate over nodes mapped to Entry elements (useful for testing).
-     */
-    auto byEntry() const {
-        import std.algorithm : map;
-        return byNode().map!(node => node.toEntry());
-    }
-
-    /**
-     * Represenation of list node.
-     */
-    static struct Node {
-    private:
-        K _key;
-        V _value;
-        bool _hasKey;
-        Node* _prev;
-        Node* _next;
-
-        @trusted this(K key, V value) pure nothrow {
-            _key = key;
-            _value = value;
-            _hasKey = true;
-        }
-
-        @trusted this(V value) pure nothrow {
-            _value = value;
-            _hasKey = false;
-        }
-
-        @trusted void prev(Node* newPrev) pure nothrow {
-            _prev = newPrev;
-        }
-
-        @trusted void next(Node* newNext) pure nothrow {
-            _next = newNext;
-        }
-
-    public:
-        /**
-         * Get stored value.
-         */
-        @trusted inout(V) value() inout pure nothrow {
-            return _value;
-        }
-
-        /**
-         * Set stored value.
-         */
-        @trusted void value(V newValue) pure nothrow {
-            _value = newValue;
-        }
-
-        /**
-         * Tell whether this node is a key-value node.
-         */
-        @trusted bool hasKey() const pure nothrow {
-            return _hasKey;
-        }
-
-        /**
-         * Key in key-value node.
-         */
-        @trusted auto key() const pure nothrow {
-            return _key;
-        }
-
-        /**
-         * Access previous node in the list.
-         */
-        @trusted inout(Node)* prev() inout pure nothrow {
-            return _prev;
-        }
-
-        /**
-         * Access next node in the list.
-         */
-        @trusted inout(Node)* next() inout pure nothrow {
-            return _next;
-        }
-
-        ///
-        auto toEntry() const {
-            static if (is(V == class)) {
-                alias Rebindable!(const(V)) T;
-                if (hasKey()) {
-                    return Entry!T(_key, rebindable(_value));
-                } else {
-                    return Entry!T(rebindable(_value));
-                }
-
-            } else {
-                alias V T;
-
-                if (hasKey()) {
-                    return Entry!T(_key, _value);
-                } else {
-                    return Entry!T(_value);
-                }
-            }
-        }
-    }
-
-    /// Mapping of Node to structure.
-    static struct Entry(T = V)
-    {
-    private:
-        K _key;
-        T _value;
-        bool _hasKey;
-
-    public:
-        ///
-        this(T value) {
-            _value = value;
-            _hasKey = false;
-        }
-
-        ///
-        this(K key, T value) {
-            _key = key;
-            _value = value;
-            _hasKey = true;
-        }
-
-        ///
-        auto value() inout {
-            return _value;
-        }
-
-        ///
-        auto key() const {
-            return _key;
-        }
-
-        ///
-        bool hasKey() const {
-            return _hasKey;
-        }
-    }
-
-private:
-    void putToFront(Node* toPut)
-    in {
-        assert(toPut !is null);
-    }
-    body {
-        if (_head) {
-            _head.prev = toPut;
-            toPut.next = _head;
-            _head = toPut;
-        } else {
-            _head = toPut;
-            _tail = toPut;
-        }
-    }
-
-    void putToBack(Node* toPut)
-    in {
-        assert(toPut !is null);
-    }
-    body {
-        if (_tail) {
-            _tail.next = toPut;
-            toPut.prev = _tail;
-            _tail = toPut;
-        } else {
-            _tail = toPut;
-            _head = toPut;
-        }
-    }
-
-    void putBefore(Node* node, Node* toPut)
-    in {
-        assert(toPut !is null);
-        assert(node !is null);
-    }
-    body {
-        toPut.prev = node.prev;
-        if (toPut.prev) {
-            toPut.prev.next = toPut;
-        }
-        toPut.next = node;
-        node.prev = toPut;
-
-        if (node is _head) {
-            _head = toPut;
-        }
-    }
-
-    void putAfter(Node* node, Node* toPut)
-    in {
-        assert(toPut !is null);
-        assert(node !is null);
-    }
-    body {
-        toPut.next = node.next;
-        if (toPut.next) {
-            toPut.next.prev = toPut;
-        }
-        toPut.prev = node;
-        node.next = toPut;
-
-        if (node is _tail) {
-            _tail = toPut;
-        }
-    }
-
-    void pullOut(Node* node)
-    in {
-        assert(node !is null);
-    }
-    body {
-        if (node.next) {
-            node.next.prev = node.prev;
-        }
-        if (node.prev) {
-            node.prev.next = node.next;
-        }
-
-        if (node is _head) {
-            _head = node.next;
-        }
-        if (node is _tail) {
-            _tail = node.prev;
-        }
-
-        node.next = null;
-        node.prev = null;
-    }
-
-    Node* givePlace(K key, V value) {
-        auto newNode = Node(key, value);
-        return givePlace(newNode);
-    }
-
-    Node* givePlace(V value) {
-        auto newNode = Node(value);
-        return givePlace(newNode);
-    }
-
-    Node* givePlace(ref Node node) {
-        Node* toReturn;
-        if (_lastEmpty is null) {
-            if (_storageSize < _storage.length) {
-                toReturn = &_storage[_storageSize];
-            } else {
-                size_t storageIndex = (_storageSize - chunkSize) / chunkSize;
-                if (storageIndex >= _additonalStorages.length) {
-                    _additonalStorages ~= (Node[chunkSize]).init;
-                }
-
-                size_t index = (_storageSize - chunkSize) % chunkSize;
-                toReturn = &_additonalStorages[storageIndex][index];
-            }
-
-            _storageSize++;
-        } else {
-            toReturn = _lastEmpty;
-            _lastEmpty = _lastEmpty.prev;
-            if (_lastEmpty) {
-                _lastEmpty.next = null;
-            }
-            toReturn.next = null;
-            toReturn.prev = null;
-        }
-
-        toReturn._hasKey = node._hasKey;
-        toReturn._key = node._key;
-        toReturn._value = node._value;
-
-        if (toReturn.hasKey()) {
-            _dict[toReturn.key] = toReturn;
-        }
-        return toReturn;
-    }
-
-    Node[chunkSize] _storage;
-    Node[chunkSize][] _additonalStorages;
-    size_t _storageSize;
-
-    Node* _tail;
-    Node* _head;
-    Node* _lastEmpty;
-    Node*[K] _dict;
-}
-
-unittest
-{
-    import std.range : isBidirectionalRange;
-    ListMap!(string, string) listMap;
-    static assert(isBidirectionalRange!(typeof(listMap.byNode())));
-}
-
-unittest
-{
-    import std.algorithm : equal;
-    import std.range : ElementType;
-
-    alias ListMap!(string, string, 2) TestListMap;
-
-    TestListMap listMap;
-    alias typeof(listMap).Node Node;
-    alias ElementType!(typeof(listMap.byEntry())) Entry;
-
-    assert(listMap.byEntry().empty);
-    assert(listMap.getNode("Nonexistent") is null);
-
-    listMap.insertFront("Start", "Fast");
-    assert(listMap.getNode("Start") !is null);
-    assert(listMap.getNode("Start").key() == "Start");
-    assert(listMap.getNode("Start").value() == "Fast");
-    assert(listMap.getNode("Start").hasKey());
-    assert(listMap.byEntry().equal([Entry("Start", "Fast")]));
-    assert(listMap.remove("Start"));
-    assert(listMap.byEntry().empty);
-    assert(listMap.getNode("Start") is null);
-
-    listMap.insertBack("Finish", "Bad");
-    assert(listMap.byEntry().equal([Entry("Finish", "Bad")]));
-    assert(listMap.getNode("Finish").value() == "Bad");
-
-    listMap.insertFront("Begin", "Good");
-    assert(listMap.byEntry().equal([Entry("Begin", "Good"), Entry("Finish", "Bad")]));
-    assert(listMap.getNode("Begin").value() == "Good");
-
-    listMap.insertFront("Start", "Slow");
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Begin", "Good"), Entry("Finish", "Bad")]));
-
-    listMap.insertAfter(listMap.getNode("Begin"), "Middle", "Person");
-    assert(listMap.getNode("Middle").value() == "Person");
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Begin", "Good"), Entry("Middle", "Person"), Entry("Finish", "Bad")]));
-
-    listMap.insertBefore(listMap.getNode("Middle"), "Mean", "Man");
-    assert(listMap.getNode("Mean").value() == "Man");
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Begin", "Good"), Entry("Mean", "Man"), Entry("Middle", "Person"), Entry("Finish", "Bad")]));
-
-    assert(listMap.remove("Mean"));
-    assert(listMap.remove("Middle"));
-
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Begin", "Good"), Entry("Finish", "Bad")]));
-
-    listMap.insertFront("New", "Era");
-    assert(listMap.byEntry().equal([Entry("New", "Era"), Entry("Start", "Slow"), Entry("Begin", "Good"), Entry("Finish", "Bad")]));
-
-    listMap.insertBack("Old", "Epoch");
-    assert(listMap.byEntry().equal([Entry("New", "Era"), Entry("Start", "Slow"), Entry("Begin", "Good"), Entry("Finish", "Bad"), Entry("Old", "Epoch")]));
-
-    listMap.moveToBack(listMap.getNode("New"));
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Begin", "Good"), Entry("Finish", "Bad"), Entry("Old", "Epoch"), Entry("New", "Era")]));
-
-    listMap.moveToFront(listMap.getNode("Begin"));
-    assert(listMap.byEntry().equal([Entry("Begin", "Good"), Entry("Start", "Slow"), Entry("Finish", "Bad"), Entry("Old", "Epoch"), Entry("New", "Era")]));
-
-    listMap.moveAfter(listMap.getNode("Finish"), listMap.getNode("Start"));
-    assert(listMap.byEntry().equal([Entry("Begin", "Good"), Entry("Finish", "Bad"), Entry("Start", "Slow"), Entry("Old", "Epoch"), Entry("New", "Era")]));
-
-    listMap.moveBefore(listMap.getNode("Finish"), listMap.getNode("Old"));
-    assert(listMap.byEntry().equal([Entry("Begin", "Good"), Entry("Old", "Epoch"), Entry("Finish", "Bad"), Entry("Start", "Slow"), Entry("New", "Era")]));
-
-    listMap.moveBefore(listMap.getNode("Begin"), listMap.getNode("Start"));
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Begin", "Good"), Entry("Old", "Epoch"), Entry("Finish", "Bad"), Entry("New", "Era")]));
-
-    listMap.moveAfter(listMap.getNode("New"), listMap.getNode("Finish"));
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Begin", "Good"), Entry("Old", "Epoch"), Entry("New", "Era"), Entry("Finish", "Bad")]));
-
-    listMap.getNode("Begin").value = "Evil";
-    assert(listMap.getNode("Begin").value() == "Evil");
-
-    listMap.remove("Begin");
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Old", "Epoch"), Entry("New", "Era"), Entry("Finish", "Bad")]));
-    listMap.remove("Old");
-    listMap.remove("New");
-    assert(!listMap.remove("Begin"));
-
-    Node* shebang = listMap.prepend("Shebang");
-    Node* endOfStory = listMap.append("End of story");
-
-    assert(listMap.byEntry().equal([Entry("Shebang"), Entry("Start", "Slow"), Entry("Finish", "Bad"), Entry("End of story")]));
-
-    Node* mid = listMap.addAfter(listMap.getNode("Start"), "Mid");
-    Node* average = listMap.addBefore(listMap.getNode("Finish"), "Average");
-    assert(listMap.byEntry().equal([Entry("Shebang"), Entry("Start", "Slow"), Entry("Mid"), Entry("Average"), Entry("Finish", "Bad"), Entry("End of story")]));
-
-    listMap.remove(shebang);
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Mid"), Entry("Average"), Entry("Finish", "Bad"), Entry("End of story")]));
-
-    listMap.remove(endOfStory);
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Mid"), Entry("Average"), Entry("Finish", "Bad")]));
-
-    listMap.moveToFront(listMap.getNode("Start"));
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Mid"), Entry("Average"), Entry("Finish", "Bad")]));
-    listMap.moveToBack(listMap.getNode("Finish"));
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Mid"), Entry("Average"), Entry("Finish", "Bad")]));
-
-    listMap.moveBefore(listMap.getNode("Start"), listMap.getNode("Start"));
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Mid"), Entry("Average"), Entry("Finish", "Bad")]));
-    listMap.moveAfter(listMap.getNode("Finish"), listMap.getNode("Finish"));
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Mid"), Entry("Average"), Entry("Finish", "Bad")]));
-
-    listMap.insertAfter(mid, "Center", "Universe");
-    listMap.insertBefore(average, "Focus", "Cosmos");
-    assert(listMap.byEntry().equal([Entry("Start", "Slow"), Entry("Mid"), Entry("Center", "Universe"), Entry("Focus", "Cosmos"), Entry("Average"), Entry("Finish", "Bad")]));
-
-    listMap.removeFront();
-    assert(listMap.byEntry().equal([Entry("Mid"), Entry("Center", "Universe"), Entry("Focus", "Cosmos"), Entry("Average"), Entry("Finish", "Bad")]));
-    listMap.removeBack();
-
-    assert(listMap.byEntry().equal([Entry("Mid"), Entry("Center", "Universe"), Entry("Focus", "Cosmos"), Entry("Average")]));
-
-    assert(listMap.byEntry().retro.equal([Entry("Average"), Entry("Focus", "Cosmos"), Entry("Center", "Universe"), Entry("Mid")]));
-
-    auto byEntry = listMap.byEntry();
-    Entry entry = byEntry.front;
-    assert(entry.value == "Mid");
-    assert(!entry.hasKey());
-
-    byEntry.popFront();
-    assert(byEntry.equal([Entry("Center", "Universe"), Entry("Focus", "Cosmos"), Entry("Average")]));
-    byEntry.popBack();
-    assert(byEntry.equal([Entry("Center", "Universe"), Entry("Focus", "Cosmos")]));
-
-    entry = byEntry.back;
-    assert(entry.key == "Focus");
-    assert(entry.value == "Cosmos");
-    assert(entry.hasKey());
-
-    auto saved = byEntry.save;
-
-    byEntry.popFront();
-    assert(byEntry.equal([Entry("Focus", "Cosmos")]));
-    byEntry.popBack();
-    assert(byEntry.empty);
-
-    assert(saved.equal([Entry("Center", "Universe"), Entry("Focus", "Cosmos")]));
-    saved.popBack();
-    assert(saved.equal([Entry("Center", "Universe")]));
-    saved.popFront();
-    assert(saved.empty);
-
-    static void checkConst(ref const TestListMap listMap)
-    {
-        assert(listMap.byEntry().equal([Entry("Mid"), Entry("Center", "Universe"), Entry("Focus", "Cosmos"), Entry("Average")]));
-    }
-    checkConst(listMap);
-
-    static class Class
-    {
-        this(string name) {
-            _name = name;
-        }
-
-        string name() const {
-            return _name;
-        }
-    private:
-        string _name;
-    }
-
-    alias ListMap!(string, Class) TestClassListMap;
-    TestClassListMap classListMap;
-    classListMap.insertFront("name", new Class("Name"));
-    classListMap.append(new Class("Value"));
-    auto byClass = classListMap.byEntry();
-    assert(byClass.front.value.name == "Name");
-    assert(byClass.front.key == "name");
-    assert(byClass.back.value.name == "Value");
-}
-
-/**
- * Line in group.
- */
-struct IniLikeLine
-{
-    /**
-     * Type of line.
-     */
-    enum Type
-    {
-        None = 0,   /// deleted or invalid line
-        Comment = 1, /// a comment or empty line
-        KeyValue = 2 /// key-value pair
-    }
-
-    /**
-     * Contruct from comment.
-     */
-    @nogc @safe static IniLikeLine fromComment(string comment) nothrow pure {
-        return IniLikeLine(comment, null, Type.Comment);
-    }
-
-    /**
-     * Construct from key and value.
-     */
-    @nogc @safe static IniLikeLine fromKeyValue(string key, string value) nothrow pure {
-        return IniLikeLine(key, value, Type.KeyValue);
-    }
-
-    /**
-     * Get comment.
-     * Returns: Comment or empty string if type is not Type.Comment.
-     */
-    @nogc @safe string comment() const nothrow pure {
-        return _type == Type.Comment ? _first : null;
-    }
-
-    /**
-     * Get key.
-     * Returns: Key or empty string if type is not Type.KeyValue
-     */
-    @nogc @safe string key() const nothrow pure {
-        return _type == Type.KeyValue ? _first : null;
-    }
-
-    /**
-     * Get value.
-     * Returns: Value or empty string if type is not Type.KeyValue
-     */
-    @nogc @safe string value() const nothrow pure {
-        return _type == Type.KeyValue ? _second : null;
-    }
-
-    /**
-     * Get type of line.
-     */
-    @nogc @safe Type type() const nothrow pure {
-        return _type;
-    }
-private:
-    string _first;
-    string _second;
-    Type _type = Type.None;
-}
-
-
-/**
- * This class represents the group (section) in the ini-like file.
- * Instances of this class can be created only in the context of $(D IniLikeFile) or its derivatives.
- * Note: Keys are case-sensitive.
- */
-class IniLikeGroup
-{
-private:
-    alias ListMap!(string, IniLikeLine) LineListMap;
-
-public:
-    ///
-    enum InvalidKeyPolicy : ubyte {
-        ///Throw error on invalid key
-        throwError,
-        ///Skip invalid key
-        skip,
-        ///Save entry with invalid key.
-        save
-    }
-
-    /**
-     * Create instance on IniLikeGroup and set its name to groupName.
-     */
-    protected @nogc @safe this(string groupName) nothrow {
-        _name = groupName;
-    }
-
-    /**
-     * Returns: The value associated with the key.
-     * Note: The value is not unescaped automatically.
-     * Prerequisites: Value accessed by key must exist.
-     * See_Also: $(D value), $(D readEntry)
-     */
-    @nogc @safe final string opIndex(string key) const nothrow pure {
-        return _listMap.getNode(key).value.value;
-    }
-
-    private @safe final string setKeyValueImpl(string key, string value)
-    in {
-        assert(!value.needEscaping);
-    }
-    body {
-        import std.stdio;
-        auto node = _listMap.getNode(key);
-        if (node) {
-            node.value = IniLikeLine.fromKeyValue(key, value);
-        } else {
-            _listMap.insertBack(key, IniLikeLine.fromKeyValue(key, value));
-        }
-        return value;
-    }
-
-    /**
-     * Insert new value or replaces the old one if value associated with key already exists.
-     * Note: The value is not escaped automatically upon writing. It's your responsibility to escape it.
-     * Returns: Inserted/updated value or null string if key was not added.
-     * Throws: $(D IniLikeEntryException) if key or value is not valid or value needs to be escaped.
-     * See_Also: $(D writeEntry)
-     */
-    @safe final string opIndexAssign(string value, string key) {
-        return setValue(key, value);
-    }
-
-    /**
-     * Assign localized value.
-     * Note: The value is not escaped automatically upon writing. It's your responsibility to escape it.
-     * See_Also: $(D setLocalizedValue), $(D localizedValue), $(D writeEntry)
-     */
-    @safe final string opIndexAssign(string value, string key, string locale) {
-        return setLocalizedValue(key, locale, value);
-    }
-
-    /**
-     * Tell if group contains value associated with the key.
-     */
-    @nogc @safe final bool contains(string key) const nothrow pure {
-        return _listMap.getNode(key) !is null;
-    }
-
-    /**
-     * Get value by key.
-     * Returns: The value associated with the key, or defaultValue if group does not contain such item.
-     * Note: The value is not unescaped automatically.
-     * See_Also: $(D setValue), $(D localizedValue), $(D readEntry)
-     */
-    @nogc @safe final string value(string key) const nothrow pure {
-        auto node = _listMap.getNode(key);
-        if (node) {
-            return node.value.value;
-        } else {
-            return null;
-        }
-    }
-
-    private @trusted final bool validateKeyValue(string key, string value, InvalidKeyPolicy invalidKeyPolicy)
-    {
-        validateValue(key, value);
-
-        try {
-            validateKey(key, value);
-            return true;
-        } catch(IniLikeEntryException e) {
-            final switch(invalidKeyPolicy) {
-                case InvalidKeyPolicy.throwError:
-                    throw e;
-                case InvalidKeyPolicy.save:
-                    validateKeyImpl(key, value, _name);
-                    return true;
-                case InvalidKeyPolicy.skip:
-                    validateKeyImpl(key, value, _name);
-                    return false;
-            }
-        }
-    }
-
-    /**
-     * Set value associated with key.
-     * Params:
-     *  key = Key to associate value with.
-     *  value = Value to set.
-     *  invalidKeyPolicy = Policyt about invalid keys.
-     * See_Also: $(D value), $(D setLocalizedValue), $(D writeEntry)
-     */
-    @safe final string setValue(string key, string value, InvalidKeyPolicy invalidKeyPolicy = InvalidKeyPolicy.throwError)
-    {
-        if (validateKeyValue(key, value, invalidKeyPolicy)) {
-            return setKeyValueImpl(key, value);
-        }
-        return null;
-    }
-
-    /**
-     * Get value by key. This function automatically unescape the found value before returning.
-     * Returns: The unescaped value associated with key or null if not found.
-     * See_Also: $(D value), $(D writeEntry)
-     */
-    @safe final string readEntry(string key, string locale = null) const nothrow pure {
-        if (locale.length) {
-            return localizedValue(key, locale).unescapeValue();
-        } else {
-            return value(key).unescapeValue();
-        }
-    }
-
-    /**
-     * Set value by key. This function automatically escape the value (you should not escape value yourself) when writing it.
-     * Throws: $(D IniLikeEntryException) if key or value is not valid.
-     * See_Also: $(D readEntry), $(D setValue)
-     */
-    @safe final string writeEntry(string key, string value, InvalidKeyPolicy invalidKeyPolicy = InvalidKeyPolicy.throwError) {
-        value = value.escapeValue();
-        return setValue(key, value, invalidKeyPolicy);
-    }
-
-    ///ditto, localized version
-    @safe final string writeEntry(string key, string locale, string value, InvalidKeyPolicy invalidKeyPolicy = InvalidKeyPolicy.throwError) {
-        value = value.escapeValue();
-        return setLocalizedValue(key, locale, value, invalidKeyPolicy);
-    }
-
-    /**
-     * Perform locale matching lookup as described in $(LINK2 http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s04.html, Localized values for keys).
-     * Params:
-     *  key = Non-localized key.
-     *  locale = Locale in intereset.
-     *  nonLocaleFallback = Allow fallback to non-localized version.
-     * Returns:
-     *  The localized value associated with key and locale,
-     *  or the value associated with non-localized key if group does not contain localized value and nonLocaleFallback is true.
-     * Note: The value is not unescaped automatically.
-     * See_Also: $(D setLocalizedValue), $(D value), $(D readEntry)
-     */
-    @safe final string localizedValue(string key, string locale, Flag!"nonLocaleFallback" nonLocaleFallback = Yes.nonLocaleFallback) const nothrow pure {
-        //Any ideas how to get rid of this boilerplate and make less allocations?
-        const t = parseLocaleName(locale);
-        auto lang = t.lang;
-        auto country = t.country;
-        auto modifier = t.modifier;
-
-        if (lang.length) {
-            string pick;
-            if (country.length && modifier.length) {
-                pick = value(localizedKey(key, locale));
-                if (pick !is null) {
-                    return pick;
-                }
-            }
-            if (country.length) {
-                pick = value(localizedKey(key, lang, country));
-                if (pick !is null) {
-                    return pick;
-                }
-            }
-            if (modifier.length) {
-                pick = value(localizedKey(key, lang, string.init, modifier));
-                if (pick !is null) {
-                    return pick;
-                }
-            }
-            pick = value(localizedKey(key, lang, string.init));
-            if (pick !is null) {
-                return pick;
-            }
-        }
-
-        if (nonLocaleFallback) {
-            return value(key);
-        } else {
-            return null;
-        }
-    }
-
-    ///
-    unittest
-    {
-        auto lilf = new IniLikeFile;
-        lilf.addGenericGroup("Entry");
-        auto group = lilf.group("Entry");
-        assert(group.groupName == "Entry");
-        group["Name"] = "Programmer";
-        group["Name[ru_RU]"] = "Разработчик";
-        group["Name[ru@jargon]"] = "Кодер";
-        group["Name[ru]"] = "Программист";
-        group["Name[de_DE@dialect]"] = "Programmierer"; //just example
-        group["Name[fr_FR]"] = "Programmeur";
-        group["GenericName"] = "Program";
-        group["GenericName[ru]"] = "Программа";
-        assert(group["Name"] == "Programmer");
-        assert(group.localizedValue("Name", "ru@jargon") == "Кодер");
-        assert(group.localizedValue("Name", "ru_RU@jargon") == "Разработчик");
-        assert(group.localizedValue("Name", "ru") == "Программист");
-        assert(group.localizedValue("Name", "ru_RU.UTF-8") == "Разработчик");
-        assert(group.localizedValue("Name", "nonexistent locale") == "Programmer");
-        assert(group.localizedValue("Name", "de_DE@dialect") == "Programmierer");
-        assert(group.localizedValue("Name", "fr_FR.UTF-8") == "Programmeur");
-        assert(group.localizedValue("GenericName", "ru_RU") == "Программа");
-        assert(group.localizedValue("GenericName", "fr_FR") == "Program");
-        assert(group.localizedValue("GenericName", "fr_FR", No.nonLocaleFallback) is null);
-    }
-
-    /**
-     * Same as localized version of opIndexAssign, but uses function syntax.
-     * Note: The value is not escaped automatically upon writing. It's your responsibility to escape it.
-     * Throws: $(D IniLikeEntryException) if key or value is not valid or value needs to be escaped.
-     * See_Also: $(D localizedValue), $(D setValue), $(D writeEntry)
-     */
-    @safe final string setLocalizedValue(string key, string locale, string value, InvalidKeyPolicy invalidKeyPolicy = InvalidKeyPolicy.throwError) {
-        return setValue(localizedKey(key, locale), value, invalidKeyPolicy);
-    }
-
-    /**
-     * Removes entry by key. Do nothing if not value associated with key found.
-     * Returns: true if entry was removed, false otherwise.
-     */
-    @safe final bool removeEntry(string key) nothrow pure {
-        return _listMap.remove(key);
-    }
-
-    ///ditto, but remove entry by localized key
-    @safe final bool removeEntry(string key, string locale) nothrow pure {
-        return removeEntry(localizedKey(key, locale));
-    }
-
-    ///ditto, but remove entry by node.
-    @safe final void removeEntry(LineNode node) nothrow pure {
-        _listMap.remove(node.node);
-    }
-
-    private @nogc @safe static auto staticByKeyValue(Range)(Range nodes) nothrow {
-        return nodes.map!(node => node.value).filter!(v => v.type == IniLikeLine.Type.KeyValue).map!(v => keyValueTuple(v.key, v.value));
-    }
-
-    /**
-     * Iterate by Key-Value pairs. Values are left in escaped form.
-     * Returns: Range of Tuple!(string, "key", string, "value").
-     * See_Also: $(D value), $(D localizedValue), $(D byIniLine)
-     */
-    @nogc @safe final auto byKeyValue() const nothrow {
-        return staticByKeyValue(_listMap.byNode);
-    }
-
-    /**
-     * Empty range of the same type as byKeyValue. Can be used in derived classes if it's needed to have empty range.
-     * Returns: Empty range of Tuple!(string, "key", string, "value").
-     */
-    @nogc @safe static auto emptyByKeyValue() nothrow {
-        const ListMap!(string, IniLikeLine) listMap;
-        return staticByKeyValue(listMap.byNode);
-    }
-
-    ///
-    unittest
-    {
-        assert(emptyByKeyValue().empty);
-        auto group = new IniLikeGroup("Group name");
-        static assert(is(typeof(emptyByKeyValue()) == typeof(group.byKeyValue()) ));
-    }
-
-    /**
-     * Get name of this group.
-     * Returns: The name of this group.
-     */
-    @nogc @safe final string groupName() const nothrow pure {
-        return _name;
-    }
-
-    /**
-     * Returns: Range of $(D IniLikeLine)s included in this group.
-     * See_Also: $(D byNode), $(D byKeyValue)
-     */
-    @trusted final auto byIniLine() const {
-        return _listMap.byNode.map!(node => node.value);
-    }
-
-    /**
-     * Wrapper for internal ListMap node.
-     */
-    static struct LineNode
-    {
-    private:
-        LineListMap.Node* node;
-        string groupName;
-    public:
-        /**
-         * Get key of node.
-         */
-        @nogc @trusted string key() const pure nothrow {
-            if (node) {
-                return node.key;
-            } else {
-                return null;
-            }
-        }
-
-        /**
-         * Get $(D IniLikeLine) pointed by node.
-         */
-        @nogc @trusted IniLikeLine line() const pure nothrow {
-            if (node) {
-                return node.value;
-            } else {
-                return IniLikeLine.init;
-            }
-        }
-
-        /**
-         * Set value for line. If underline line is comment, than newValue is set as comment.
-         * Prerequisites: Node must be non-null.
-         */
-        @trusted void setValue(string newValue) pure {
-            auto type = node.value.type;
-            if (type == IniLikeLine.Type.KeyValue) {
-                node.value = IniLikeLine.fromKeyValue(node.value.key, newValue);
-            } else if (type == IniLikeLine.Type.Comment) {
-                node.value = makeCommentLine(newValue);
-            }
-        }
-
-        /**
-         * Check if underlined node is null.
-         */
-        @nogc @safe bool isNull() const pure nothrow {
-            return node is null;
-        }
-    }
-
-    private @trusted auto lineNode(LineListMap.Node* node) pure nothrow {
-        return LineNode(node, groupName());
-    }
-
-    /**
-     * Iterate over nodes of internal list.
-     * See_Also: $(D getNode), $(D byIniLine)
-     */
-    @trusted auto byNode() {
-        import std.algorithm : map;
-        return _listMap.byNode().map!(node => lineNode(node));
-    }
-
-    /**
-     * Get internal list node for key.
-     * See_Also: $(D byNode)
-     */
-    @trusted final auto getNode(string key) {
-        return lineNode(_listMap.getNode(key));
-    }
-
-    /**
-     * Add key-value entry without association of value with key. Can be used to add duplicates.
-     */
-    final auto appendValue(string key, string value, InvalidKeyPolicy invalidKeyPolicy = InvalidKeyPolicy.throwError) {
-        if (validateKeyValue(key, value, invalidKeyPolicy)) {
-            return lineNode(_listMap.append(IniLikeLine.fromKeyValue(key, value)));
-        } else {
-            return lineNode(null);
-        }
-    }
-
-    /**
-     * Add comment line into the group.
-     * Returns: Added LineNode.
-     * See_Also: $(D byIniLine), $(D prependComment), $(D addCommentBefore), $(D addCommentAfter)
-     */
-    @safe final auto appendComment(string comment) nothrow pure {
-        return lineNode(_listMap.append(makeCommentLine(comment)));
-    }
-
-    /**
-     * Add comment line at the start of group (after group header, before any key-value pairs).
-     * Returns: Added LineNode.
-     * See_Also: $(D byIniLine), $(D appendComment), $(D addCommentBefore), $(D addCommentAfter)
-     */
-    @safe final auto prependComment(string comment) nothrow pure {
-        return lineNode(_listMap.prepend(makeCommentLine(comment)));
-    }
-
-    /**
-     * Add comment before some node.
-     * Returns: Added LineNode.
-     * See_Also: $(D byIniLine), $(D appendComment), $(D prependComment), $(D getNode), $(D addCommentAfter)
-     */
-    @trusted final auto addCommentBefore(LineNode node, string comment) nothrow pure
-    in {
-        assert(!node.isNull());
-    }
-    body {
-        return _listMap.addBefore(node.node, makeCommentLine(comment));
-    }
-
-    /**
-     * Add comment after some node.
-     * Returns: Added LineNode.
-     * See_Also: $(D byIniLine), $(D appendComment), $(D prependComment), $(D getNode), $(D addCommentBefore)
-     */
-    @trusted final auto addCommentAfter(LineNode node, string comment) nothrow pure
-    in {
-        assert(!node.isNull());
-    }
-    body {
-        return _listMap.addAfter(node.node, makeCommentLine(comment));
-    }
-
-    /**
-     * Move line to the start of group.
-     * Prerequisites: $(D toMove) is not null and belongs to this group.
-     * See_Also: $(D getNode)
-     */
-    @trusted final void moveLineToFront(LineNode toMove) nothrow pure {
-        _listMap.moveToFront(toMove.node);
-    }
-
-    /**
-     * Move line to the end of group.
-     * Prerequisites: $(D toMove) is not null and belongs to this group.
-     * See_Also: $(D getNode)
-     */
-    @trusted final void moveLineToBack(LineNode toMove) nothrow pure {
-        _listMap.moveToBack(toMove.node);
-    }
-
-    /**
-     * Move line before other line in the group.
-     * Prerequisites: $(D toMove) and $(D other) are not null and belong to this group.
-     * See_Also: $(D getNode)
-     */
-    @trusted final void moveLineBefore(LineNode other, LineNode toMove) nothrow pure {
-        _listMap.moveBefore(other.node, toMove.node);
-    }
-
-    /**
-     * Move line after other line in the group.
-     * Prerequisites: $(D toMove) and $(D other) are not null and belong to this group.
-     * See_Also: $(D getNode)
-     */
-    @trusted final void moveLineAfter(LineNode other, LineNode toMove) nothrow pure {
-        _listMap.moveAfter(other.node, toMove.node);
-    }
-
-private:
-    @trusted static void validateKeyImpl(string key, string value, string groupName)
-    {
-        if (key.empty || key.strip.empty) {
-            throw new IniLikeEntryException("key must not be empty", groupName, key, value);
-        }
-        if (key.isComment()) {
-            throw new IniLikeEntryException("key must not start with #", groupName, key, value);
-        }
-        if (key.canFind('=')) {
-            throw new IniLikeEntryException("key must not have '=' character in it", groupName, key, value);
-        }
-        if (key.needEscaping()) {
-            throw new IniLikeEntryException("key must not contain new line characters", groupName, key, value);
-        }
-    }
-
-protected:
-    /**
-     * Validate key before setting value to key for this group and throw exception if not valid.
-     * Can be reimplemented in derived classes.
-     *
-     * Default implementation checks if key is not empty string, does not look like comment and does not contain new line or carriage return characters.
-     * Params:
-     *  key = key to validate.
-     *  value = value that is being set to key.
-     * Throws: $(D IniLikeEntryException) if either key is invalid.
-     * See_Also: $(D validateValue)
-     * Note:
-     *  Implementer should ensure that their implementation still validates key for format consistency (i.e. no new line characters, etc.).
-     *  If not sure, just call super.validateKey(key, value) in your implementation.
-     */
-    @trusted void validateKey(string key, string value) const {
-        validateKeyImpl(key, value, _name);
-    }
-
-    ///
-    unittest
-    {
-        auto ilf = new IniLikeFile();
-        ilf.addGenericGroup("Group");
-
-        auto entryException = collectException!IniLikeEntryException(ilf.group("Group")[""] = "Value1");
-        assert(entryException !is null);
-        assert(entryException.groupName == "Group");
-        assert(entryException.key == "");
-        assert(entryException.value == "Value1");
-
-        entryException = collectException!IniLikeEntryException(ilf.group("Group")["    "] = "Value2");
-        assert(entryException !is null);
-        assert(entryException.key == "    ");
-        assert(entryException.value == "Value2");
-
-        entryException = collectException!IniLikeEntryException(ilf.group("Group")["New\nLine"] = "Value3");
-        assert(entryException !is null);
-        assert(entryException.key == "New\nLine");
-        assert(entryException.value == "Value3");
-
-        entryException = collectException!IniLikeEntryException(ilf.group("Group")["# Comment"] = "Value4");
-        assert(entryException !is null);
-        assert(entryException.key == "# Comment");
-        assert(entryException.value == "Value4");
-
-        entryException = collectException!IniLikeEntryException(ilf.group("Group")["Everyone=Is"] = "Equal");
-        assert(entryException !is null);
-        assert(entryException.key == "Everyone=Is");
-        assert(entryException.value == "Equal");
-    }
-
-    /**
-     * Validate value for key before setting value to key for this group and throw exception if not valid.
-     * Can be reimplemented in derived classes.
-     *
-     * Default implementation checks if value is escaped.
-     * Params:
-     *  key = key the value is being set to.
-     *  value = value to validate. Considered to be escaped.
-     * Throws: $(D IniLikeEntryException) if value is invalid.
-     * See_Also: $(D validateKey)
-     */
-    @trusted void validateValue(string key, string value) const {
-        if (value.needEscaping()) {
-            throw new IniLikeEntryException("The value needs to be escaped", _name, key, value);
-        }
-    }
-
-    ///
-    unittest
-    {
-        auto ilf = new IniLikeFile();
-        ilf.addGenericGroup("Group");
-
-        auto entryException = collectException!IniLikeEntryException(ilf.group("Group")["Key"] = "New\nline");
-        assert(entryException !is null);
-        assert(entryException.key == "Key");
-        assert(entryException.value == "New\nline");
-    }
-private:
-    LineListMap _listMap;
-    string _name;
-}
-
-///Base class for ini-like format errors.
-class IniLikeException : Exception
-{
-    ///
-    this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null) pure nothrow @safe {
-        super(msg, file, line, next);
-    }
-}
-
-/**
- * Exception thrown on error with group.
- */
-class IniLikeGroupException : Exception
-{
-    ///
-    this(string msg, string groupName, string file = __FILE__, size_t line = __LINE__, Throwable next = null) pure nothrow @safe {
-        super(msg, file, line, next);
-        _group = groupName;
-    }
-
-    /**
-     * Name of group where error occured.
-     */
-    @nogc @safe string groupName() const nothrow pure {
-        return _group;
-    }
-
-private:
-    string _group;
-}
-
-/**
- * Exception thrown when trying to set invalid key or value.
- */
-class IniLikeEntryException : IniLikeGroupException
-{
-    this(string msg, string group, string key, string value, string file = __FILE__, size_t line = __LINE__, Throwable next = null) pure nothrow @safe {
-        super(msg, group, file, line, next);
-        _key = key;
-        _value = value;
-    }
-
-    /**
-     * The key the value associated with.
-     */
-    @nogc @safe string key() const nothrow pure {
-        return _key;
-    }
-
-    /**
-     * The value associated with key.
-     */
-    @nogc @safe string value() const nothrow pure {
-        return _value;
-    }
-
-private:
-    string _key;
-    string _value;
-}
-
-/**
- * Exception thrown on the file read error.
- */
-class IniLikeReadException : IniLikeException
-{
-    /**
-     * Create IniLikeReadException with msg, lineNumber and fileName.
-     */
-    this(string msg, size_t lineNumber, string fileName = null, IniLikeEntryException entryException = null, string file = __FILE__, size_t line = __LINE__, Throwable next = null) pure nothrow @safe {
-        super(msg, file, line, next);
-        _lineNumber = lineNumber;
-        _fileName = fileName;
-        _entryException = entryException;
-    }
-
-    /**
-     * Number of line in the file where the exception occured, starting from 1.
-     * 0 means that error is not bound to any existing line, but instead relate to file at whole (e.g. required group or key is missing).
-     * Don't confuse with $(B line) property of $(B Throwable).
-     */
-    @nogc @safe size_t lineNumber() const nothrow pure {
-        return _lineNumber;
-    }
-
-    /**
-     * Number of line in the file where the exception occured, starting from 0.
-     * Don't confuse with $(B line) property of $(B Throwable).
-     */
-    @nogc @safe size_t lineIndex() const nothrow pure {
-        return _lineNumber ? _lineNumber - 1 : 0;
-    }
-
-    /**
-     * Name of ini-like file where error occured.
-     * Can be empty if fileName was not given upon IniLikeFile creating.
-     * Don't confuse with $(B file) property of $(B Throwable).
-     */
-    @nogc @safe string fileName() const nothrow pure {
-        return _fileName;
-    }
-
-    /**
-     * Original IniLikeEntryException which caused this error.
-     * This will have the same msg.
-     * Returns: $(D IniLikeEntryException) object or null if the cause of error was something else.
-     */
-    @nogc @safe IniLikeEntryException entryException() nothrow pure {
-        return _entryException;
-    }
-
-private:
-    size_t _lineNumber;
-    string _fileName;
-    IniLikeEntryException _entryException;
-}
-
-/**
- * Ini-like file.
- *
- */
-class IniLikeFile
-{
-private:
-    alias ListMap!(string, IniLikeGroup, 8) GroupListMap;
-public:
-    ///Behavior on duplicate key in the group.
-    enum DuplicateKeyPolicy : ubyte
-    {
-        ///Throw error on entry with duplicate key.
-        throwError,
-        ///Skip duplicate without error.
-        skip,
-        ///Preserve all duplicates in the list. The first found value remains accessible by key.
-        preserve
-    }
-
-    ///Behavior on group with duplicate name in the file.
-    enum DuplicateGroupPolicy : ubyte
-    {
-        ///Throw error on group with duplicate name.
-        throwError,
-        ///Skip duplicate without error.
-        skip,
-        ///Preserve all duplicates in the list. The first found group remains accessible by key.
-        preserve
-    }
-
-    ///Behavior of ini-like file reading.
-    static struct ReadOptions
-    {
-        ///Behavior on groups with duplicate names.
-        DuplicateGroupPolicy duplicateGroupPolicy = DuplicateGroupPolicy.throwError;
-        ///Behavior on duplicate keys.
-        DuplicateKeyPolicy duplicateKeyPolicy = DuplicateKeyPolicy.throwError;
-
-        ///Behavior on invalid keys.
-        IniLikeGroup.InvalidKeyPolicy invalidKeyPolicy = IniLikeGroup.InvalidKeyPolicy.throwError;
-
-        ///Whether to preserve comments on reading.
-        Flag!"preserveComments" preserveComments = Yes.preserveComments;
-
-        ///Setting parameters in any order, leaving not mentioned ones in default state.
-        @nogc @safe this(Args...)(Args args) nothrow pure {
-            foreach(arg; args) {
-                assign(arg);
-            }
-        }
-
-        ///
-        unittest
-        {
-            ReadOptions readOptions;
-
-            readOptions = ReadOptions(No.preserveComments);
-            assert(readOptions.duplicateGroupPolicy == DuplicateGroupPolicy.throwError);
-            assert(readOptions.duplicateKeyPolicy == DuplicateKeyPolicy.throwError);
-            assert(!readOptions.preserveComments);
-
-            readOptions = ReadOptions(DuplicateGroupPolicy.skip, DuplicateKeyPolicy.preserve);
-            assert(readOptions.duplicateGroupPolicy == DuplicateGroupPolicy.skip);
-            assert(readOptions.duplicateKeyPolicy == DuplicateKeyPolicy.preserve);
-            assert(readOptions.preserveComments);
-
-            const duplicateGroupPolicy = DuplicateGroupPolicy.preserve;
-            immutable duplicateKeyPolicy = DuplicateKeyPolicy.skip;
-            const preserveComments = No.preserveComments;
-            readOptions = ReadOptions(duplicateGroupPolicy, IniLikeGroup.InvalidKeyPolicy.skip, preserveComments, duplicateKeyPolicy);
-            assert(readOptions.duplicateGroupPolicy == DuplicateGroupPolicy.preserve);
-            assert(readOptions.duplicateKeyPolicy == DuplicateKeyPolicy.skip);
-            assert(readOptions.invalidKeyPolicy == IniLikeGroup.InvalidKeyPolicy.skip);
-        }
-
-        /**
-         * Assign arg to the struct member of corresponding type.
-         * Note:
-         *  It's compile-time error to assign parameter of type which is not part of ReadOptions.
-         */
-        @nogc @safe void assign(T)(T arg) nothrow pure {
-            alias Unqual!(T) ArgType;
-            static if (is(ArgType == DuplicateKeyPolicy)) {
-                duplicateKeyPolicy = arg;
-            } else static if (is(ArgType == DuplicateGroupPolicy)) {
-                duplicateGroupPolicy = arg;
-            } else static if (is(ArgType == Flag!"preserveComments")) {
-                preserveComments = arg;
-            } else static if (is(ArgType == IniLikeGroup.InvalidKeyPolicy)) {
-                invalidKeyPolicy = arg;
-            } else {
-                static assert(false, "Unknown argument type " ~ typeof(arg).stringof);
-            }
-        }
-    }
-
-    ///
-    unittest
-    {
-        string contents = `# The first comment
-[First Entry]
-# Comment
-GenericName=File manager
-GenericName[ru]=Файловый менеджер
-# Another comment
-[Another Group]
-Name=Commander
-# The last comment`;
-
-        alias IniLikeFile.ReadOptions ReadOptions;
-        alias IniLikeFile.DuplicateKeyPolicy DuplicateKeyPolicy;
-        alias IniLikeFile.DuplicateGroupPolicy DuplicateGroupPolicy;
-
-        IniLikeFile ilf = new IniLikeFile(iniLikeStringReader(contents), null, ReadOptions(No.preserveComments));
-        assert(!ilf.readOptions().preserveComments);
-        assert(ilf.leadingComments().empty);
-        assert(equal(
-            ilf.group("First Entry").byIniLine(),
-            [IniLikeLine.fromKeyValue("GenericName", "File manager"), IniLikeLine.fromKeyValue("GenericName[ru]", "Файловый менеджер")]
-        ));
-        assert(equal(
-            ilf.group("Another Group").byIniLine(),
-            [IniLikeLine.fromKeyValue("Name", "Commander")]
-        ));
-
-        contents = `[Group]
-Duplicate=First
-Key=Value
-Duplicate=Second`;
-
-        ilf = new IniLikeFile(iniLikeStringReader(contents), null, ReadOptions(DuplicateKeyPolicy.skip));
-        assert(equal(
-            ilf.group("Group").byIniLine(),
-            [IniLikeLine.fromKeyValue("Duplicate", "First"), IniLikeLine.fromKeyValue("Key", "Value")]
-        ));
-
-        ilf = new IniLikeFile(iniLikeStringReader(contents), null, ReadOptions(DuplicateKeyPolicy.preserve));
-        assert(equal(
-            ilf.group("Group").byIniLine(),
-            [IniLikeLine.fromKeyValue("Duplicate", "First"), IniLikeLine.fromKeyValue("Key", "Value"), IniLikeLine.fromKeyValue("Duplicate", "Second")]
-        ));
-        assert(ilf.group("Group").value("Duplicate") == "First");
-
-        contents = `[Duplicate]
-Key=First
-[Group]
-[Duplicate]
-Key=Second`;
-
-        ilf = new IniLikeFile(iniLikeStringReader(contents), null, ReadOptions(DuplicateGroupPolicy.preserve));
-        auto byGroup = ilf.byGroup();
-        assert(byGroup.front["Key"] == "First");
-        assert(byGroup.back["Key"] == "Second");
-
-        auto byNode = ilf.byNode();
-        assert(byNode.front.group.groupName == "Duplicate");
-        assert(byNode.front.key == "Duplicate");
-        assert(byNode.back.key is null);
-
-        contents = `[Duplicate]
-Key=First
-[Group]
-[Duplicate]
-Key=Second`;
-
-        ilf = new IniLikeFile(iniLikeStringReader(contents), null, ReadOptions(DuplicateGroupPolicy.skip));
-        auto byGroup2 = ilf.byGroup();
-        assert(byGroup2.front["Key"] == "First");
-        assert(byGroup2.back.groupName == "Group");
-    }
-
-    /**
-     * Behavior of ini-like file saving.
-     * See_Also: $(D save)
-     */
-    static struct WriteOptions
-    {
-        ///Whether to preserve comments (lines that starts with '#') on saving.
-        Flag!"preserveComments" preserveComments = Yes.preserveComments;
-        ///Whether to preserve empty lines on saving.
-        Flag!"preserveEmptyLines" preserveEmptyLines = Yes.preserveEmptyLines;
-        /**
-         * Whether to write empty line after each group except for the last.
-         * New line is not written when it already exists before the next group.
-         */
-        Flag!"lineBetweenGroups" lineBetweenGroups = No.lineBetweenGroups;
-
-        /**
-         * Pretty mode. Save comments, skip existing new lines, add line before the next group.
-         */
-        @nogc @safe static auto pretty() nothrow pure {
-            return WriteOptions(Yes.preserveComments, No.preserveEmptyLines, Yes.lineBetweenGroups);
-        }
-
-        /**
-         * Exact mode. Save all comments and empty lines as is.
-         */
-        @nogc @safe static auto exact() nothrow pure {
-            return WriteOptions(Yes.preserveComments, Yes.preserveEmptyLines, No.lineBetweenGroups);
-        }
-
-        @nogc @safe this(Args...)(Args args) nothrow pure {
-            foreach(arg; args) {
-                assign(arg);
-            }
-        }
-
-        /**
-         * Assign arg to the struct member of corresponding type.
-         * Note:
-         *  It's compile-time error to assign parameter of type which is not part of WriteOptions.
-         */
-        @nogc @safe void assign(T)(T arg) nothrow pure {
-            alias Unqual!(T) ArgType;
-            static if (is(ArgType == Flag!"preserveEmptyLines")) {
-                preserveEmptyLines = arg;
-            } else static if (is(ArgType == Flag!"lineBetweenGroups")) {
-                lineBetweenGroups = arg;
-            } else static if (is(ArgType == Flag!"preserveComments")) {
-                preserveComments = arg;
-            } else {
-                static assert(false, "Unknown argument type " ~ typeof(arg).stringof);
-            }
-        }
-    }
-
-    /**
-     * Wrapper for internal $(D ListMap) node.
-     */
-    static struct GroupNode
-    {
-    private:
-        GroupListMap.Node* node;
-    public:
-        /**
-         * Key the group associated with.
-         * While every group has groupName, it might be added to the group list without association, therefore will not have key.
-         */
-        @nogc @trusted string key() const pure nothrow {
-            if (node) {
-                return node.key();
-            } else {
-                return null;
-            }
-        }
-
-        /**
-         * Access underlined group.
-         */
-        @nogc @trusted IniLikeGroup group() pure nothrow {
-            if (node) {
-                return node.value();
-            } else {
-                return null;
-            }
-        }
-
-        /**
-         * Check if underlined node is null.
-         */
-        @nogc @safe bool isNull() pure nothrow const {
-            return node is null;
-        }
-    }
-
-protected:
-    /**
-     * Insert group into $(D IniLikeFile) object and use its name as key.
-     * Prerequisites: group must be non-null. It also should not be held by some other $(D IniLikeFile) object.
-     */
-    @trusted final auto insertGroup(IniLikeGroup group)
-    in {
-        assert(group !is null);
-    }
-    body {
-        return GroupNode(_listMap.insertBack(group.groupName, group));
-    }
-
-    /**
-     * Append group to group list without associating group name with it. Can be used to add groups with duplicated names.
-     * Prerequisites: group must be non-null. It also should not be held by some other $(D IniLikeFile) object.
-     */
-    @trusted final auto putGroup(IniLikeGroup group)
-    in {
-        assert(group !is null);
-    }
-    body {
-        return GroupNode(_listMap.append(group));
-    }
-
-    /**
-     * Add comment before groups.
-     * This function is called only in constructor and can be reimplemented in derived classes.
-     * Params:
-     *  comment = Comment line to add.
-     */
-    @trusted void onLeadingComment(string comment) {
-        if (_readOptions.preserveComments) {
-            appendLeadingComment(comment);
-        }
-    }
-
-    /**
-     * Add comment for group.
-     * This function is called only in constructor and can be reimplemented in derived classes.
-     * Params:
-     *  comment = Comment line to add.
-     *  currentGroup = The group returned recently by createGroup during parsing. Can be null (e.g. if discarded)
-     *  groupName = The name of the currently parsed group. Set even if currentGroup is null.
-     * See_Also: $(D createGroup), $(D IniLikeGroup.appendComment)
-     */
-    @trusted void onCommentInGroup(string comment, IniLikeGroup currentGroup, string groupName)
-    {
-        if (currentGroup && _readOptions.preserveComments) {
-            currentGroup.appendComment(comment);
-        }
-    }
-
-    /**
-     * Add key/value pair for group.
-     * This function is called only in constructor and can be reimplemented in derived classes.
-     * Params:
-     *  key = Key to insert or set.
-     *  value = Value to set for key.
-     *  currentGroup = The group returned recently by createGroup during parsing. Can be null (e.g. if discarded)
-     *  groupName = The name of the currently parsed group. Set even if currentGroup is null.
-     * See_Also: $(D createGroup)
-     */
-    @trusted void onKeyValue(string key, string value, IniLikeGroup currentGroup, string groupName)
-    {
-        if (currentGroup) {
-            if (currentGroup.contains(key)) {
-                final switch(_readOptions.duplicateKeyPolicy) {
-                    case DuplicateKeyPolicy.throwError:
-                        throw new IniLikeEntryException("key already exists", groupName, key, value);
-                    case DuplicateKeyPolicy.skip:
-                        break;
-                    case DuplicateKeyPolicy.preserve:
-                        currentGroup.appendValue(key, value, _readOptions.invalidKeyPolicy);
-                        break;
-                }
-            } else {
-                currentGroup.setValue(key, value, _readOptions.invalidKeyPolicy);
-            }
-        }
-    }
-
-    /**
-     * Create $(D IniLikeGroup) by groupName during file parsing.
-     *
-     * This function can be reimplemented in derived classes,
-     * e.g. to insert additional checks or create specific derived class depending on groupName.
-     * Returned value is later passed to $(D onCommentInGroup) and $(D onKeyValue) methods as currentGroup.
-     * Reimplemented method also is allowed to return null.
-     * Default implementation just returns empty $(D IniLikeGroup) with name set to groupName.
-     * Throws:
-     *  $(D IniLikeGroupException) if group with such name already exists.
-     *  $(D IniLikeException) if groupName is empty.
-     * See_Also:
-     *  $(D onKeyValue), $(D onCommentInGroup)
-     */
-    @trusted IniLikeGroup onGroup(string groupName) {
-        if (group(groupName) !is null) {
-            final switch(_readOptions.duplicateGroupPolicy) {
-                case DuplicateGroupPolicy.throwError:
-                    throw new IniLikeGroupException("group with such name already exists", groupName);
-                case DuplicateGroupPolicy.skip:
-                    return null;
-                case DuplicateGroupPolicy.preserve:
-                    auto toPut = createGroupByName(groupName);
-                    if (toPut) {
-                        putGroup(toPut);
-                    }
-                    return toPut;
-            }
-        } else {
-            auto toInsert = createGroupByName(groupName);
-            if (toInsert) {
-                insertGroup(toInsert);
-            }
-            return toInsert;
-        }
-    }
-
-    /**
-     * Reimplement in derive class.
-     */
-    @trusted IniLikeGroup createGroupByName(string groupName) {
-        return createEmptyGroup(groupName);
-    }
-
-    /**
-     * Can be used in derived classes to create instance of IniLikeGroup.
-     * Throws: $(D IniLikeException) if groupName is empty.
-     */
-    @safe static createEmptyGroup(string groupName) {
-        if (groupName.length == 0) {
-            throw new IniLikeException("empty group name");
-        }
-        return new IniLikeGroup(groupName);
-    }
-public:
-    /**
-     * Construct empty $(D IniLikeFile), i.e. without any groups or values
-     */
-    @nogc @safe this() nothrow {
-
-    }
-
-    /**
-     * Read from file.
-     * Throws:
-     *  $(B ErrnoException) if file could not be opened.
-     *  $(D IniLikeReadException) if error occured while reading the file.
-     */
-    @trusted this(string fileName, ReadOptions readOptions = ReadOptions.init) {
-        this(iniLikeFileReader(fileName), fileName, readOptions);
-    }
-
-    /**
-     * Read from range of $(D inilike.range.IniLikeReader).
-     * Note: All exceptions thrown within constructor are turning into $(D IniLikeReadException).
-     * Throws:
-     *  $(D IniLikeReadException) if error occured while parsing.
-     */
-    this(IniLikeReader)(IniLikeReader reader, string fileName = null, ReadOptions readOptions = ReadOptions.init)
-    {
-        _readOptions = readOptions;
-        size_t lineNumber = 0;
-        IniLikeGroup currentGroup;
-
-        version(DigitalMars) {
-            static void foo(size_t ) {}
-        }
-
-        try {
-            foreach(line; reader.byLeadingLines)
-            {
-                lineNumber++;
-                if (line.isComment || line.strip.empty) {
-                    onLeadingComment(line);
-                } else {
-                    throw new IniLikeException("Expected comment or empty line before any group");
-                }
-            }
-
-            foreach(g; reader.byGroup)
-            {
-                lineNumber++;
-                string groupName = g.groupName;
-
-                version(DigitalMars) {
-                    foo(lineNumber); //fix dmd codgen bug with -O
-                }
-
-                currentGroup = onGroup(groupName);
-
-                foreach(line; g.byEntry)
-                {
-                    lineNumber++;
-
-                    if (line.isComment || line.strip.empty) {
-                        onCommentInGroup(line, currentGroup, groupName);
-                    } else {
-                        const t = parseKeyValue(line);
-
-                        string key = t.key.stripRight;
-                        string value = t.value.stripLeft;
-
-                        if (key.length == 0 && value.length == 0) {
-                            throw new IniLikeException("Expected comment, empty line or key value inside group");
-                        } else {
-                            onKeyValue(key, value, currentGroup, groupName);
-                        }
-                    }
-                }
-            }
-
-            _fileName = fileName;
-
-        }
-        catch(IniLikeEntryException e) {
-            throw new IniLikeReadException(e.msg, lineNumber, fileName, e, e.file, e.line, e.next);
-        }
-        catch (Exception e) {
-            throw new IniLikeReadException(e.msg, lineNumber, fileName, null, e.file, e.line, e.next);
-        }
-    }
-
-    /**
-     * Get group by name.
-     * Returns: $(D IniLikeGroup) instance associated with groupName or null if not found.
-     * See_Also: $(D byGroup)
-     */
-    @nogc @safe final inout(IniLikeGroup) group(string groupName) nothrow inout pure {
-        auto pick = _listMap.getNode(groupName);
-        if (pick) {
-            return pick.value;
-        }
-        return null;
-    }
-
-    /**
-     * Get $(D GroupNode) by groupName.
-     */
-    @nogc @safe final auto getNode(string groupName) nothrow pure {
-        return GroupNode(_listMap.getNode(groupName));
-    }
-
-    /**
-     * Create new group using groupName.
-     * Returns: Newly created instance of $(D IniLikeGroup).
-     * Throws:
-     *  $(D IniLikeGroupException) if group with such name already exists.
-     *  $(D IniLikeException) if groupName is empty.
-     * See_Also: $(D removeGroup), $(D group)
-     */
-    @safe final IniLikeGroup addGenericGroup(string groupName) {
-        if (group(groupName) !is null) {
-            throw new IniLikeGroupException("group already exists", groupName);
-        }
-        auto toReturn = createEmptyGroup(groupName);
-        insertGroup(toReturn);
-        return toReturn;
-    }
-
-    /**
-     * Remove group by name. Do nothing if group with such name does not exist.
-     * Returns: true if group was deleted, false otherwise.
-     * See_Also: $(D addGenericGroup), $(D group)
-     */
-    @safe bool removeGroup(string groupName) nothrow {
-        return _listMap.remove(groupName);
-    }
-
-    /**
-     * Range of groups in order how they were defined in file.
-     * See_Also: $(D group)
-     */
-    @nogc @safe final auto byGroup() inout nothrow {
-        return _listMap.byNode().map!(node => node.value);
-    }
-
-    /**
-     * Iterate over $(D GroupNode)s.
-     */
-    @nogc @safe final auto byNode() nothrow {
-        return _listMap.byNode().map!(node => GroupNode(node));
-    }
-
-    /**
-     * Save object to the file using .ini-like format.
-     * Throws: $(D ErrnoException) if the file could not be opened or an error writing to the file occured.
-     * See_Also: $(D saveToString), $(D save)
-     */
-    @trusted final void saveToFile(string fileName, const WriteOptions options = WriteOptions.exact) const {
-        import std.stdio : File;
-
-        auto f = File(fileName, "w");
-        void dg(in string line) {
-            f.writeln(line);
-        }
-        save(&dg, options);
-    }
-
-    /**
-     * Save object to string using .ini like format.
-     * Returns: A string that represents the contents of file.
-     * Note: The resulting string differs from the contents that would be written to file via $(D saveToFile)
-     * in the way it does not add new line character at the end of the last line.
-     * See_Also: $(D saveToFile), $(D save)
-     */
-    @trusted final string saveToString(const WriteOptions options = WriteOptions.exact) const {
-        auto a = appender!(string[])();
-        save(a, options);
-        return a.data.join("\n");
-    }
-
-    ///
-    unittest
-    {
-        string contents =
-`
-# Leading comment
-[First group]
-# Comment inside
-Key=Value
-[Second group]
-
-Key=Value
-
-[Third group]
-Key=Value`;
-
-        auto ilf = new IniLikeFile(iniLikeStringReader(contents));
-        assert(ilf.saveToString(WriteOptions.exact) == contents);
-
-        assert(ilf.saveToString(WriteOptions.pretty) ==
-`# Leading comment
-[First group]
-# Comment inside
-Key=Value
-
-[Second group]
-Key=Value
-
-[Third group]
-Key=Value`);
-
-        assert(ilf.saveToString(WriteOptions(No.preserveComments, No.preserveEmptyLines)) ==
-`[First group]
-Key=Value
-[Second group]
-Key=Value
-[Third group]
-Key=Value`);
-
-        assert(ilf.saveToString(WriteOptions(No.preserveComments, No.preserveEmptyLines, Yes.lineBetweenGroups)) ==
-`[First group]
-Key=Value
-
-[Second group]
-Key=Value
-
-[Third group]
-Key=Value`);
-    }
-
-    /**
-     * Use Output range or delegate to retrieve strings line by line.
-     * Those strings can be written to the file or be showed in text area.
-     * Note: Output strings don't have trailing newline character.
-     * See_Also: $(D saveToFile), $(D saveToString)
-     */
-    final void save(OutRange)(OutRange sink, const WriteOptions options = WriteOptions.exact) const if (isOutputRange!(OutRange, string)) {
-        foreach(line; leadingComments()) {
-            if (options.preserveComments) {
-                if (line.empty && !options.preserveEmptyLines) {
-                    continue;
-                }
-                put(sink, line);
-            }
-        }
-        bool firstGroup = true;
-        bool lastWasEmpty = false;
-
-        foreach(group; byGroup()) {
-            if (!firstGroup && !lastWasEmpty && options.lineBetweenGroups) {
-                put(sink, "");
-            }
-
-            put(sink, "[" ~ group.groupName ~ "]");
-            foreach(line; group.byIniLine()) {
-                lastWasEmpty = false;
-                if (line.type == IniLikeLine.Type.Comment) {
-                    if (!options.preserveComments) {
-                        continue;
-                    }
-                    if (line.comment.empty) {
-                        if (!options.preserveEmptyLines) {
-                            continue;
-                        }
-                        lastWasEmpty = true;
-                    }
-                    put(sink, line.comment);
-                } else if (line.type == IniLikeLine.Type.KeyValue) {
-                    put(sink, line.key ~ "=" ~ line.value);
-                }
-            }
-            firstGroup = false;
-        }
-    }
-
-    /**
-     * File path where the object was loaded from.
-     * Returns: File name as was specified on the object creation.
-     */
-    @nogc @safe final string fileName() nothrow const pure {
-        return _fileName;
-    }
-
-    /**
-     * Leading comments.
-     * Returns: Range of leading comments (before any group)
-     * See_Also: $(D appendLeadingComment), $(D prependLeadingComment), $(D clearLeadingComments)
-     */
-    @nogc @safe final auto leadingComments() const nothrow pure {
-        return _leadingComments;
-    }
-
-    ///
-    unittest
-    {
-        auto ilf = new IniLikeFile();
-        assert(ilf.appendLeadingComment("First") == "#First");
-        assert(ilf.appendLeadingComment("#Second") == "#Second");
-        assert(ilf.appendLeadingComment("Sneaky\nKey=Value") == "#Sneaky Key=Value");
-        assert(ilf.appendLeadingComment("# New Line\n") == "# New Line");
-        assert(ilf.appendLeadingComment("") == "");
-        assert(ilf.appendLeadingComment("\n") == "");
-        assert(ilf.prependLeadingComment("Shebang") == "#Shebang");
-        assert(ilf.leadingComments().equal(["#Shebang", "#First", "#Second", "#Sneaky Key=Value", "# New Line", "", ""]));
-        ilf.clearLeadingComments();
-        assert(ilf.leadingComments().empty);
-    }
-
-    /**
-     * Add leading comment. This will be appended to the list of leadingComments.
-     * Note: # will be prepended automatically if line is not empty and does not have # at the start.
-     *  The last new line character will be removed if present. Others will be replaced with whitespaces.
-     * Returns: Line that was added as comment.
-     * See_Also: $(D leadingComments), $(D prependLeadingComment)
-     */
-    @safe final string appendLeadingComment(string line) nothrow pure {
-        line = makeComment(line);
-        _leadingComments ~= line;
-        return line;
-    }
-
-    /**
-     * Prepend leading comment (e.g. for setting shebang line).
-     * Returns: Line that was added as comment.
-     * See_Also: $(D leadingComments), $(D appendLeadingComment)
-     */
-    @safe final string prependLeadingComment(string line) nothrow pure {
-        line = makeComment(line);
-        _leadingComments = line ~ _leadingComments;
-        return line;
-    }
-
-    /**
-     * Remove all coments met before groups.
-     * See_Also: $(D leadingComments)
-     */
-    @nogc final @safe void clearLeadingComments() nothrow {
-        _leadingComments = null;
-    }
-
-    /**
-     * Move the group to make it the first.
-     */
-    @trusted final void moveGroupToFront(GroupNode toMove) nothrow pure {
-        _listMap.moveToFront(toMove.node);
-    }
-
-    /**
-     * Move the group to make it the last.
-     */
-    @trusted final void moveGroupToBack(GroupNode toMove) nothrow pure {
-        _listMap.moveToBack(toMove.node);
-    }
-
-    /**
-     * Move group before other.
-     */
-    @trusted final void moveGroupBefore(GroupNode other, GroupNode toMove) nothrow pure {
-        _listMap.moveBefore(other.node, toMove.node);
-    }
-
-    /**
-     * Move group after other.
-     */
-    @trusted final void moveGroupAfter(GroupNode other, GroupNode toMove) nothrow pure {
-        _listMap.moveAfter(other.node, toMove.node);
-    }
-
-    @safe final ReadOptions readOptions() nothrow const pure {
-        return _readOptions;
-    }
-private:
-    string _fileName;
-    GroupListMap _listMap;
-    string[] _leadingComments;
-    ReadOptions _readOptions;
-}
-
-///
-unittest
-{
-    import std.file;
-    import std.path;
-    import std.stdio;
-
-    string contents =
-`# The first comment
-[First Entry]
-# Comment
-GenericName=File manager
-GenericName[ru]=Файловый менеджер
-NeedUnescape=yes\\i\tneed
-NeedUnescape[ru]=да\\я\tнуждаюсь
-# Another comment
-[Another Group]
-Name=Commander
-Comment=Manage files
-# The last comment`;
-
-    auto ilf = new IniLikeFile(iniLikeStringReader(contents), "contents.ini");
-    assert(ilf.fileName() == "contents.ini");
-    assert(equal(ilf.leadingComments(), ["# The first comment"]));
-    assert(ilf.group("First Entry"));
-    assert(ilf.group("Another Group"));
-    assert(ilf.getNode("Another Group").group is ilf.group("Another Group"));
-    assert(ilf.group("NonExistent") is null);
-    assert(ilf.getNode("NonExistent").isNull());
-    assert(ilf.getNode("NonExistent").key() is null);
-    assert(ilf.getNode("NonExistent").group() is null);
-    assert(ilf.saveToString(IniLikeFile.WriteOptions.exact) == contents);
-
-    version(inilikeFileTest)
-    {
-        string tempFile = buildPath(tempDir(), "inilike-unittest-tempfile");
-        try {
-            assertNotThrown!IniLikeReadException(ilf.saveToFile(tempFile));
-            auto fileContents = cast(string)std.file.read(tempFile);
-            static if( __VERSION__ < 2067 ) {
-                assert(equal(fileContents.splitLines, contents.splitLines), "Contents should be preserved as is");
-            } else {
-                assert(equal(fileContents.lineSplitter, contents.lineSplitter), "Contents should be preserved as is");
-            }
-
-            IniLikeFile filf;
-            assertNotThrown!IniLikeReadException(filf = new IniLikeFile(tempFile));
-            assert(filf.fileName() == tempFile);
-            remove(tempFile);
-        } catch(Exception e) {
-            //environmental error in unittests
-        }
-    }
-
-    auto firstEntry = ilf.group("First Entry");
-
-    assert(!firstEntry.contains("NonExistent"));
-    assert(firstEntry.contains("GenericName"));
-    assert(firstEntry.contains("GenericName[ru]"));
-    assert(firstEntry.byNode().filter!(node => node.isNull()).empty);
-    assert(firstEntry["GenericName"] == "File manager");
-    assert(firstEntry.value("GenericName") == "File manager");
-    assert(firstEntry.getNode("GenericName").key == "GenericName");
-    assert(firstEntry.getNode("NonExistent").key is null);
-    assert(firstEntry.getNode("NonExistent").line.type == IniLikeLine.Type.None);
-
-    assert(firstEntry.value("NeedUnescape") == `yes\\i\tneed`);
-    assert(firstEntry.readEntry("NeedUnescape") == "yes\\i\tneed");
-    assert(firstEntry.localizedValue("NeedUnescape", "ru") == `да\\я\tнуждаюсь`);
-    assert(firstEntry.readEntry("NeedUnescape", "ru") == "да\\я\tнуждаюсь");
-
-    firstEntry.writeEntry("NeedEscape", "i\rneed\nescape");
-    assert(firstEntry.value("NeedEscape") == `i\rneed\nescape`);
-    firstEntry.writeEntry("NeedEscape", "ru", "мне\rнужно\nэкранирование");
-    assert(firstEntry.localizedValue("NeedEscape", "ru") == `мне\rнужно\nэкранирование`);
-
-    firstEntry["GenericName"] = "Manager of files";
-    assert(firstEntry["GenericName"] == "Manager of files");
-    firstEntry["Authors"] = "Unknown";
-    assert(firstEntry["Authors"] == "Unknown");
-    firstEntry.getNode("Authors").setValue("Known");
-    assert(firstEntry["Authors"] == "Known");
-
-    assert(firstEntry.localizedValue("GenericName", "ru") == "Файловый менеджер");
-    firstEntry["GenericName", "ru"] = "Менеджер файлов";
-    assert(firstEntry.localizedValue("GenericName", "ru") == "Менеджер файлов");
-    firstEntry.setLocalizedValue("Authors", "ru", "Неизвестны");
-    assert(firstEntry.localizedValue("Authors", "ru") == "Неизвестны");
-
-    firstEntry.removeEntry("GenericName");
-    assert(!firstEntry.contains("GenericName"));
-    firstEntry.removeEntry("GenericName", "ru");
-    assert(!firstEntry.contains("GenericName[ru]"));
-    firstEntry["GenericName"] = "File Manager";
-    assert(firstEntry["GenericName"] == "File Manager");
-
-    assert(ilf.group("Another Group")["Name"] == "Commander");
-    assert(equal(ilf.group("Another Group").byKeyValue(), [ keyValueTuple("Name", "Commander"), keyValueTuple("Comment", "Manage files") ]));
-
-    auto latestCommentNode = ilf.group("Another Group").appendComment("The lastest comment");
-    assert(latestCommentNode.line.comment == "#The lastest comment");
-    latestCommentNode.setValue("The latest comment");
-    assert(latestCommentNode.line.comment == "#The latest comment");
-    assert(ilf.group("Another Group").prependComment("The first comment").line.comment == "#The first comment");
-
-    assert(equal(
-        ilf.group("Another Group").byIniLine(),
-        [IniLikeLine.fromComment("#The first comment"), IniLikeLine.fromKeyValue("Name", "Commander"), IniLikeLine.fromKeyValue("Comment", "Manage files"), IniLikeLine.fromComment("# The last comment"), IniLikeLine.fromComment("#The latest comment")]
-    ));
-
-    auto nameLineNode = ilf.group("Another Group").getNode("Name");
-    assert(nameLineNode.line.value == "Commander");
-    auto commentLineNode = ilf.group("Another Group").getNode("Comment");
-    assert(commentLineNode.line.value == "Manage files");
-
-    ilf.group("Another Group").addCommentAfter(nameLineNode, "Middle comment");
-    ilf.group("Another Group").addCommentBefore(commentLineNode, "Average comment");
-
-    assert(equal(
-        ilf.group("Another Group").byIniLine(),
-        [
-            IniLikeLine.fromComment("#The first comment"), IniLikeLine.fromKeyValue("Name", "Commander"),
-            IniLikeLine.fromComment("#Middle comment"), IniLikeLine.fromComment("#Average comment"),
-            IniLikeLine.fromKeyValue("Comment", "Manage files"), IniLikeLine.fromComment("# The last comment"), IniLikeLine.fromComment("#The latest comment")
-        ]
-    ));
-
-    ilf.group("Another Group").removeEntry(latestCommentNode);
-
-    assert(equal(
-        ilf.group("Another Group").byIniLine(),
-        [
-            IniLikeLine.fromComment("#The first comment"), IniLikeLine.fromKeyValue("Name", "Commander"),
-            IniLikeLine.fromComment("#Middle comment"), IniLikeLine.fromComment("#Average comment"),
-            IniLikeLine.fromKeyValue("Comment", "Manage files"), IniLikeLine.fromComment("# The last comment")
-        ]
-    ));
-
-    assert(equal(ilf.byGroup().map!(g => g.groupName), ["First Entry", "Another Group"]));
-
-    assert(!ilf.removeGroup("NonExistent Group"));
-
-    assert(ilf.removeGroup("Another Group"));
-    assert(!ilf.group("Another Group"));
-    assert(equal(ilf.byGroup().map!(g => g.groupName), ["First Entry"]));
-
-    ilf.addGenericGroup("Another Group");
-    assert(ilf.group("Another Group"));
-    assert(ilf.group("Another Group").byIniLine().empty);
-    assert(ilf.group("Another Group").byKeyValue().empty);
-
-    assertThrown(ilf.addGenericGroup("Another Group"));
-
-    ilf.addGenericGroup("Other Group");
-    assert(equal(ilf.byGroup().map!(g => g.groupName), ["First Entry", "Another Group", "Other Group"]));
-
-    assertThrown!IniLikeException(ilf.addGenericGroup(""));
-
-    import std.range : isForwardRange;
-
-    const IniLikeFile cilf = ilf;
-    static assert(isForwardRange!(typeof(cilf.byGroup())));
-    static assert(isForwardRange!(typeof(cilf.group("First Entry").byKeyValue())));
-    static assert(isForwardRange!(typeof(cilf.group("First Entry").byIniLine())));
-
-    contents =
-`[Group]
-GenericName=File manager
-[Group]
-GenericName=Commander`;
-
-    auto shouldThrow = collectException!IniLikeReadException(new IniLikeFile(iniLikeStringReader(contents), "config.ini"));
-    assert(shouldThrow !is null, "Duplicate groups should throw");
-    assert(shouldThrow.lineNumber == 3);
-    assert(shouldThrow.lineIndex == 2);
-    assert(shouldThrow.fileName == "config.ini");
-
-    contents =
-`[Group]
-Key=Value1
-Key=Value2`;
-
-    shouldThrow = collectException!IniLikeReadException(new IniLikeFile(iniLikeStringReader(contents)));
-    assert(shouldThrow !is null, "Duplicate key should throw");
-    assert(shouldThrow.lineNumber == 3);
-
-    contents =
-`[Group]
-Key=Value
-=File manager`;
-
-    shouldThrow = collectException!IniLikeReadException(new IniLikeFile(iniLikeStringReader(contents)));
-    assert(shouldThrow !is null, "Empty key should throw");
-    assert(shouldThrow.lineNumber == 3);
-
-    contents =
-`[Group]
-#Comment
-Valid=Key
-NotKeyNotGroupNotComment`;
-
-    shouldThrow = collectException!IniLikeReadException(new IniLikeFile(iniLikeStringReader(contents)));
-    assert(shouldThrow !is null, "Invalid entry should throw");
-    assert(shouldThrow.lineNumber == 4);
-
-    contents =
-`#Comment
-NotComment
-[Group]
-Valid=Key`;
-    shouldThrow = collectException!IniLikeReadException(new IniLikeFile(iniLikeStringReader(contents)));
-    assert(shouldThrow !is null, "Invalid comment should throw");
-    assert(shouldThrow.lineNumber == 2);
-
-
-    contents = `# The leading comment
-[One]
-# Comment1
-Key1=Value1
-Key2=Value2
-Key3=Value3
-[Two]
-Key1=Value1
-Key2=Value2
-Key3=Value3
-# Comment2
-[Three]
-Key1=Value1
-Key2=Value2
-# Comment3
-Key3=Value3`;
-
-    ilf = new IniLikeFile(iniLikeStringReader(contents));
-
-    ilf.moveGroupToFront(ilf.getNode("Two"));
-    assert(ilf.byNode().map!(g => g.key).equal(["Two", "One", "Three"]));
-
-    ilf.moveGroupToBack(ilf.getNode("One"));
-    assert(ilf.byNode().map!(g => g.key).equal(["Two", "Three", "One"]));
-
-    ilf.moveGroupBefore(ilf.getNode("Two"), ilf.getNode("Three"));
-    assert(ilf.byGroup().map!(g => g.groupName).equal(["Three", "Two", "One"]));
-
-    ilf.moveGroupAfter(ilf.getNode("Three"), ilf.getNode("One"));
-    assert(ilf.byGroup().map!(g => g.groupName).equal(["Three", "One", "Two"]));
-
-    auto groupOne = ilf.group("One");
-    groupOne.moveLineToFront(groupOne.getNode("Key3"));
-    groupOne.moveLineToBack(groupOne.getNode("Key1"));
-
-    assert(groupOne.byIniLine().equal([
-        IniLikeLine.fromKeyValue("Key3", "Value3"), IniLikeLine.fromComment("# Comment1"),
-        IniLikeLine.fromKeyValue("Key2", "Value2"), IniLikeLine.fromKeyValue("Key1", "Value1")
-    ]));
-
-    auto groupTwo = ilf.group("Two");
-    groupTwo.moveLineBefore(groupTwo.getNode("Key1"), groupTwo.getNode("Key3"));
-    groupTwo.moveLineAfter(groupTwo.getNode("Key2"), groupTwo.getNode("Key1"));
-
-    assert(groupTwo.byIniLine().equal([
-        IniLikeLine.fromKeyValue("Key3", "Value3"), IniLikeLine.fromKeyValue("Key2", "Value2"),
-         IniLikeLine.fromKeyValue("Key1", "Value1"), IniLikeLine.fromComment("# Comment2")
-    ]));
-}
diff --git a/3rdparty/inilike/package.d b/3rdparty/inilike/package.d
deleted file mode 100644
index 9d985916..00000000
--- a/3rdparty/inilike/package.d
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Reading and writing ini-like files used in some Unix systems and Freedesktop specifications.
- * ini-like is informal name for the file format that look like this:
- * ---
-# Comment
-[Group name]
-Key=Value
-# Comment inside group
-AnotherKey=Value
-
-[Another group]
-Key=English value
-Key[fr_FR]=Francais value
-
- * ---
- * Authors:
- *  $(LINK2 https://github.com/FreeSlave, Roman Chistokhodov)
- * Copyright:
- *  Roman Chistokhodov, 2015-2016
- * License:
- *  $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * See_Also:
- *  $(LINK2 http://standards.freedesktop.org/desktop-entry-spec/latest/index.html, Desktop Entry Specification)
- */
-
-module inilike;
-
-public import inilike.common;
-public import inilike.range;
-public import inilike.file;
-
-unittest
-{
-    import std.exception;
-
-    final class DesktopEntry : IniLikeGroup
-    {
-        this() {
-            super("Desktop Entry");
-        }
-    protected:
-        @trusted override void validateKey(string key, string value) const {
-            if (!isValidDesktopFileKey(key)) {
-                throw new IniLikeEntryException("key is invalid", groupName(), key, value);
-            }
-        }
-    }
-
-    final class DesktopFile : IniLikeFile
-    {
-        //Options to manage .ini like file reading
-        static struct DesktopReadOptions
-        {
-            IniLikeFile.ReadOptions baseOptions;
-
-            alias baseOptions this;
-
-            bool skipExtensionGroups;
-            bool ignoreUnknownGroups;
-            bool skipUnknownGroups;
-        }
-
-        @trusted this(IniLikeReader)(IniLikeReader reader, DesktopReadOptions options = DesktopReadOptions.init)
-        {
-            _options = options;
-            super(reader, null, options.baseOptions);
-            enforce(_desktopEntry !is null, new IniLikeReadException("No \"Desktop Entry\" group", 0));
-        }
-
-        @safe override bool removeGroup(string groupName) nothrow {
-            if (groupName == "Desktop Entry") {
-                return false;
-            }
-            return super.removeGroup(groupName);
-        }
-
-    protected:
-        @trusted override IniLikeGroup createGroupByName(string groupName)
-        {
-            if (groupName == "Desktop Entry") {
-                _desktopEntry = new DesktopEntry();
-                return _desktopEntry;
-            } else if (groupName.startsWith("X-")) {
-                if (_options.skipExtensionGroups) {
-                    return null;
-                }
-                return createEmptyGroup(groupName);
-            } else {
-                if (_options.ignoreUnknownGroups) {
-                    if (_options.skipUnknownGroups) {
-                        return null;
-                    } else {
-                        return createEmptyGroup(groupName);
-                    }
-                } else {
-                    throw new IniLikeException("Unknown group");
-                }
-            }
-        }
-
-        inout(DesktopEntry) desktopEntry() inout {
-            return _desktopEntry;
-        }
-
-    private:
-        DesktopEntry _desktopEntry;
-        DesktopReadOptions _options;
-    }
-
-    string contents =
-`# First comment
-[Desktop Entry]
-Key=Value
-# Comment in group`;
-    DesktopFile.DesktopReadOptions options;
-
-    auto df = new DesktopFile(iniLikeStringReader(contents), options);
-    assert(!df.removeGroup("Desktop Entry"));
-    assert(!df.removeGroup("NonExistent"));
-    assert(df.group("Desktop Entry") !is null);
-    assert(df.desktopEntry() !is null);
-    assert(equal(df.desktopEntry().byIniLine(), [IniLikeLine.fromKeyValue("Key", "Value"), IniLikeLine.fromComment("# Comment in group")]));
-    assert(equal(df.leadingComments(), ["# First comment"]));
-
-    assertThrown(df.desktopEntry().writeEntry("$Invalid", "Valid value"));
-
-    IniLikeEntryException entryException;
-    try {
-        df.desktopEntry().writeEntry("$Invalid", "Valid value");
-    } catch(IniLikeEntryException e) {
-        entryException = e;
-    }
-    assert(entryException !is null);
-    df.desktopEntry().writeEntry("$Invalid", "Valid value", IniLikeGroup.InvalidKeyPolicy.save);
-    assert(df.desktopEntry().value("$Invalid") == "Valid value");
-
-    assert(df.desktopEntry().appendValue("Another$Invalid", "Valid value", IniLikeGroup.InvalidKeyPolicy.skip).isNull());
-    assert(df.desktopEntry().setValue("Another$Invalid", "Valid value", IniLikeGroup.InvalidKeyPolicy.skip) is null);
-    assert(df.desktopEntry().value("Another$Invalid") is null);
-
-    contents =
-`[X-SomeGroup]
-Key=Value`;
-
-    auto thrown = collectException!IniLikeReadException(new DesktopFile(iniLikeStringReader(contents)));
-    assert(thrown !is null);
-    assert(thrown.lineNumber == 0);
-
-    contents =
-`[Desktop Entry]
-Valid=Key
-$=Invalid`;
-
-    thrown = collectException!IniLikeReadException(new DesktopFile(iniLikeStringReader(contents)));
-    assert(thrown !is null);
-    assert(thrown.entryException !is null);
-    assert(thrown.entryException.key == "$");
-    assert(thrown.entryException.value == "Invalid");
-
-    options = DesktopFile.DesktopReadOptions.init;
-    options.invalidKeyPolicy = IniLikeGroup.InvalidKeyPolicy.skip;
-    assertNotThrown(new DesktopFile(iniLikeStringReader(contents), options));
-
-    contents =
-`[Desktop Entry]
-Name=Name
-[Unknown]
-Key=Value`;
-
-    assertThrown(new DesktopFile(iniLikeStringReader(contents)));
-
-    options = DesktopFile.DesktopReadOptions.init;
-    options.ignoreUnknownGroups = true;
-
-    assertNotThrown(df = new DesktopFile(iniLikeStringReader(contents), options));
-    assert(df.group("Unknown") !is null);
-
-    options.skipUnknownGroups = true;
-    df = new DesktopFile(iniLikeStringReader(contents), options);
-    assert(df.group("Unknown") is null);
-
-    contents =
-`[Desktop Entry]
-Name=Name1
-[X-Extension]
-Name=Name2`;
-
-    options = DesktopFile.DesktopReadOptions.init;
-    options.skipExtensionGroups = true;
-
-    df = new DesktopFile(iniLikeStringReader(contents), options);
-    assert(df.group("X-Extension") is null);
-}
diff --git a/3rdparty/inilike/range.d b/3rdparty/inilike/range.d
deleted file mode 100644
index 07ba171e..00000000
--- a/3rdparty/inilike/range.d
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Parsing contents of ini-like files via range-based interface.
- * Authors:
- *  $(LINK2 https://github.com/FreeSlave, Roman Chistokhodov)
- * Copyright:
- *  Roman Chistokhodov, 2015-2016
- * License:
- *  $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * See_Also:
- *  $(LINK2 http://standards.freedesktop.org/desktop-entry-spec/latest/index.html, Desktop Entry Specification)
- */
-
-module inilike.range;
-
-import inilike.common;
-
-
-/**
- * Object for iterating through ini-like file entries.
- */
-struct IniLikeReader(Range) if (isInputRange!Range && isSomeString!(ElementType!Range) && is(ElementEncodingType!(ElementType!Range) : char))
-{
-    /**
-     * Construct from other range of strings.
-     */
-    this(Range range)
-    {
-        _range = range;
-    }
-
-    /**
-     * Iterate through lines before any group header. It does not check if all lines are comments or empty lines.
-     */
-    auto byLeadingLines()
-    {
-        return _range.until!(isGroupHeader);
-    }
-
-    /**
-     * Object representing single group (section) being parsed in .ini-like file.
-     */
-    static struct Group(Range)
-    {
-        private this(Range range, ElementType!Range originalLine)
-        {
-            _range = range;
-            _originalLine = originalLine;
-        }
-
-        /**
-         * Name of group being parsed (without brackets).
-         * Note: This can become invalid during parsing the Input Range
-         * (e.g. if string buffer storing this value is reused in later reads).
-         */
-        auto groupName() {
-            return parseGroupHeader(_originalLine);
-        }
-
-        /**
-         * Original line of group header (i.e. name with brackets).
-         * Note: This can become invalid during parsing the Input Range
-         * (e.g. if string buffer storing this value is reused in later reads).
-         */
-        auto originalLine() {
-            return _originalLine;
-        }
-
-        /**
-         * Iterate over group entries - may be key-value pairs as well as comments or empty lines.
-         */
-        auto byEntry()
-        {
-            return _range.until!(isGroupHeader);
-        }
-
-    private:
-        ElementType!Range _originalLine;
-        Range _range;
-    }
-
-    /**
-     * Iterate thorugh groups of .ini-like file.
-     * Returns: Range of Group objects.
-     */
-    auto byGroup()
-    {
-        static struct ByGroup
-        {
-            this(Range range)
-            {
-                _range = range.find!(isGroupHeader);
-                ElementType!Range line;
-                if (!_range.empty) {
-                    line = _range.front;
-                    _range.popFront();
-                }
-                _currentGroup = Group!Range(_range, line);
-            }
-
-            auto front()
-            {
-                return _currentGroup;
-            }
-
-            bool empty()
-            {
-                return _currentGroup.groupName.empty;
-            }
-
-            void popFront()
-            {
-                _range = _range.find!(isGroupHeader);
-                ElementType!Range line;
-                if (!_range.empty) {
-                    line = _range.front;
-                    _range.popFront();
-                }
-                _currentGroup = Group!Range(_range, line);
-            }
-        private:
-            Group!Range _currentGroup;
-            Range _range;
-        }
-
-        return ByGroup(_range.find!(isGroupHeader));
-    }
-private:
-    Range _range;
-}
-
-/**
- * Convenient function for creation of IniLikeReader instance.
- * Params:
- *  range = input range of strings (strings must be without trailing new line characters)
- * Returns: IniLikeReader for given range.
- * See_Also: $(D iniLikeFileReader), $(D iniLikeStringReader)
- */
-auto iniLikeRangeReader(Range)(Range range)
-{
-    return IniLikeReader!Range(range);
-}
-
-///
-unittest
-{
-    string contents =
-`First comment
-Second comment
-[First group]
-KeyValue1
-KeyValue2
-[Second group]
-KeyValue3
-KeyValue4
-[Empty group]
-[Third group]
-KeyValue5
-KeyValue6`;
-    auto r = iniLikeRangeReader(contents.splitLines());
-
-    auto byLeadingLines = r.byLeadingLines;
-
-    assert(byLeadingLines.front == "First comment");
-    assert(byLeadingLines.equal(["First comment", "Second comment"]));
-
-    auto byGroup = r.byGroup;
-
-    assert(byGroup.front.groupName == "First group");
-    assert(byGroup.front.originalLine == "[First group]");
-
-
-    assert(byGroup.front.byEntry.front == "KeyValue1");
-    assert(byGroup.front.byEntry.equal(["KeyValue1", "KeyValue2"]));
-    byGroup.popFront();
-    assert(byGroup.front.groupName == "Second group");
-    byGroup.popFront();
-    assert(byGroup.front.groupName == "Empty group");
-    assert(byGroup.front.byEntry.empty);
-    byGroup.popFront();
-    assert(byGroup.front.groupName == "Third group");
-    byGroup.popFront();
-    assert(byGroup.empty);
-}
-
-/**
- * Convenient function for reading ini-like contents from the file.
- * Throws: $(B ErrnoException) if file could not be opened.
- * Note: This function uses byLineCopy internally. Fallbacks to byLine on older compilers.
- * See_Also: $(D iniLikeRangeReader), $(D iniLikeStringReader)
- */
-@trusted auto iniLikeFileReader(string fileName)
-{
-    import std.stdio : File;
-    static if( __VERSION__ < 2067 ) {
-        return iniLikeRangeReader(File(fileName, "r").byLine().map!(s => s.idup));
-    } else {
-        return iniLikeRangeReader(File(fileName, "r").byLineCopy());
-    }
-}
-
-/**
- * Convenient function for reading ini-like contents from string.
- * Note: on frontends < 2.067 it uses splitLines thereby allocates strings.
- * See_Also: $(D iniLikeRangeReader), $(D iniLikeFileReader)
- */
-@trusted auto iniLikeStringReader(String)(String contents) if (isSomeString!String && is(ElementEncodingType!String : char))
-{
-    static if( __VERSION__ < 2067 ) {
-        return iniLikeRangeReader(contents.splitLines());
-    } else {
-        return iniLikeRangeReader(contents.lineSplitter());
-    }
-}
diff --git a/dub.json b/dub.json
index 50051917..5ce8f741 100644
--- a/dub.json
+++ b/dub.json
@@ -51,7 +51,8 @@
             "libs-windows": ["opengl32"],
             "dependencies": {
                 "derelict-gl3": "~>2.0.0-beta.8",
-                "derelict-ft": "~>2.0.0-beta.5"
+                "derelict-ft": "~>2.0.0-beta.5",
+                "icontheme": "~>1.2.3"
             },
             "dependencies-posix": {
                 "derelict-sdl2": "~>3.0.0-beta.8"
@@ -74,7 +75,8 @@
             "libs-windows": ["opengl32"],
             "dependencies": {
                 "derelict-gl3": "~>2.0.0-beta.8",
-                "derelict-ft": "~>2.0.0-beta.5"
+                "derelict-ft": "~>2.0.0-beta.5",
+                "icontheme": "~>1.2.3"
             }
         },
         {
@@ -86,7 +88,8 @@
             "dependencies-posix": {
                 "derelict-gl3": "~>2.0.0-beta.8",
                 "derelict-sdl2": "~>3.0.0-beta.8",
-                "derelict-ft": "~>2.0.0-beta.5"
+                "derelict-ft": "~>2.0.0-beta.5",
+                "icontheme": "~>1.2.3"
             }
         },
         {
@@ -96,11 +99,12 @@
             "dependencies": {
                 "derelict-gl3": "~>2.0.0-beta.8",
                 "derelict-ft": "~>2.0.0-beta.5",
-                "derelict-sdl2": "~>3.0.0-beta.8"
+                "derelict-sdl2": "~>3.0.0-beta.8",
+                "icontheme": "~>1.2.3"
             },
             "copyFiles-windows-x86_64": [
                 "libs/windows/x86_64/libfreetype-6.dll", 
-                "libs/windows/x86_64/SDL2.dll"
+                "libs/windows/x86_64/SDL2.dll",
             ],
             "copyFiles-windows-x86": [
                 "libs/windows/x86/libfreetype-6.dll", 
@@ -114,7 +118,8 @@
             "dependencies": {
                 "derelict-gl3": "~>2.0.0-beta.8",
                 "derelict-ft": "~>2.0.0-beta.5",
-                "x11": "~>1.0.21"
+                "x11": "~>1.0.21",
+                "icontheme": "~>1.2.3"
             }
         },
         {
@@ -124,7 +129,8 @@
             "dependencies": {
                 "derelict-gl3": "~>2.0.0-beta.7",
                 "derelict-ft": "~>2.0.0-beta.4",
-                "dsfml": "~>2.1.0"
+                "dsfml": "~>2.1.0",
+                "icontheme": "~>1.2.3"
             },
             "copyFiles-windows-x86_64": [
                 "libs/windows/x86_64/libfreetype-6.dll"