diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 94a9ed0..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Plasma 5/Windows 10 Default.colors b/Plasma 5/Windows 10 Default.colors
deleted file mode 100755
index 340737d..0000000
--- a/Plasma 5/Windows 10 Default.colors	
+++ /dev/null
@@ -1,104 +0,0 @@
-[ColorEffects:Disabled]
-Color=56,56,56
-ColorAmount=0
-ColorEffect=0
-ContrastAmount=0.3
-ContrastEffect=1
-IntensityAmount=0.1
-IntensityEffect=0
-
-[ColorEffects:Inactive]
-Color=255,255,255
-ColorAmount=0.1
-ColorEffect=0
-ContrastAmount=0.1
-ContrastEffect=2
-Enable=false
-IntensityAmount=0
-IntensityEffect=0
-
-[Colors:Button]
-BackgroundAlternate=189,195,199
-BackgroundNormal=255,255,255
-DecorationFocus=136,136,136
-DecorationHover=136,136,136
-ForegroundActive=76,76,76
-ForegroundInactive=127,140,141
-ForegroundLink=34,75,160
-ForegroundNegative=218,68,83
-ForegroundNeutral=246,116,0
-ForegroundNormal=49,54,59
-ForegroundPositive=39,174,96
-ForegroundVisited=115,0,255
-
-[Colors:Selection]
-BackgroundAlternate=29,153,243
-BackgroundNormal=204,232,255
-DecorationFocus=136,136,136
-DecorationHover=136,136,136
-ForegroundActive=76,76,76
-ForegroundInactive=239,240,241
-ForegroundLink=34,75,160
-ForegroundNegative=218,68,83
-ForegroundNeutral=246,116,0
-ForegroundNormal=89,89,89
-ForegroundPositive=39,174,96
-ForegroundVisited=115,0,255
-
-[Colors:Tooltip]
-BackgroundAlternate=77,77,77
-BackgroundNormal=255,255,255
-DecorationFocus=136,136,136
-DecorationHover=136,136,136
-ForegroundActive=76,76,76
-ForegroundInactive=189,195,199
-ForegroundLink=34,75,160
-ForegroundNegative=218,68,83
-ForegroundNeutral=246,116,0
-ForegroundNormal=49,54,59
-ForegroundPositive=39,174,96
-ForegroundVisited=115,0,255
-
-[Colors:View]
-BackgroundAlternate=239,240,241
-BackgroundNormal=255,255,255
-DecorationFocus=136,136,136
-DecorationHover=136,136,136
-ForegroundActive=76,76,76
-ForegroundInactive=127,140,141
-ForegroundLink=34,75,160
-ForegroundNegative=218,68,83
-ForegroundNeutral=246,116,0
-ForegroundNormal=49,54,59
-ForegroundPositive=39,174,96
-ForegroundVisited=115,0,255
-
-[Colors:Window]
-BackgroundAlternate=189,195,199
-BackgroundNormal=255,255,255
-DecorationFocus=136,136,136
-DecorationHover=136,136,136
-ForegroundActive=76,76,76
-ForegroundInactive=127,140,141
-ForegroundLink=34,75,160
-ForegroundNegative=218,68,83
-ForegroundNeutral=246,116,0
-ForegroundNormal=49,54,59
-ForegroundPositive=39,174,96
-ForegroundVisited=115,0,255
-
-[General]
-ColorScheme=Windows 10 Default
-Name=Windows 10 Default
-shadeSortColumn=true
-
-[KDE]
-contrast=5
-
-[WM]
-activeBackground=239,240,241
-activeBlend=255,255,255
-activeForeground=49,54,59
-inactiveBackground=255,255,255
-inactiveBlend=185,175,165
-inactiveForeground=40,40,40
diff --git a/Plasma 5/Windows 10 Plasma Theme/colors b/Plasma 5/Windows 10 Plasma Theme/colors
deleted file mode 100755
index 1397759..0000000
--- a/Plasma 5/Windows 10 Plasma Theme/colors	
+++ /dev/null
@@ -1,83 +0,0 @@
-[Colors:Button]
-BackgroundAlternate=218,221,215
-BackgroundNormal=4,10,14
-DecorationFocus=239,132,65
-DecorationHover=0,162,255
-ForegroundActive=255,0,0
-ForegroundInactive=152,154,149
-ForegroundLink=0,0,255
-ForegroundNegative=107,0,0
-ForegroundNeutral=0,90,95
-ForegroundNormal=224,210,214
-ForegroundPositive=0,95,0
-ForegroundVisited=88,55,150
-
-[Colors:Selection]
-BackgroundAlternate=60,131,208
-BackgroundNormal=60,131,208
-DecorationFocus=239,132,65
-DecorationHover=0,162,255
-ForegroundActive=255,0,0
-ForegroundInactive=177,202,232
-ForegroundLink=0,0,255
-ForegroundNegative=107,0,0
-ForegroundNeutral=0,90,95
-ForegroundNormal=255,248,209
-ForegroundPositive=0,95,0
-ForegroundVisited=88,55,150
-
-[Colors:Tooltip]
-BackgroundAlternate=255,248,209
-BackgroundNormal=255,248,209
-DecorationFocus=239,132,65
-DecorationHover=0,162,255
-ForegroundActive=255,0,0
-ForegroundInactive=232,185,149
-ForegroundLink=0,0,255
-ForegroundNegative=107,0,0
-ForegroundNeutral=0,90,95
-ForegroundNormal=200,0,0
-ForegroundPositive=0,95,0
-ForegroundVisited=88,55,150
-
-[Colors:View]
-BackgroundAlternate=85,85,85
-BackgroundNormal=0,0,127
-DecorationFocus=239,132,65
-DecorationHover=0,162,255
-ForegroundActive=242,242,242
-ForegroundInactive=242,242,242
-ForegroundLink=164,192,228
-ForegroundNegative=0,0,0
-ForegroundNeutral=187,187,187
-ForegroundNormal=255,25,255
-ForegroundPositive=0,95,0
-ForegroundVisited=97,147,207
-
-[Colors:Window]
-BackgroundAlternate=40,240,40
-BackgroundNormal=240,238,35
-DecorationFocus=239,132,65
-DecorationHover=0,162,255
-ForegroundActive=255,255,255
-ForegroundInactive=152,152,152
-ForegroundLink=164,192,228
-ForegroundNegative=107,0,0
-ForegroundNeutral=0,90,95
-ForegroundNormal=240,244,248
-ForegroundPositive=0,95,0
-ForegroundVisited=97,147,207
-
-[General]
-ColorScheme=Simplex
-Name=Simplex
-shadeSortColumn=true
-
-[KDE]
-contrast=7
-
-[WM]
-activeBackground=65,142,220
-activeForeground=255,255,255
-inactiveBackground=157,170,186
-inactiveForeground=65,142,220
diff --git a/Plasma 5/Windows 10 Plasma Theme/dialogs/background.svgz b/Plasma 5/Windows 10 Plasma Theme/dialogs/background.svgz
deleted file mode 100755
index 92b0e0b..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/dialogs/background.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/dialogs/kickoff.svgz b/Plasma 5/Windows 10 Plasma Theme/dialogs/kickoff.svgz
deleted file mode 100755
index cb417cf..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/dialogs/kickoff.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/dialogs/krunner.svgz b/Plasma 5/Windows 10 Plasma Theme/dialogs/krunner.svgz
deleted file mode 100755
index 33b89b0..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/dialogs/krunner.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/dialogs/shutdowndialog.svgz b/Plasma 5/Windows 10 Plasma Theme/dialogs/shutdowndialog.svgz
deleted file mode 100755
index 09f2526..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/dialogs/shutdowndialog.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/fifteenPuzzle/blanksquare.svgz b/Plasma 5/Windows 10 Plasma Theme/fifteenPuzzle/blanksquare.svgz
deleted file mode 100755
index e5cc50f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/fifteenPuzzle/blanksquare.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/akonadi.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/akonadi.svgz
deleted file mode 100755
index d0113aa..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/akonadi.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/akregator.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/akregator.svgz
deleted file mode 100755
index ee7edd6..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/akregator.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/amarok.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/amarok.svgz
deleted file mode 100755
index 5a537d6..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/amarok.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/applications.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/applications.svgz
deleted file mode 100755
index 2c91431..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/applications.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/apport.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/apport.svgz
deleted file mode 100755
index 7bb653c..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/apport.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/audio.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/audio.svgz
deleted file mode 100755
index 6446112..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/audio.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/bangarang.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/bangarang.svgz
deleted file mode 100755
index 0b71ada..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/bangarang.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/battery.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/battery.svgz
deleted file mode 100755
index 83c968a..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/battery.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/bookmarks.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/bookmarks.svgz
deleted file mode 100755
index fc7e4e8..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/bookmarks.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/cantata.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/cantata.svgz
deleted file mode 100755
index bfcd0f0..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/cantata.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/choqok.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/choqok.svgz
deleted file mode 100755
index 0e4403d..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/choqok.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/choqok_offline.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/choqok_offline.svgz
deleted file mode 100755
index c0fdd8b..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/choqok_offline.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/computer.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/computer.svgz
deleted file mode 100755
index fa26600..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/computer.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/configure.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/configure.svgz
deleted file mode 100755
index af83952..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/configure.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/device.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/device.svgz
deleted file mode 100755
index 4569b5f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/device.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/dialog.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/dialog.svgz
deleted file mode 100755
index c3c957d..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/dialog.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/document.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/document.svgz
deleted file mode 100755
index e453749..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/document.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/drive.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/drive.svgz
deleted file mode 100755
index 73e6b66..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/drive.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/edit.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/edit.svgz
deleted file mode 100755
index eb83a1e..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/edit.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/fcitx.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/fcitx.svgz
deleted file mode 100755
index 4d8991f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/fcitx.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/go.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/go.svgz
deleted file mode 100755
index b4b5bbc..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/go.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/input.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/input.svgz
deleted file mode 100755
index cf29acd..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/input.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/juk.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/juk.svgz
deleted file mode 100755
index 04d75ec..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/juk.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kaffeine.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kaffeine.svgz
deleted file mode 100755
index 5e5ae7c..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kaffeine.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kalarm.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kalarm.svgz
deleted file mode 100755
index 293f803..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kalarm.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kdeconnect.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kdeconnect.svgz
deleted file mode 100755
index 51ec236..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kdeconnect.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kget.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kget.svgz
deleted file mode 100755
index 44feedb..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kget.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kgpg.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kgpg.svgz
deleted file mode 100755
index 118c55d..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kgpg.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/klipper.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/klipper.svgz
deleted file mode 100755
index c8bca01..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/klipper.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kmail.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kmail.svgz
deleted file mode 100755
index a0bb564..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kmail.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kmess.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kmess.svgz
deleted file mode 100755
index 367f362..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kmess.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/knotes.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/knotes.svgz
deleted file mode 100755
index efca6c8..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/knotes.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/konqueror.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/konqueror.svgz
deleted file mode 100755
index 1bc9abb..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/konqueror.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/konv_message.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/konv_message.svgz
deleted file mode 100755
index 028d97e..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/konv_message.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/konversation.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/konversation.svgz
deleted file mode 100755
index d8bf295..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/konversation.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kopete.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kopete.svgz
deleted file mode 100755
index 532f2bd..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kopete.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/korgac.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/korgac.svgz
deleted file mode 100755
index c6fc394..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/korgac.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kpackagekit.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kpackagekit.svgz
deleted file mode 100755
index c917203..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kpackagekit.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/kteatime.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/kteatime.svgz
deleted file mode 100755
index 89ff59e..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/kteatime.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/ktimer.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/ktimer.svgz
deleted file mode 100755
index 4e47b8c..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/ktimer.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/ktorrent.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/ktorrent.svgz
deleted file mode 100755
index c485481..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/ktorrent.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/list.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/list.svgz
deleted file mode 100755
index 0611276..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/list.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/location.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/location.svgz
deleted file mode 100755
index c050a40..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/location.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/mail-unread-new.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/mail-unread-new.svgz
deleted file mode 100755
index 546a01c..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/mail-unread-new.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/mail.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/mail.svgz
deleted file mode 100755
index ec60d3f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/mail.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/media.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/media.svgz
deleted file mode 100755
index 6c95349..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/media.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/message-indicator.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/message-indicator.svgz
deleted file mode 100755
index 60ec6f8..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/message-indicator.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/nepomuk.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/nepomuk.svgz
deleted file mode 100755
index 5a1785e..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/nepomuk.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/network.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/network.svgz
deleted file mode 100755
index df42ead..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/network.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/notification.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/notification.svgz
deleted file mode 100755
index 5e97ed3..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/notification.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/phone.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/phone.svgz
deleted file mode 100755
index bd1abf3..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/phone.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/plasma-networkmanagement.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/plasma-networkmanagement.svgz
deleted file mode 100755
index df42ead..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/plasma-networkmanagement.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/plasma-networkmanagement2.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/plasma-networkmanagement2.svgz
deleted file mode 100755
index df42ead..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/plasma-networkmanagement2.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/preferences.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/preferences.svgz
deleted file mode 100755
index aac8a6d..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/preferences.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/presence-applet.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/presence-applet.svgz
deleted file mode 100755
index 2eb7fee..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/presence-applet.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/printer.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/printer.svgz
deleted file mode 100755
index a8bfce7..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/printer.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/quassel.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/quassel.svgz
deleted file mode 100755
index a472ed8..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/quassel.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/recorditnow.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/recorditnow.svgz
deleted file mode 100755
index d61acc6..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/recorditnow.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/simpleaudioplayer.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/simpleaudioplayer.svgz
deleted file mode 100755
index 4d66ca0..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/simpleaudioplayer.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/slc.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/slc.svgz
deleted file mode 100755
index 104a97f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/slc.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/smartphone.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/smartphone.svgz
deleted file mode 100755
index d3e5199..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/smartphone.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/software-updates.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/software-updates.svgz
deleted file mode 100755
index c7a0d76..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/software-updates.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/start.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/start.svgz
deleted file mode 100755
index 5900901..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/start.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/system.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/system.svgz
deleted file mode 100755
index 2a0b406..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/system.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/tomahawk.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/tomahawk.svgz
deleted file mode 100755
index 3ed3bb3..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/tomahawk.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/touchpad.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/touchpad.svgz
deleted file mode 100755
index 0d87e88..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/touchpad.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/transmission.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/transmission.svgz
deleted file mode 100755
index 9a61e2a..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/transmission.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/user.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/user.svgz
deleted file mode 100755
index 225f49f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/user.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/video-display.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/video-display.svgz
deleted file mode 100755
index b184741..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/video-display.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/video.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/video.svgz
deleted file mode 100755
index 782d988..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/video.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/view.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/view.svgz
deleted file mode 100755
index d55df1b..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/view.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/wallet.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/wallet.svgz
deleted file mode 100755
index 6887091..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/wallet.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/weather.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/weather.svgz
deleted file mode 100755
index d630beb..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/weather.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/window.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/window.svgz
deleted file mode 100755
index d4144e8..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/window.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/yarock.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/yarock.svgz
deleted file mode 100755
index 324584f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/yarock.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icons/zoom.svgz b/Plasma 5/Windows 10 Plasma Theme/icons/zoom.svgz
deleted file mode 100755
index 671e18c..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icons/zoom.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icontasks/badge.svgz b/Plasma 5/Windows 10 Plasma Theme/icontasks/badge.svgz
deleted file mode 100755
index 5b36b24..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icontasks/badge.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icontasks/dropindicators.svgz b/Plasma 5/Windows 10 Plasma Theme/icontasks/dropindicators.svgz
deleted file mode 100755
index 5ec0132..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icontasks/dropindicators.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icontasks/indicators.svgz b/Plasma 5/Windows 10 Plasma Theme/icontasks/indicators.svgz
deleted file mode 100755
index a5703ba..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icontasks/indicators.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icontasks/launcherseparator.svgz b/Plasma 5/Windows 10 Plasma Theme/icontasks/launcherseparator.svgz
deleted file mode 100755
index 82a5e25..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icontasks/launcherseparator.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/icontasks/progress.svgz b/Plasma 5/Windows 10 Plasma Theme/icontasks/progress.svgz
deleted file mode 100755
index 7d9439e..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/icontasks/progress.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/metadata.desktop b/Plasma 5/Windows 10 Plasma Theme/metadata.desktop
deleted file mode 100755
index ca554fb..0000000
--- a/Plasma 5/Windows 10 Plasma Theme/metadata.desktop	
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=Windows 10 Plasma Theme
-Comment=Plasma Theme simulating a Windows 10 panel; based on Caledonia and Dark Glass 
-
-X-KDE-PluginInfo-Author=Christian Medel (Elbullazul)
-X-KDE-PluginInfo-Email=cmedelahumada@gmail.com
-X-KDE-PluginInfo-Name=Windows 10
-X-KDE-PluginInfo-Version=1.0
-X-KDE-PluginInfo-Website=b00merang.weebly.com
-X-KDE-PluginInfo-Category=Plasma Theme
-X-KDE-PluginInfo-License=GPL v2
-X-KDE-PluginInfo-EnabledByDefault=true
-
-[Wallpaper]
-defaultWallpaperTheme=
-defaultFileSuffix=
-defaultWidth=
-defaultHeight=
-
-
diff --git a/Plasma 5/Windows 10 Plasma Theme/stylesheets/news.css b/Plasma 5/Windows 10 Plasma Theme/stylesheets/news.css
deleted file mode 100755
index 2b1bb3b..0000000
--- a/Plasma 5/Windows 10 Plasma Theme/stylesheets/news.css	
+++ /dev/null
@@ -1,13 +0,0 @@
-.header { font-size:14pt; font-weight:light; color:#1a1a1a; background-color:#f2f2f2; }
-.date { font-size:10pt; font-weight:bold; color:##333333; background-color:#f1f1f1; }
-.line-0 { font-size:10pt; color:#1a1a1a; background-color:#f2f2f2; }
-.line-1 { font-size:10pt; color:#1a1a1a; background-color:#ececec; }
-.time { font-size:8pt; color:#1a1a1a; padding-top:3px; }
-.title, .description { }
-.description { font-size:10pt; }
-.text { width:100%; }
-.title_with_description { font-weight:bold; }
-a { text-decoration:none; color:#1a1a1a; }
-table { width:100%; border-spacing:0px; }
-td { vertical-align: top; }
-body { margin:0px; background-color:#f2f2f2; }
diff --git a/Plasma 5/Windows 10 Plasma Theme/wallpapers/win10.jpg b/Plasma 5/Windows 10 Plasma Theme/wallpapers/win10.jpg
deleted file mode 100755
index 0800831..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/wallpapers/win10.jpg and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/.directory b/Plasma 5/Windows 10 Plasma Theme/widgets/.directory
deleted file mode 100755
index 5126529..0000000
--- a/Plasma 5/Windows 10 Plasma Theme/widgets/.directory	
+++ /dev/null
@@ -1,4 +0,0 @@
-[Dolphin]
-PreviewsShown=true
-Timestamp=2015,11,30,13,56,50
-Version=3
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/action-overlays.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/action-overlays.svgz
deleted file mode 100755
index c3c5deb..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/action-overlays.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/actionbutton.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/actionbutton.svgz
deleted file mode 100755
index a4f537b..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/actionbutton.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/activities.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/activities.svgz
deleted file mode 100755
index 2158cd6..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/activities.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/analog_meter.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/analog_meter.svgz
deleted file mode 100755
index 2c058dd..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/analog_meter.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/arrows.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/arrows.svgz
deleted file mode 100755
index 9f7bd3b..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/arrows.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/background.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/background.svgz
deleted file mode 100755
index 93cc668..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/background.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/bar_meter_horizontal.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/bar_meter_horizontal.svgz
deleted file mode 100755
index 87f010a..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/bar_meter_horizontal.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/bar_meter_vertical.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/bar_meter_vertical.svgz
deleted file mode 100755
index 1a26191..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/bar_meter_vertical.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/branding.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/branding.svgz
deleted file mode 100755
index 242e96a..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/branding.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/busywidget.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/busywidget.svgz
deleted file mode 100755
index 9a2ff50..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/busywidget.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/button.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/button.svgz
deleted file mode 100755
index 52c3a4f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/button.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/calendar.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/calendar.svgz
deleted file mode 100755
index 1b17029..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/calendar.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/clock.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/clock.svgz
deleted file mode 100755
index 8b5fd75..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/clock.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/configuration-icons.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/configuration-icons.svgz
deleted file mode 100755
index 84da69c..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/configuration-icons.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/containment-controls.orig.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/containment-controls.orig.svgz
deleted file mode 100755
index a4f8471..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/containment-controls.orig.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/containment-controls.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/containment-controls.svgz
deleted file mode 100755
index 896c67f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/containment-controls.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/extender-dragger.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/extender-dragger.svgz
deleted file mode 100755
index 8c264af..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/extender-dragger.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/frame.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/frame.svgz
deleted file mode 100755
index 253222a..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/frame.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/line.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/line.svgz
deleted file mode 100755
index f32f1d1..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/line.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/lineedit.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/lineedit.svgz
deleted file mode 100755
index 0e2b83f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/lineedit.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/listitem.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/listitem.svgz
deleted file mode 100755
index 93e1fc5..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/listitem.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/microblog.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/microblog.svgz
deleted file mode 100755
index c17b890..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/microblog.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/notes.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/notes.svgz
deleted file mode 100755
index 4a9481f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/notes.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/pager.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/pager.svgz
deleted file mode 100755
index 9dfd279..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/pager.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/panel-background.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/panel-background.svgz
deleted file mode 100755
index eb409c6..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/panel-background.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/plot-background.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/plot-background.svgz
deleted file mode 100755
index ce264b4..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/plot-background.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/previewer-16.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/previewer-16.svgz
deleted file mode 100755
index b310623..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/previewer-16.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/previewer-22.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/previewer-22.svgz
deleted file mode 100755
index 4ed11ff..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/previewer-22.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/scrollbar.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/scrollbar.svgz
deleted file mode 100755
index 74d767f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/scrollbar.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/scrollwidget.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/scrollwidget.svgz
deleted file mode 100755
index 5e38523..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/scrollwidget.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/slider.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/slider.svgz
deleted file mode 100755
index 9ccf654..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/slider.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/tasks.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/tasks.svgz
deleted file mode 100755
index 1a28d8d..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/tasks.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/timer.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/timer.svgz
deleted file mode 100755
index f7383bc..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/timer.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/toolbox.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/toolbox.svgz
deleted file mode 100755
index e50c05f..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/toolbox.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/tooltip.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/tooltip.svgz
deleted file mode 100755
index a0ec75e..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/tooltip.svgz and /dev/null differ
diff --git a/Plasma 5/Windows 10 Plasma Theme/widgets/viewitem.svgz b/Plasma 5/Windows 10 Plasma Theme/widgets/viewitem.svgz
deleted file mode 100755
index 89e0324..0000000
Binary files a/Plasma 5/Windows 10 Plasma Theme/widgets/viewitem.svgz and /dev/null differ
diff --git a/Plasma 5/Windows X.qtcurve b/Plasma 5/Windows X.qtcurve
deleted file mode 100755
index e68a2e4..0000000
--- a/Plasma 5/Windows X.qtcurve	
+++ /dev/null
@@ -1,173 +0,0 @@
-[ActiveShadows]
-Color=0,0,0
-ColorType=5
-Size=25
-
-[InactiveShadows]
-ColorType=5
-
-[KWin]
-BorderSize=3
-CustomShadows=true
-EdgePad=1
-InnerBorder=0
-OuterBorder=0
-RoundBottom=false
-TitleBarPad=5
-
-[Settings]
-activeTabAppearance=flat
-animatedProgress=false
-appearance=flat
-bgndAppearance=flat
-bgndGrad=horiz
-bgndImage=none
-bgndOpacity=100
-boldProgress=false
-borderInactiveTab=false
-borderMenuitems=true
-borderProgress=false
-borderSbarGroove=false
-borderSelection=false
-borderTab=false
-buttonEffect=none
-centerTabText=false
-colorMenubarMouseOver=true
-colorSelTab=0
-colorSliderMouseOver=false
-coloredMouseOver=none
-coloredTbarMo=false
-comboBtn=none
-comboSplitter=true
-crButton=false
-crColor=none
-crHighlight=5
-crSize=15
-customAlphas=0
-customMenuNormTextColor=#000000
-customMenuSelTextColor=#000000
-customMenuTextColor=false
-customShades=0
-customgradient1=light,0,1.2,0.5,1,1,1
-customgradient2=3d,0,0.9,0.5,1,1,1
-darkerBorders=false
-defBtnIndicator=colored
-dlgOpacity=100
-doubleGtkComboArrow=false
-drawStatusBarFrames=false
-dwtAppearance=flat
-dwtSettings=0
-embolden=false
-etchEntry=true
-expanderHighlight=3
-fadeLines=false
-fillProgress=true
-fillSlider=true
-flatSbarButtons=true
-focus=standard
-forceAlternateLvCols=false
-gbFactor=-3
-gbLabel=0
-glowProgress=none
-grooveAppearance=flat
-groupBox=plain
-gtkButtonOrder=false
-gtkComboMenus=false
-gtkScrollViews=false
-handles=flat
-hideShortcutUnderline=false
-highlightFactor=5
-highlightScrollViews=false
-highlightTab=false
-inactiveTitlebarAppearance=flat
-invertBotTab=true
-lighterPopupMenuBgnd=0
-lvAppearance=flat
-lvButton=false
-lvLines=false
-mapKdeIcons=true
-menuBgndAppearance=flat
-menuBgndGrad=horiz
-menuBgndImage=none
-menuBgndOpacity=100
-menuDelay=225
-menuIcons=true
-menuStripe=none
-menuStripeAppearance=flat
-menubarAppearance=flat
-menubarApps=VirtualBox,smplayer,amarok,arora,kcalc,kaffeine
-menubarHiding=0
-menubarMouseOver=true
-menuitemAppearance=flat
-noBgndGradientApps=all
-noBgndImageApps=
-noBgndOpacityApps=dragon,smplayer,vmplayer,vmware,inkscape,totem,kaffeine,kscreenlocker,sonata
-noMenuBgndOpacityApps=vmplayer,vmware,inkscape,gtk,totem,sonata
-noMenuStripeApps=soffice.bin,gtk
-passwordChar=9679
-popupBorder=true
-progressAppearance=flat
-progressColor=#06B025
-progressGrooveAppearance=flat
-progressGrooveColor=base
-reorderGtkButtons=false
-round=none
-roundAllTabs=false
-roundMbTopOnly=true
-sbarBgndAppearance=flat
-scrollbarType=windows
-selectionAppearance=flat
-shadeCheckRadio=none
-shadeMenubarOnlyWhenActive=false
-shadeMenubars=none
-shadePopupMenu=false
-shadeSliders=none
-shading=hsl
-sliderAppearance=flat
-sliderFill=true
-sliderStyle=r-plain
-sliderThumbs=none
-sliderWidth=15
-smallRadio=false
-sortedLv=darken
-splitterHighlight=3
-splitters=dashes
-square=1602
-statusbarApps=kde
-statusbarHiding=0
-stdBtnSizes=false
-stdSidebarButtons=true
-stripedProgress=none
-stripedSbar=false
-sunkenAppearance=flat
-tabAppearance=flat
-tabBgnd=0
-tabMouseOver=top
-tbarBtnAppearance=none
-tbarBtnEffect=none
-tbarBtns=standard
-thin=5
-thinSbarGroove=false
-titlebarAlignment=left
-titlebarAppearance=none
-titlebarButtonAppearance=flat
-titlebarButtonColors=#FFFFFF,#FFFFFF,#FFFFFF,#FFFFFF,#FFFFFF,#FFFFFF,#FFFFFF,#FFFFFF,#FFFFFF,#808080,#808080,#808080,#31363B,#31363B,#31363B,#31363B,#31363B,#31363B,#C3C3C3,#C3C3C3,#C3C3C3,#282828,#282828,#282828,#282828,#282828,#282828
-titlebarButtons=8248
-titlebarEffect=shadow
-titlebarIcon=menu
-toolbarAppearance=flat
-toolbarBorders=light
-toolbarSeparators=flat
-toolbarTabs=false
-tooltipAppearance=flat
-unifyCombo=false
-unifySpin=false
-unifySpinBtns=false
-useHighlightForMenu=true
-useQtFileDialogApps=googleearth-bin
-vArrows=true
-version=1.8.14
-windowBorder=37
-windowDrag=0
-xCheck=false
-xbar=false
diff --git a/fluxbox/Windows 10/Windows 10.png b/fluxbox/Windows 10/Windows 10.png
deleted file mode 100755
index 1903916..0000000
Binary files a/fluxbox/Windows 10/Windows 10.png and /dev/null differ
diff --git a/fluxbox/Windows 10/pixmaps/bullet.xpm b/fluxbox/Windows 10/pixmaps/bullet.xpm
deleted file mode 100755
index 01fa280..0000000
--- a/fluxbox/Windows 10/pixmaps/bullet.xpm	
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * bullet_xpm[] = {
-"22 22 2 1",
-" 	c None",
-".	c #4C4C4C",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                ..    ",
-"                ...   ",
-"                 ...  ",
-"                  ... ",
-"                   ...",
-"                  ... ",
-"                 ...  ",
-"                ...   ",
-"                ..    ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      "};
diff --git a/fluxbox/Windows 10/pixmaps/bullet_hilight.xpm b/fluxbox/Windows 10/pixmaps/bullet_hilight.xpm
deleted file mode 100755
index 5378ca2..0000000
--- a/fluxbox/Windows 10/pixmaps/bullet_hilight.xpm	
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * bullet_hilight_xpm[] = {
-"22 22 2 1",
-" 	c None",
-".	c #262626",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                ..    ",
-"                ...   ",
-"                 ...  ",
-"                  ... ",
-"                   ...",
-"                  ... ",
-"                 ...  ",
-"                ...   ",
-"                ..    ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      "};
diff --git a/fluxbox/Windows 10/pixmaps/close.xpm b/fluxbox/Windows 10/pixmaps/close.xpm
deleted file mode 100755
index 9bd8a88..0000000
--- a/fluxbox/Windows 10/pixmaps/close.xpm	
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * close_xpm[] = {
-"19 19 3 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #4C4C4C",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-".....+.......+.....",
-"......+.....+......",
-".......+...+.......",
-"........+.+........",
-".........+.........",
-"........+.+........",
-".......+...+.......",
-"......+.....+......",
-".....+.......+.....",
-"...................",
-"...................",
-"...................",
-"...................",
-"..................."};
diff --git a/fluxbox/Windows 10/pixmaps/close_pressed.xpm b/fluxbox/Windows 10/pixmaps/close_pressed.xpm
deleted file mode 100755
index f3f60ba..0000000
--- a/fluxbox/Windows 10/pixmaps/close_pressed.xpm	
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"19 19 3 1",
-" 	c None",
-".	c #FF0000",
-"+	c #FFFFFF",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-".....+.......+.....",
-"......+.....+......",
-".......+...+.......",
-"........+.+........",
-".........+.........",
-"........+.+........",
-".......+...+.......",
-"......+.....+......",
-".....+.......+.....",
-"...................",
-"...................",
-"...................",
-"...................",
-"..................."};
diff --git a/fluxbox/Windows 10/pixmaps/maximize.xpm b/fluxbox/Windows 10/pixmaps/maximize.xpm
deleted file mode 100755
index c1c3313..0000000
--- a/fluxbox/Windows 10/pixmaps/maximize.xpm	
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * maximize_xpm[] = {
-"19 19 3 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #4C4C4C",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-".....+++++++++.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+++++++++.....",
-"...................",
-"...................",
-"...................",
-"...................",
-"..................."};
diff --git a/fluxbox/Windows 10/pixmaps/maximize_pressed.xpm b/fluxbox/Windows 10/pixmaps/maximize_pressed.xpm
deleted file mode 100755
index 6272b3f..0000000
--- a/fluxbox/Windows 10/pixmaps/maximize_pressed.xpm	
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"19 19 3 1",
-" 	c None",
-".	c #969798",
-"+	c #4C4C4C",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-".....+++++++++.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+.......+.....",
-".....+++++++++.....",
-"...................",
-"...................",
-"...................",
-"...................",
-"..................."};
diff --git a/fluxbox/Windows 10/pixmaps/menu_selected.xpm b/fluxbox/Windows 10/pixmaps/menu_selected.xpm
deleted file mode 100755
index 40b7023..0000000
--- a/fluxbox/Windows 10/pixmaps/menu_selected.xpm	
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * menu_selected_xpm[] = {
-"22 22 2 1",
-" 	c None",
-".	c #4C4C4C",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"                   .. ",
-"                  ... ",
-"                 ...  ",
-"                ...   ",
-"               ...    ",
-"              ...     ",
-"             ...      ",
-"   ..       ...       ",
-"   ...     ...        ",
-"    ...   ...         ",
-"     ... ...          ",
-"      .....           ",
-"       ...            ",
-"        .             "};
diff --git a/fluxbox/Windows 10/pixmaps/minimize.xpm b/fluxbox/Windows 10/pixmaps/minimize.xpm
deleted file mode 100755
index 45ad866..0000000
--- a/fluxbox/Windows 10/pixmaps/minimize.xpm	
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * minimize_xpm[] = {
-"19 19 3 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #4C4C4C",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-".....+++++++++.....",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"..................."};
diff --git a/fluxbox/Windows 10/pixmaps/minimize_pressed.xpm b/fluxbox/Windows 10/pixmaps/minimize_pressed.xpm
deleted file mode 100755
index 1c3bc17..0000000
--- a/fluxbox/Windows 10/pixmaps/minimize_pressed.xpm	
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * minimize_pressed_xpm[] = {
-"19 19 3 1",
-" 	c None",
-".	c #969798",
-"+	c #4C4C4C",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-".....+++++++++.....",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"..................."};
diff --git a/fluxbox/Windows 10/pixmaps/stick.xpm b/fluxbox/Windows 10/pixmaps/stick.xpm
deleted file mode 100755
index 3af9c68..0000000
--- a/fluxbox/Windows 10/pixmaps/stick.xpm	
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * stick_xpm[] = {
-"19 19 2 1",
-" 	c None",
-".	c #FFFFFF",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"..................."};
diff --git a/fluxbox/Windows 10/pixmaps/stuck.xpm b/fluxbox/Windows 10/pixmaps/stuck.xpm
deleted file mode 100755
index 4c17f7d..0000000
--- a/fluxbox/Windows 10/pixmaps/stuck.xpm	
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * stuck_xpm[] = {
-"19 19 3 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #4C4C4C",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-".......+++++.......",
-"........+++........",
-"........+++........",
-"........+++........",
-"........+++........",
-".......+++++.......",
-".........+.........",
-".........+.........",
-".........+.........",
-"...................",
-"...................",
-"...................",
-"...................",
-"..................."};
diff --git a/fluxbox/Windows 10/pixmaps/stuck_unfocus.xpm b/fluxbox/Windows 10/pixmaps/stuck_unfocus.xpm
deleted file mode 100755
index 2f4e886..0000000
--- a/fluxbox/Windows 10/pixmaps/stuck_unfocus.xpm	
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * stuck_unfocus_xpm[] = {
-"19 19 3 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #4C4C4C",
-"...................",
-"...................",
-"...................",
-"...................",
-"...................",
-"........+++........",
-"........+++........",
-"........+++........",
-"........+++........",
-"........+++........",
-".......+++++.......",
-".........+.........",
-".........+.........",
-".........+.........",
-"...................",
-"...................",
-"...................",
-"...................",
-"..................."};
diff --git a/fluxbox/Windows 10/theme.cfg b/fluxbox/Windows 10/theme.cfg
deleted file mode 100755
index 968a4bf..0000000
--- a/fluxbox/Windows 10/theme.cfg	
+++ /dev/null
@@ -1,115 +0,0 @@
-# Name : Windows 10 for Fluxbox
-# Author : Elbullazul (Christian Medel) <cmedelahumada@gmail.com>
-# Date : Jan 15 2016
-# Comment : Edited from Ciremai Fluxbox style
-# http://b00merang.weebly.com
-
-###########
-# TOOLBAR #
-###########
-# General settings
-toolbar: flat
-toolbar.color: #000
-toolbar.height: 35
-toolbar.alpha: 150
-
-# Clock
-toolbar.clock.font: sans-8
-toolbar.clock.textColor: #fff
-toolbar.clock.justify: center
-toolbar.clock: flat
-toolbar.clock.color: #000
-
-# Workspace
-toolbar.workspace.font: sans-8
-toolbar.workspace.textColor: #fff
-toolbar.workspace.justify: center
-toolbar.workspace: flat
-toolbar.workspace.color: #000
-
-# Iconbar
-toolbar.iconbar.focused.font: sans-8
-toolbar.iconbar.focused.textColor: #fff
-toolbar.iconbar.focused.justify: center
-toolbar.iconbar.focused: flat
-toolbar.iconbar.focused.color: #004D8C
-
-toolbar.iconbar.unfocused.font: sans-8
-toolbar.iconbar.unfocused.textColor: #fff
-toolbar.iconbar.unfocused.justify: center
-toolbar.iconbar.unfocused: flat
-toolbar.iconbar.unfocused.color: #000
-
-
-###########
-# WINDOWS #
-###########
-# General settings
-window.font: sans-10
-window.justify: center
-window.borderWidth:	1
-window.borderColor: #f1f1f1
-window.title.height: 20
-
-# Label
-window.label.focus: flat
-window.label.focus.color: #ffffff
-window.label.focus.textColor: #4c4c4c
-window.label.unfocus: flat
-window.label.unfocus.color: #ffffff
-window.label.unfocus.textColor: #8c8c8c
-
-# Buttons
-window.close.pixmap: close.xpm
-window.close.unfocus.pixmap: close.xpm
-window.close.pressed.pixmap: close_pressed.xpm
-	
-window.maximize.pixmap: maximize.xpm
-window.maximize.unfocus.pixmap: maximize.xpm
-window.maximize.pressed.pixmap: maximize_pressed.xpm
-	
-window.iconify.pixmap: minimize.xpm
-window.iconify.unfocus.pixmap: minimize.xpm
-window.iconify.pressed.pixmap: minimize_pressed.xpm
-
-window.stick.pixmap: stick.xpm
-window.stick.unfocus.pixmap: stick.xpm
-window.stick.pressed.pixmap: stuck.xpm
-
-window.stuck.pixmap: stuck.xpm
-window.stuck.unfocus.pixmap: stuck_unfocus.xpm
-window.stuck.pressed.pixmap: stick.xpm
-
-
-########
-# Menu #
-########
-# General settings
-menu.bevelWidth: 3
-menu.itemHeight: 30
-
-# Title
-menu.title.font: sans-0
-menu.title: flat
-menu.title.color: #ffffff
-
-# Frame
-menu.frame.font: sans-8
-menu.frame.textColor: #4c4c4c
-menu.frame.disableColor: #8c8c8c
-menu.frame.justify: left
-menu.frame: flat
-menu.borderColor: #f1f1f1
-menu.borderWidth: 1
-menu.frame.color: #ffffff
-
-# Hilite
-menu.hilite.textColor: #1f1f1f
-menu.hilite: flat
-menu.hilite.color: #cce8ff
-menu.hilite.submenu.pixmap: bullet_hilight.xpm
-
-# Details
-menu.bullet.position: right
-menu.submenu.pixmap: bullet.xpm
-menu.selected.pixmap: menu_selected.xpm
diff --git a/gtk-2.0/Apps/gnome-panel.rc b/gtk-2.0/Apps/panel.rc
similarity index 77%
rename from gtk-2.0/Apps/gnome-panel.rc
rename to gtk-2.0/Apps/panel.rc
index b7882bc..0df8c39 100644
--- a/gtk-2.0/Apps/gnome-panel.rc
+++ b/gtk-2.0/Apps/panel.rc
@@ -2,23 +2,6 @@
 # GNOME,XFCE,LXDE & GTK Desktop(S) PANEL SPECIFIC SETTINGS *SPECIFIC SETTINGS TO ENABLE PROPER FUNCTION ON XFCE/LXDE*
 # ===========================================================================================================================
 
-style "panel" = "dark"
-{
-	xthickness = 0
-	ythickness = 0
-
-	bg_pixmap[NORMAL]	= "Panel/panel.png"
-	base[NORMAL] 		= "#000000"
-	bg[NORMAL] 			= "#151515"
-	bg[PRELIGHT]		= "#1f1f1f"	
-	bg[SELECTED]		= "#004D8C"
-	text[NORMAL]		= @fg_color_dark
-
-	engine "murrine" {
-		colorize_scrollbar = FALSE
-	}
-}
-
 style "panel_task_button" = "dark"
 {
 	xthickness = 3
@@ -112,16 +95,6 @@ style "XFCE"
 	bg_pixmap[NORMAL]	= "Panel/panel.png"
 }
 
-widget "*Panel*"                  style "panel"
-widget "*PanelWidget*"            style "panel"
-widget "*PanelApplet*"            style "panel"
-widget "*fast-user-switch*"       style "panel" # workaround for Fast User Switch applet
-widget "*CPUFreqApplet*"          style "panel" # workaround for CpuFreq Applet
-class "PanelApp*"                 style "panel"
-class "PanelToplevel*"            style "panel"
-#widget_class "*Mail*"            style "panel"
-widget_class "*notif*"            style "panel"
-
 #widget_class "*?anel*utton"      style "panel_task_button" # causing problems to monodevelop
 widget "*task*"                   style "panel_task_button"
 widget "*.tasklist-button"        style "panel_task_button"
diff --git a/gtk-2.0/Panel/arrow-down.png b/gtk-2.0/Panel/arrow-down.png
deleted file mode 100644
index 459c801..0000000
Binary files a/gtk-2.0/Panel/arrow-down.png and /dev/null differ
diff --git a/gtk-2.0/Panel/bc.png b/gtk-2.0/Panel/bc.png
deleted file mode 100644
index c378cd8..0000000
Binary files a/gtk-2.0/Panel/bc.png and /dev/null differ
diff --git a/gtk-2.0/Panel/handle-h.png b/gtk-2.0/Panel/handle-h.png
deleted file mode 100644
index fa6c44f..0000000
Binary files a/gtk-2.0/Panel/handle-h.png and /dev/null differ
diff --git a/gtk-2.0/Panel/handle-v.png b/gtk-2.0/Panel/handle-v.png
deleted file mode 100644
index fa6c44f..0000000
Binary files a/gtk-2.0/Panel/handle-v.png and /dev/null differ
diff --git a/gtk-2.0/Panel/mode-center-normal.png b/gtk-2.0/Panel/mode-center-normal.png
deleted file mode 100644
index 1766ef3..0000000
Binary files a/gtk-2.0/Panel/mode-center-normal.png and /dev/null differ
diff --git a/gtk-2.0/Panel/mode-center-prelight.png b/gtk-2.0/Panel/mode-center-prelight.png
deleted file mode 100644
index 3e8b974..0000000
Binary files a/gtk-2.0/Panel/mode-center-prelight.png and /dev/null differ
diff --git a/gtk-2.0/Panel/mode-center-pressed.png b/gtk-2.0/Panel/mode-center-pressed.png
deleted file mode 100644
index 13ccee7..0000000
Binary files a/gtk-2.0/Panel/mode-center-pressed.png and /dev/null differ
diff --git a/gtk-2.0/Panel/mode-left-normal.png b/gtk-2.0/Panel/mode-left-normal.png
deleted file mode 100644
index e20f66b..0000000
Binary files a/gtk-2.0/Panel/mode-left-normal.png and /dev/null differ
diff --git a/gtk-2.0/Panel/mode-left-prelight.png b/gtk-2.0/Panel/mode-left-prelight.png
deleted file mode 100644
index fa7f3cf..0000000
Binary files a/gtk-2.0/Panel/mode-left-prelight.png and /dev/null differ
diff --git a/gtk-2.0/Panel/mode-left-pressed.png b/gtk-2.0/Panel/mode-left-pressed.png
deleted file mode 100644
index 9991d05..0000000
Binary files a/gtk-2.0/Panel/mode-left-pressed.png and /dev/null differ
diff --git a/gtk-2.0/Panel/mode-right-normal.png b/gtk-2.0/Panel/mode-right-normal.png
deleted file mode 100644
index d46ec88..0000000
Binary files a/gtk-2.0/Panel/mode-right-normal.png and /dev/null differ
diff --git a/gtk-2.0/Panel/mode-right-prelight.png b/gtk-2.0/Panel/mode-right-prelight.png
deleted file mode 100644
index d6aea28..0000000
Binary files a/gtk-2.0/Panel/mode-right-prelight.png and /dev/null differ
diff --git a/gtk-2.0/Panel/mode-right-pressed.png b/gtk-2.0/Panel/mode-right-pressed.png
deleted file mode 100644
index c2be821..0000000
Binary files a/gtk-2.0/Panel/mode-right-pressed.png and /dev/null differ
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index a95b791..fb2e1bf 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -3,7 +3,7 @@
 # date: April 7th, 2016
 # description: Windows 10 Default white color
 
-gtk-color-scheme = "bg_color:#ffffff\nfg_color:#4c4c4c\nbase_color:#ffffff\ntext_color:#4c4c4c\nselected_bg_color:#cce8ff\nselected_fg_color:#262626\ntooltip_bg_color:#ffffff\ntooltip_fg_color:#4c4c4c\ntitlebar_bg_color:#ffffff\ntitlebar_fg_color:#4c4c4c\nmenubar_bg_color:#ffffff\nmenubar_fg_color:#4c4c4c\ntoolbar_bg_color:#ffffff\ntoolbar_fg_color:#4c4c4c\nmenu_bg_color:#ffffff\nmenu_fg_color:#4c4c4c\npanel_bg_color:#b5adad\npanel_fg_color:#ffffff\nlink_color:#224ba0\nbg_color_dark:#000000\nfg_color_dark:#b7b7b7"
+gtk-color-scheme = "bg_color:#ffffff\nfg_color:#4c4c4c\nbase_color:#ffffff\ntext_color:#4c4c4c\nselected_bg_color:#cce8ff\nselected_fg_color:#262626\ntooltip_bg_color:#ffffff\ntooltip_fg_color:#4c4c4c\ntitlebar_bg_color:#ffffff\ntitlebar_fg_color:#4c4c4c\nmenubar_bg_color:#ffffff\nmenubar_fg_color:#4c4c4c\ntoolbar_bg_color:#ffffff\ntoolbar_fg_color:#4c4c4c\nmenu_bg_color:#ffffff\nmenu_fg_color:#4c4c4c\npanel_bg_color:#0c0c0c\npanel_fg_color:#ffffff\nlink_color:#224ba0\nbg_color_dark:#000000\nfg_color_dark:#b7b7b7"
 
 # Default Style
 
@@ -781,7 +781,7 @@ include "Apps/ff.rc"
 #include "Apps/gnome-terminal.rc"
 #include "Apps/nautilus.rc"
 #include "Apps/filemanager.rc"
-include "Apps/gnome-panel.rc"
+include "Apps/panel.rc"
 #include "Apps/panel-menus.rc"
 include "Apps/mintmenu.rc"
 #include "Apps/mate.rc"
diff --git a/gtk-2.0/menu.png b/gtk-2.0/menu.png
deleted file mode 100644
index 2ce6dd2..0000000
Binary files a/gtk-2.0/menu.png and /dev/null differ
diff --git a/gtk-3.20/apps/desktop.css b/gtk-3.20/apps/desktop.css
deleted file mode 100644
index 4738e26..0000000
--- a/gtk-3.20/apps/desktop.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.caja-desktop,
-.nemo-desktop.nemo-canvas-item,
-.nautilus-desktop.nautilus-canvas-item {
-    color: @desktop_item_fg;
-    text-shadow: 1px 1px @desktop_item_text_shadow;
-}
-
-.caja-desktop:active,
-.nemo-desktop.nemo-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:active {
-    color: @desktop_item_fg;
-}
-
-.caja-desktop:selected
-.nemo-desktop.nemo-canvas-item:selected,
-.nautilus-desktop.nautilus-canvas-item:selected {
-    color: @desktop_item_selected_fg;
-    text-shadow: none;
-}
diff --git a/gtk-3.20/apps/gnome-terminal.css b/gtk-3.20/apps/gnome-terminal.css
deleted file mode 100644
index d5f3827..0000000
--- a/gtk-3.20/apps/gnome-terminal.css
+++ /dev/null
@@ -1,5 +0,0 @@
-vte-terminal.terminal-screen {
-    -TerminalScreen-background-darkness: 0.95;
-    background-color: #000;
-    color: #fff;
-}
diff --git a/gtk-3.20/assets/checkbox-checked-insensitive-unfocused.png b/gtk-3.20/assets/checkbox-checked-insensitive-unfocused.png
new file mode 120000
index 0000000..bee0db8
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-checked-insensitive-unfocused.png
@@ -0,0 +1 @@
+checkbox-checked-insensitive.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-checked-insensitive-unfocused@2.png b/gtk-3.20/assets/checkbox-checked-insensitive-unfocused@2.png
new file mode 120000
index 0000000..b9fd77a
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-checked-insensitive-unfocused@2.png
@@ -0,0 +1 @@
+checkbox-checked-insensitive@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-checked-unfocused.png b/gtk-3.20/assets/checkbox-checked-unfocused.png
new file mode 120000
index 0000000..d506341
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-checked-unfocused.png
@@ -0,0 +1 @@
+checkbox-checked.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-checked-unfocused@2.png b/gtk-3.20/assets/checkbox-checked-unfocused@2.png
new file mode 120000
index 0000000..42d522a
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-checked-unfocused@2.png
@@ -0,0 +1 @@
+checkbox-checked@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-mixed-insensitive-unfocused.png b/gtk-3.20/assets/checkbox-mixed-insensitive-unfocused.png
new file mode 120000
index 0000000..0cd5385
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-mixed-insensitive-unfocused.png
@@ -0,0 +1 @@
+checkbox-mixed-insensitive.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-mixed-insensitive-unfocused@2.png b/gtk-3.20/assets/checkbox-mixed-insensitive-unfocused@2.png
new file mode 120000
index 0000000..ebe84c9
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-mixed-insensitive-unfocused@2.png
@@ -0,0 +1 @@
+checkbox-mixed-insensitive@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-mixed-unfocused.png b/gtk-3.20/assets/checkbox-mixed-unfocused.png
new file mode 120000
index 0000000..1565756
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-mixed-unfocused.png
@@ -0,0 +1 @@
+checkbox-mixed.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-mixed-unfocused@2.png b/gtk-3.20/assets/checkbox-mixed-unfocused@2.png
new file mode 120000
index 0000000..017ff4a
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-mixed-unfocused@2.png
@@ -0,0 +1 @@
+checkbox-mixed@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-unchecked-insensitive-unfocused.png b/gtk-3.20/assets/checkbox-unchecked-insensitive-unfocused.png
new file mode 120000
index 0000000..e7ed300
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-unchecked-insensitive-unfocused.png
@@ -0,0 +1 @@
+checkbox-unchecked-insensitive.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-unchecked-insensitive-unfocused@2.png b/gtk-3.20/assets/checkbox-unchecked-insensitive-unfocused@2.png
new file mode 120000
index 0000000..cd89e8d
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-unchecked-insensitive-unfocused@2.png
@@ -0,0 +1 @@
+checkbox-unchecked-insensitive@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-unchecked-unfocused.png b/gtk-3.20/assets/checkbox-unchecked-unfocused.png
new file mode 120000
index 0000000..7cf9646
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-unchecked-unfocused.png
@@ -0,0 +1 @@
+checkbox-unchecked.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/checkbox-unchecked-unfocused@2.png b/gtk-3.20/assets/checkbox-unchecked-unfocused@2.png
new file mode 120000
index 0000000..f7af06b
--- /dev/null
+++ b/gtk-3.20/assets/checkbox-unchecked-unfocused@2.png
@@ -0,0 +1 @@
+checkbox-unchecked@2.png
\ No newline at end of file
diff --git a/gtk-3.20/buttons/close-focused-pressed.png b/gtk-3.20/assets/close-active.png
similarity index 100%
rename from gtk-3.20/buttons/close-focused-pressed.png
rename to gtk-3.20/assets/close-active.png
diff --git a/gtk-3.20/buttons/close-focused-normal.png b/gtk-3.20/assets/close-backdrop.png
similarity index 100%
rename from gtk-3.20/buttons/close-focused-normal.png
rename to gtk-3.20/assets/close-backdrop.png
diff --git a/gtk-3.20/buttons/close-focused-active.png b/gtk-3.20/assets/close-hover.png
similarity index 100%
rename from gtk-3.20/buttons/close-focused-active.png
rename to gtk-3.20/assets/close-hover.png
diff --git a/gtk-3.20/buttons/close-unfocused-normal.png b/gtk-3.20/assets/close-normal.png
similarity index 100%
rename from gtk-3.20/buttons/close-unfocused-normal.png
rename to gtk-3.20/assets/close-normal.png
diff --git a/gtk-3.20/assets/down.svg b/gtk-3.20/assets/down.svg
new file mode 100755
index 0000000..10b6b0e
--- /dev/null
+++ b/gtk-3.20/assets/down.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="7mm"
+   height="6mm"
+   viewBox="0 0 7 6"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="down.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="19.221578"
+     inkscape:cy="-0.44527318"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4537"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1358"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0.00468177,-0.01050555)">
+    <g
+       transform="translate(-0.00468177,0.01050555)"
+       id="g4537">
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 0,0.5 V 0 H 0.5 1 1.5 2 2.5 3 L 2.875,0.375 Q 2.75,0.75 2.5,1 2.25,1.25 2,1.5 1.75,1.75 1.5,2 1.25,2.25 1,2.5 0.75,2.75 0.375,2.875 L 0,3 V 2.5 2 1.5 1 0.5"
+         id="path4529"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#808080;fill-opacity:1"
+         d="M 4.125,5.6250003 4,6.0000003 H 3.5 l -0.5,0 -0.125,-0.375 q -0.125,-0.375 -0.375,-0.625 -0.25,-0.25 -0.5,-0.5 -0.25,-0.25 -0.5,-0.5 -0.25,-0.25 -0.5,-0.5 -0.25,-0.25 -0.625,-0.375 L 0,3.0000003 v -0.5 l 0,-0.5 v -0.5 -0.5 V 0.50000033 3.3378601e-7 H 0.5 1 L 1.125,0.37500033 q 0.125,0.375 0.375,0.62499997 0.25,0.25 0.5,0.5 0.25,0.25 0.5,0.5 0.25,0.25 0.5,0.5 0.25,0.25 0.5,0.25 0.25,0 0.5,-0.25 0.25,-0.25 0.5,-0.5 0.25,-0.25 0.5,-0.5 0.25,-0.25 0.5,-0.5 Q 5.75,0.75000033 5.875,0.37500033 L 6,3.3378601e-7 H 6.5 7 V 0.50000033 1.0000003 v 0.5 0.5 l 0,0.5 v 0.5 l -0.375,0.125 q -0.375,0.125 -0.625,0.375 -0.25,0.25 -0.5,0.5 -0.25,0.25 -0.5,0.5 -0.25,0.25 -0.5,0.5 -0.25,0.25 -0.375,0.625"
+         id="path4531"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 4.125,0.375 4,0 H 4.5 5 5.5 6 6.5 7 V 0.5 1 1.5 2 2.5 3 L 6.625,2.875 Q 6.25,2.75 6,2.5 5.75,2.25 5.5,2 5.25,1.75 5,1.5 4.75,1.25 4.5,1 4.25,0.75 4.125,0.375"
+         id="path4533"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 3,3.5 Q 3.25,3.25 3.5,3.25 3.75,3.25 4,3.5 4.25,3.75 4.5,4 4.75,4.25 5,4.5 5.25,4.75 5.5,5 5.75,5.25 5.875,5.625 L 6,6 H 5.5 5 4.5 4 3.5 3 2.5 2 1.5 1 L 1.125,5.625 Q 1.25,5.25 1.5,5 1.75,4.75 2,4.5 2.25,4.25 2.5,4 2.75,3.75 3,3.5"
+         id="path4535"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/gtk-3.20/assets/left.svg b/gtk-3.20/assets/left.svg
new file mode 100755
index 0000000..f6edfbb
--- /dev/null
+++ b/gtk-3.20/assets/left.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="6mm"
+   height="7mm"
+   viewBox="0 0 6 7"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="left.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="19.221578"
+     inkscape:cy="-0.44527318"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4537"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1358"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-0.49531806,0.48949428)">
+    <g
+       transform="translate(-0.00468177,0.01050555)"
+       id="g4537">
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 0,0.5 V 0 H 0.5 1 1.5 2 2.5 3 L 2.875,0.375 Q 2.75,0.75 2.5,1 2.25,1.25 2,1.5 1.75,1.75 1.5,2 1.25,2.25 1,2.5 0.75,2.75 0.375,2.875 L 0,3 V 2.5 2 1.5 1 0.5"
+         id="path4529"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#808080;fill-opacity:1"
+         d="m 0.87499983,3.6250002 -0.375,-0.125 v -0.5 -0.5 l 0.375,-0.125 q 0.37499997,-0.125 0.62499997,-0.375 0.25,-0.25 0.5,-0.5 0.25,-0.25 0.5,-0.5 0.25,-0.25000003 0.5,-0.50000003 0.25,-0.25 0.375,-0.625 l 0.125,-0.375 h 0.5 0.5 0.5 0.5 0.5 0.5 V 1.66893e-7 0.50000017 l -0.375,0.125 q -0.375,0.125 -0.625,0.37500003 -0.25,0.25 -0.5,0.5 -0.25,0.25 -0.5,0.5 -0.25,0.25 -0.5,0.5 -0.25,0.25 -0.25,0.5 0,0.25 0.25,0.5 0.25,0.25 0.5,0.5 0.25,0.25 0.5,0.5 0.25,0.25 0.5,0.5 0.25,0.25 0.625,0.375 l 0.375,0.125 v 0.5 0.5 h -0.5 -0.5 -0.5 -0.5 -0.5 -0.5 l -0.125,-0.375 q -0.125,-0.375 -0.375,-0.625 -0.25,-0.25 -0.5,-0.5 -0.25,-0.25 -0.5,-0.5 -0.25,-0.25 -0.5,-0.5 -0.25,-0.25 -0.62499997,-0.375"
+         id="path4531"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 4.125,0.375 4,0 H 4.5 5 5.5 6 6.5 7 V 0.5 1 1.5 2 2.5 3 L 6.625,2.875 Q 6.25,2.75 6,2.5 5.75,2.25 5.5,2 5.25,1.75 5,1.5 4.75,1.25 4.5,1 4.25,0.75 4.125,0.375"
+         id="path4533"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 3,3.5 Q 3.25,3.25 3.5,3.25 3.75,3.25 4,3.5 4.25,3.75 4.5,4 4.75,4.25 5,4.5 5.25,4.75 5.5,5 5.75,5.25 5.875,5.625 L 6,6 H 5.5 5 4.5 4 3.5 3 2.5 2 1.5 1 L 1.125,5.625 Q 1.25,5.25 1.5,5 1.75,4.75 2,4.5 2.25,4.25 2.5,4 2.75,3.75 3,3.5"
+         id="path4535"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/gtk-3.20/buttons/maximize-focused-pressed.png b/gtk-3.20/assets/maximize-active.png
similarity index 100%
rename from gtk-3.20/buttons/maximize-focused-pressed.png
rename to gtk-3.20/assets/maximize-active.png
diff --git a/gtk-3.20/buttons/maximize-focused-normal.png b/gtk-3.20/assets/maximize-backdrop.png
similarity index 100%
rename from gtk-3.20/buttons/maximize-focused-normal.png
rename to gtk-3.20/assets/maximize-backdrop.png
diff --git a/gtk-3.20/buttons/maximize-focused-active.png b/gtk-3.20/assets/maximize-hover.png
similarity index 100%
rename from gtk-3.20/buttons/maximize-focused-active.png
rename to gtk-3.20/assets/maximize-hover.png
diff --git a/gtk-3.20/buttons/maximize-unfocused-normal.png b/gtk-3.20/assets/maximize-normal.png
similarity index 100%
rename from gtk-3.20/buttons/maximize-unfocused-normal.png
rename to gtk-3.20/assets/maximize-normal.png
diff --git a/gtk-3.20/buttons/minimize-focused-pressed.png b/gtk-3.20/assets/minimize-active.png
similarity index 100%
rename from gtk-3.20/buttons/minimize-focused-pressed.png
rename to gtk-3.20/assets/minimize-active.png
diff --git a/gtk-3.20/buttons/minimize-focused-normal.png b/gtk-3.20/assets/minimize-backdrop.png
similarity index 100%
rename from gtk-3.20/buttons/minimize-focused-normal.png
rename to gtk-3.20/assets/minimize-backdrop.png
diff --git a/gtk-3.20/buttons/minimize-focused-active.png b/gtk-3.20/assets/minimize-hover.png
similarity index 100%
rename from gtk-3.20/buttons/minimize-focused-active.png
rename to gtk-3.20/assets/minimize-hover.png
diff --git a/gtk-3.20/buttons/minimize-unfocused-normal.png b/gtk-3.20/assets/minimize-normal.png
similarity index 100%
rename from gtk-3.20/buttons/minimize-unfocused-normal.png
rename to gtk-3.20/assets/minimize-normal.png
diff --git a/gtk-3.20/assets/radio-checked-insensitive-unfocused.png b/gtk-3.20/assets/radio-checked-insensitive-unfocused.png
new file mode 120000
index 0000000..d51ef24
--- /dev/null
+++ b/gtk-3.20/assets/radio-checked-insensitive-unfocused.png
@@ -0,0 +1 @@
+radio-checked-insensitive.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-checked-insensitive-unfocused@2.png b/gtk-3.20/assets/radio-checked-insensitive-unfocused@2.png
new file mode 120000
index 0000000..52cb74b
--- /dev/null
+++ b/gtk-3.20/assets/radio-checked-insensitive-unfocused@2.png
@@ -0,0 +1 @@
+radio-checked-insensitive@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-selected-insensitive.png b/gtk-3.20/assets/radio-checked-insensitive.png
similarity index 100%
rename from gtk-3.20/assets/radio-selected-insensitive.png
rename to gtk-3.20/assets/radio-checked-insensitive.png
diff --git a/gtk-3.20/assets/radio-selected-insensitive@2.png b/gtk-3.20/assets/radio-checked-insensitive@2.png
similarity index 100%
rename from gtk-3.20/assets/radio-selected-insensitive@2.png
rename to gtk-3.20/assets/radio-checked-insensitive@2.png
diff --git a/gtk-3.20/assets/radio-selected-over.png b/gtk-3.20/assets/radio-checked-over.png
similarity index 100%
rename from gtk-3.20/assets/radio-selected-over.png
rename to gtk-3.20/assets/radio-checked-over.png
diff --git a/gtk-3.20/assets/radio-selected-over@2.png b/gtk-3.20/assets/radio-checked-over@2.png
similarity index 100%
rename from gtk-3.20/assets/radio-selected-over@2.png
rename to gtk-3.20/assets/radio-checked-over@2.png
diff --git a/gtk-3.20/assets/radio-checked-unfocused.png b/gtk-3.20/assets/radio-checked-unfocused.png
new file mode 120000
index 0000000..e0c4830
--- /dev/null
+++ b/gtk-3.20/assets/radio-checked-unfocused.png
@@ -0,0 +1 @@
+radio-checked.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-checked-unfocused@2.png b/gtk-3.20/assets/radio-checked-unfocused@2.png
new file mode 120000
index 0000000..bb5dbb2
--- /dev/null
+++ b/gtk-3.20/assets/radio-checked-unfocused@2.png
@@ -0,0 +1 @@
+radio-checked@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-selected.png b/gtk-3.20/assets/radio-checked.png
similarity index 100%
rename from gtk-3.20/assets/radio-selected.png
rename to gtk-3.20/assets/radio-checked.png
diff --git a/gtk-3.20/assets/radio-selected@2.png b/gtk-3.20/assets/radio-checked@2.png
similarity index 100%
rename from gtk-3.20/assets/radio-selected@2.png
rename to gtk-3.20/assets/radio-checked@2.png
diff --git a/gtk-3.20/assets/radio-mixed-insensitive-unfocused.png b/gtk-3.20/assets/radio-mixed-insensitive-unfocused.png
new file mode 120000
index 0000000..09540ba
--- /dev/null
+++ b/gtk-3.20/assets/radio-mixed-insensitive-unfocused.png
@@ -0,0 +1 @@
+radio-mixed-insensitive.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-mixed-insensitive-unfocused@2.png b/gtk-3.20/assets/radio-mixed-insensitive-unfocused@2.png
new file mode 120000
index 0000000..bd2db45
--- /dev/null
+++ b/gtk-3.20/assets/radio-mixed-insensitive-unfocused@2.png
@@ -0,0 +1 @@
+radio-mixed-insensitive@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-mixed-unfocused.png b/gtk-3.20/assets/radio-mixed-unfocused.png
new file mode 120000
index 0000000..5c36744
--- /dev/null
+++ b/gtk-3.20/assets/radio-mixed-unfocused.png
@@ -0,0 +1 @@
+radio-mixed.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-mixed-unfocused@2.png b/gtk-3.20/assets/radio-mixed-unfocused@2.png
new file mode 120000
index 0000000..01bea01
--- /dev/null
+++ b/gtk-3.20/assets/radio-mixed-unfocused@2.png
@@ -0,0 +1 @@
+radio-mixed@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-unchecked-insensitive-unfocused.png b/gtk-3.20/assets/radio-unchecked-insensitive-unfocused.png
new file mode 120000
index 0000000..4c2901e
--- /dev/null
+++ b/gtk-3.20/assets/radio-unchecked-insensitive-unfocused.png
@@ -0,0 +1 @@
+radio-unchecked-insensitive.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-unchecked-insensitive-unfocused@2.png b/gtk-3.20/assets/radio-unchecked-insensitive-unfocused@2.png
new file mode 120000
index 0000000..2a4ce11
--- /dev/null
+++ b/gtk-3.20/assets/radio-unchecked-insensitive-unfocused@2.png
@@ -0,0 +1 @@
+radio-unchecked-insensitive@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-unselected-insensitive.png b/gtk-3.20/assets/radio-unchecked-insensitive.png
similarity index 100%
rename from gtk-3.20/assets/radio-unselected-insensitive.png
rename to gtk-3.20/assets/radio-unchecked-insensitive.png
diff --git a/gtk-3.20/assets/radio-unselected-insensitive@2.png b/gtk-3.20/assets/radio-unchecked-insensitive@2.png
similarity index 100%
rename from gtk-3.20/assets/radio-unselected-insensitive@2.png
rename to gtk-3.20/assets/radio-unchecked-insensitive@2.png
diff --git a/gtk-3.20/assets/radio-unselected-over.png b/gtk-3.20/assets/radio-unchecked-over.png
similarity index 100%
rename from gtk-3.20/assets/radio-unselected-over.png
rename to gtk-3.20/assets/radio-unchecked-over.png
diff --git a/gtk-3.20/assets/radio-unselected-over@2.png b/gtk-3.20/assets/radio-unchecked-over@2.png
similarity index 100%
rename from gtk-3.20/assets/radio-unselected-over@2.png
rename to gtk-3.20/assets/radio-unchecked-over@2.png
diff --git a/gtk-3.20/assets/radio-unchecked-unfocused.png b/gtk-3.20/assets/radio-unchecked-unfocused.png
new file mode 120000
index 0000000..b0f95fc
--- /dev/null
+++ b/gtk-3.20/assets/radio-unchecked-unfocused.png
@@ -0,0 +1 @@
+radio-unchecked.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-unchecked-unfocused@2.png b/gtk-3.20/assets/radio-unchecked-unfocused@2.png
new file mode 120000
index 0000000..6f6835d
--- /dev/null
+++ b/gtk-3.20/assets/radio-unchecked-unfocused@2.png
@@ -0,0 +1 @@
+radio-unchecked@2.png
\ No newline at end of file
diff --git a/gtk-3.20/assets/radio-unselected.png b/gtk-3.20/assets/radio-unchecked.png
similarity index 100%
rename from gtk-3.20/assets/radio-unselected.png
rename to gtk-3.20/assets/radio-unchecked.png
diff --git a/gtk-3.20/assets/radio-unselected@2.png b/gtk-3.20/assets/radio-unchecked@2.png
similarity index 100%
rename from gtk-3.20/assets/radio-unselected@2.png
rename to gtk-3.20/assets/radio-unchecked@2.png
diff --git a/gtk-3.20/buttons/restore-focused-pressed.png b/gtk-3.20/assets/restore-active.png
similarity index 100%
rename from gtk-3.20/buttons/restore-focused-pressed.png
rename to gtk-3.20/assets/restore-active.png
diff --git a/gtk-3.20/buttons/restore-unfocused-normal.png b/gtk-3.20/assets/restore-backdrop.png
similarity index 100%
rename from gtk-3.20/buttons/restore-unfocused-normal.png
rename to gtk-3.20/assets/restore-backdrop.png
diff --git a/gtk-3.20/buttons/restore-focused-active.png b/gtk-3.20/assets/restore-hover.png
similarity index 100%
rename from gtk-3.20/buttons/restore-focused-active.png
rename to gtk-3.20/assets/restore-hover.png
diff --git a/gtk-3.20/buttons/restore-focused-normal.png b/gtk-3.20/assets/restore-normal.png
similarity index 100%
rename from gtk-3.20/buttons/restore-focused-normal.png
rename to gtk-3.20/assets/restore-normal.png
diff --git a/gtk-3.20/assets/right.svg b/gtk-3.20/assets/right.svg
new file mode 100755
index 0000000..55f4084
--- /dev/null
+++ b/gtk-3.20/assets/right.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="6mm"
+   height="7mm"
+   viewBox="0 0 6 7"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="right.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="19.221578"
+     inkscape:cy="-0.44527318"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4537"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1358"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-0.49531806,0.48949428)">
+    <g
+       transform="translate(-0.00468177,0.01050555)"
+       id="g4537">
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 0,0.5 V 0 H 0.5 1 1.5 2 2.5 3 L 2.875,0.375 Q 2.75,0.75 2.5,1 2.25,1.25 2,1.5 1.75,1.75 1.5,2 1.25,2.25 1,2.5 0.75,2.75 0.375,2.875 L 0,3 V 2.5 2 1.5 1 0.5"
+         id="path4529"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#808080;fill-opacity:1"
+         d="m 6.1249998,2.3750006 0.375,0.125 v 0.5 l 0,0.5 -0.375,0.125 q -0.375,0.125 -0.625,0.375 -0.25,0.25 -0.5,0.5 -0.25,0.25 -0.5,0.5 -0.25,0.25 -0.5,0.5 -0.25,0.25 -0.375,0.625 l -0.125,0.375 h -0.5 -0.5 -0.5 -0.5 -0.49999997 -0.5 v -0.5 -0.5 l 0.375,-0.125 q 0.37499997,-0.125 0.62499997,-0.375 0.25,-0.25 0.5,-0.5 0.25,-0.25 0.5,-0.5 0.25,-0.25 0.5,-0.5 0.25,-0.25 0.25,-0.5 0,-0.25 -0.25,-0.5 -0.25,-0.25 -0.5,-0.5 -0.25,-0.25 -0.5,-0.5 -0.25,-0.25 -0.5,-0.5 -0.25,-0.25000004 -0.62499997,-0.37500004 l -0.375,-0.125 V 5.5941701e-7 -0.49999944 h 0.5 0.49999997 0.5 0.5 0.5 l 0.5,0 0.125,0.375 q 0.125,0.375 0.375,0.625 0.25,0.25 0.5,0.50000004 0.25,0.25 0.5,0.5 0.25,0.25 0.5,0.5 0.25,0.25 0.625,0.375"
+         id="path4531"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 4.125,0.375 4,0 H 4.5 5 5.5 6 6.5 7 V 0.5 1 1.5 2 2.5 3 L 6.625,2.875 Q 6.25,2.75 6,2.5 5.75,2.25 5.5,2 5.25,1.75 5,1.5 4.75,1.25 4.5,1 4.25,0.75 4.125,0.375"
+         id="path4533"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 3,3.5 Q 3.25,3.25 3.5,3.25 3.75,3.25 4,3.5 4.25,3.75 4.5,4 4.75,4.25 5,4.5 5.25,4.75 5.5,5 5.75,5.25 5.875,5.625 L 6,6 H 5.5 5 4.5 4 3.5 3 2.5 2 1.5 1 L 1.125,5.625 Q 1.25,5.25 1.5,5 1.75,4.75 2,4.5 2.25,4.25 2.5,4 2.75,3.75 3,3.5"
+         id="path4535"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/gtk-3.20/assets/slider-vert-hover.png b/gtk-3.20/assets/slider-vert-hover.png
old mode 100644
new mode 100755
index 46ff118..ddc5d11
Binary files a/gtk-3.20/assets/slider-vert-hover.png and b/gtk-3.20/assets/slider-vert-hover.png differ
diff --git a/gtk-3.20/assets/slider-vert-insensitive.png b/gtk-3.20/assets/slider-vert-insensitive.png
old mode 100644
new mode 100755
index 1a5ca96..137fe76
Binary files a/gtk-3.20/assets/slider-vert-insensitive.png and b/gtk-3.20/assets/slider-vert-insensitive.png differ
diff --git a/gtk-3.20/assets/slider-vert.png b/gtk-3.20/assets/slider-vert.png
old mode 100644
new mode 100755
index 74ed8d7..51e00f3
Binary files a/gtk-3.20/assets/slider-vert.png and b/gtk-3.20/assets/slider-vert.png differ
diff --git a/gtk-3.20/assets/up.svg b/gtk-3.20/assets/up.svg
new file mode 100755
index 0000000..4411443
--- /dev/null
+++ b/gtk-3.20/assets/up.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="7mm"
+   height="6mm"
+   viewBox="0 0 7 6"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="up.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="21.111342"
+     inkscape:cy="-2.3350377"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4537"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1358"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0.00468177,-0.01050555)">
+    <g
+       transform="translate(-0.00468177,0.01050555)"
+       id="g4537">
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 0,0.5 V 0 H 0.5 1 1.5 2 2.5 3 L 2.875,0.375 Q 2.75,0.75 2.5,1 2.25,1.25 2,1.5 1.75,1.75 1.5,2 1.25,2.25 1,2.5 0.75,2.75 0.375,2.875 L 0,3 V 2.5 2 1.5 1 0.5"
+         id="path4529"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#808080;fill-opacity:1"
+         d="M 2.875,0.375 3,0 H 3.5 4 L 4.125,0.375 Q 4.25,0.75 4.5,1 4.75,1.25 5,1.5 5.25,1.75 5.5,2 5.75,2.25 6,2.5 6.25,2.75 6.625,2.875 L 7,3 V 3.5 4 4.5 5 5.5 6 H 6.5 6 L 5.875,5.625 Q 5.75,5.25 5.5,5 5.25,4.75 5,4.5 4.75,4.25 4.5,4 4.25,3.75 4,3.5 3.75,3.25 3.5,3.25 3.25,3.25 3,3.5 2.75,3.75 2.5,4 2.25,4.25 2,4.5 1.75,4.75 1.5,5 1.25,5.25 1.125,5.625 L 1,6 H 0.5 0 V 5.5 5 4.5 4 3.5 3 L 0.375,2.875 Q 0.75,2.75 1,2.5 1.25,2.25 1.5,2 1.75,1.75 2,1.5 2.25,1.25 2.5,1 2.75,0.75 2.875,0.375"
+         id="path4531"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 4.125,0.375 4,0 H 4.5 5 5.5 6 6.5 7 V 0.5 1 1.5 2 2.5 3 L 6.625,2.875 Q 6.25,2.75 6,2.5 5.75,2.25 5.5,2 5.25,1.75 5,1.5 4.75,1.25 4.5,1 4.25,0.75 4.125,0.375"
+         id="path4533"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000000;fill-opacity:0"
+         d="M 3,3.5 Q 3.25,3.25 3.5,3.25 3.75,3.25 4,3.5 4.25,3.75 4.5,4 4.75,4.25 5,4.5 5.25,4.75 5.5,5 5.75,5.25 5.875,5.625 L 6,6 H 5.5 5 4.5 4 3.5 3 2.5 2 1.5 1 L 1.125,5.625 Q 1.25,5.25 1.5,5 1.75,4.75 2,4.5 2.25,4.25 2.5,4 2.75,3.75 3,3.5"
+         id="path4535"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/gtk-3.20/gtk-dark.css b/gtk-3.20/gtk-dark.css
new file mode 100644
index 0000000..318c7d0
--- /dev/null
+++ b/gtk-3.20/gtk-dark.css
@@ -0,0 +1,118 @@
+/* Normal colors */
+@import url("gtk-widgets.css");
+@define-color bg_color #171717;
+@define-color fg_color #ffffff;
+@define-color base_color #000000;
+@define-color text_color #ffffff;
+@define-color selected_bg_color #004D8C;
+@define-color selected_fg_color #ffffff;
+@define-color disabled_bg_color mix(@fg_color, @bg_color, 0.95);
+@define-color disabled_fg_color mix(@fg_color, @bg_color, 0.5);
+@define-color disabled_base_color @disabled_bg_color;
+@define-color disabled_text_color @disabled_fg_color;
+/* Backdrop state colors */
+@define-color unfocused_bg_color @bg_color;
+@define-color unfocused_fg_color @fg_color;
+@define-color unfocused_base_color @base_color;
+@define-color unfocused_text_color @text_color;
+@define-color unfocused_selected_bg_color @selected_bg_color;
+@define-color unfocused_selected_fg_color @selected_fg_color;
+@define-color unfocused_disabled_bg_color mix(@fg_color, @bg_color, 0.98);
+@define-color unfocused_disabled_fg_color mix(@fg_color, @bg_color, 0.75);
+@define-color unfocused_disabled_base_color @unfocused_disabled_bg_color;
+@define-color unfocused_disabled_text_color @unfocused_disabled_fg_color;
+/* Darker color scheme */
+@define-color dark_bg_color #1F1F1F;
+@define-color dark_fg_color #ffffff;
+/* Theme colors */
+@define-color theme_bg_color @bg_color;
+@define-color theme_fg_color @fg_color;
+@define-color theme_base_color @base_color;
+@define-color theme_text_color @text_color;
+@define-color theme_selected_bg_color @selected_bg_color;
+@define-color theme_selected_fg_color @selected_fg_color;
+@define-color theme_disabled_bg_color @disabled_bg_color;
+@define-color theme_disabled_fg_color @disabled_fg_color;
+@define-color theme_disabled_text_color @disabled_text_color;
+@define-color theme_disabled_base_color @disabled_base_color;
+/* Unfocused color scheme */
+@define-color theme_unfocused_bg_color @unfocused_bg_color;
+@define-color theme_unfocused_fg_color @unfocused_fg_color;
+@define-color theme_unfocused_base_color @unfocused_base_color;
+@define-color theme_unfocused_text_color @unfocused_text_color;
+@define-color theme_unfocused_selected_bg_color @unfocused_selected_bg_color;
+@define-color theme_unfocused_selected_fg_color @unfocused_selected_fg_color;
+@define-color theme_unfocused_disabled_bg_color @unfocused_disabled_bg_color;
+@define-color theme_unfocused_disabled_fg_color @unfocused_disabled_fg_color;
+@define-color theme_unfocused_disabled_text_color @unfocused_disabled_text_color;
+@define-color theme_unfocused_disabled_base_color @unfocused_disabled_base_color;
+/* Shadows */
+@define-color dark_shadow rgb(0, 0, 0);
+@define-color color_shadow @selected_bg_color;
+@define-color light_shadow rgb(255, 255, 255);
+/* Borders */
+@define-color borders shade(@bg_color, 0.9);
+@define-color outline_color shade(@bg_color, 0.75);
+@define-color unfocused_borders shade(@unfocused_bg_color, 0.9);
+/* Notification header backgrounds */
+@define-color info_fg_color #FFFFFF;
+@define-color info_bg_color #0055FF;
+@define-color warning_fg_color #FFFFFF;
+@define-color warning_bg_color #FF8300;
+@define-color question_fg_color #FFFFFF;
+@define-color question_bg_color #2C2C2C;
+@define-color error_fg_color #FFFFFF;
+@define-color error_bg_color #FF0000;
+@define-color link_color #1D8ECE;
+@define-color error_color #CC0000;
+@define-color success_color #39e4a3;
+@define-color warning_color #FF9900;
+/* Widget colors */
+@define-color tooltip_bg_color @dark_bg_color;
+@define-color tooltip_fg_color @dark_fg_color;
+@define-color menu_bg_color @bg_color;
+@define-color menu_fg_color @fg_color;
+@define-color menubar_bg_color @bg_color;
+@define-color menubar_fg_color @fg_color;
+@define-color toolbar_bg_color @bg_color;
+@define-color toolbar_fg_color @fg_color;
+@define-color sidebar_bg_color @dark_bg_color;
+@define-color sidebar_fg_color @dark_fg_color;
+@define-color taskbar_bg_color #0c0c0c;
+@define-color taskbar_fg_color #ffffff;
+@define-color titlebar_bg_color @bg_color;
+@define-color titlebar_fg_color @fg_color;
+@define-color headerbar_bg_color @bg_color;
+@define-color headerbar_fg_color @fg_color;
+@define-color terminal_bg_color #000000;
+@define-color terminal_fg_color #ffffff;
+@define-color progressbar_bg_color #06B025;
+@define-color progressbar_fg_color @selected_fg_color;
+/* OSD */
+@define-color osd_fg @dark_bg_color;
+@define-color osd_bg mix(@dark_fg_color, @dark_bg_color, 0.2);
+@define-color osd_base @dark_fg_color;
+/* Budgie colors */
+@define-color raven_fg_color @dark_fg_color;
+@define-color raven_bg_color alpha(@dark_bg_color, 0.9);
+/* Desktop Icons */
+@define-color desktop_item_fg #FFFFFF;
+@define-color desktop_item_selected_fg @selected_fg_color;
+@define-color desktop_item_text_shadow alpha(@dark_shadow, 0.8);
+/* LightDM greeter colors */
+@define-color lightdm_bg_color @dark_bg_color;
+@define-color lightdm_fg_color @dark_fg_color;
+@define-color wm_title @titlebar_fg_color;
+@define-color wm_unfocused_title @unfocused_fg_color;
+@define-color wm_highlight alpha(@light_shadow, 0.8);
+@define-color wm_borders_edge alpha(@light_shadow, 0.8);
+@define-color wm_bg_a alpha(@selected_bg_color, 1.2);
+@define-color wm_bg_b alpha(@selected_bg_color, 1.2);
+@define-color wm_shadow alpha(@dark_shadow, 0.35);
+@define-color wm_border alpha(@dark_shadow, 0.35);
+@define-color wm_button_hover_color_a alpha(@selected_bg_color, 1.3);
+@define-color wm_button_hover_color_b alpha(@selected_bg_color, 1.3);
+@define-color wm_button_active_color_a alpha(@selected_bg_color, 0.85);
+@define-color wm_button_active_color_b alpha(@selected_bg_color, 0.85);
+@define-color wm_button_active_color_c alpha(@selected_bg_color, 0.85);
+@define-color content_view_bg @base_color;
diff --git a/gtk-3.20/gtk-widgets-assets.css b/gtk-3.20/gtk-widgets-assets.css
deleted file mode 100755
index 1c0e4eb..0000000
--- a/gtk-3.20/gtk-widgets-assets.css
+++ /dev/null
@@ -1,503 +0,0 @@
-/*************************
- * Check and Radio items *
- *************************/
-@keyframes check_radio_hover {
-  from {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.001, to(alpha(rgba(38, 50, 56, 0.75), 0.1)), to(transparent)); }
-  to {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(rgba(38, 50, 56, 0.75), 0.1)), to(transparent)); } }
-@keyframes check_radio_active {
-  from {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.001, to(alpha(#00BCD4, 0.1)), to(transparent)); }
-  to {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(#00BCD4, 0.1)), to(transparent)); } }
-@keyframes check_radio_active_reverse {
-  from {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(#00BCD4, 0.2)), to(transparent)); }
-  to {
-    background-image: -gtk-gradient(radial, center center, 0, center center, 0.001, to(alpha(#00BCD4, 0)), to(transparent)); } }
-.check, check {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:backdrop, check:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:hover, check:hover {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-over.png"), url("assets/checkbox-unchecked-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:hover:backdrop, check:hover:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:active, check:active {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-over.png"), url("assets/checkbox-unchecked-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:active:backdrop, check:active:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:disabled, check:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:disabled:backdrop, check:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:indeterminate, check:indeterminate {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:indeterminate:backdrop, check:indeterminate:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:indeterminate:hover, check:indeterminate:hover {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-over.png"), url("assets/checkbox-mixed-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:indeterminate:hover:backdrop, check:indeterminate:hover:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:indeterminate:active, check:indeterminate:active {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-over.png"), url("assets/checkbox-mixed-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:indeterminate:active:backdrop, check:indeterminate:active:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:indeterminate:disabled, check:indeterminate:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:indeterminate:disabled:backdrop, check:indeterminate:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:checked, check:checked {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:checked:backdrop, check:checked:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:checked:hover, check:checked:hover {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-over.png"), url("assets/checkbox-checked-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:checked:hover:backdrop, check:checked:hover:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:checked:active, check:checked:active {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-over.png"), url("assets/checkbox-checked-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:checked:active:backdrop, check:checked:active:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.check:checked:disabled, check:checked:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  .check:checked:disabled:backdrop, check:checked:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.check,
-menu menuitem check {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.check:hover,
-  menu menuitem check:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.check:backdrop,
-  menu menuitem check:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.check:disabled,
-menu menuitem check:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.check:disabled:hover,
-  menu menuitem check:disabled:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-insensitive@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.check:disabled:backdrop,
-  menu menuitem check:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.check:indeterminate,
-menu menuitem check:indeterminate {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.check:indeterminate:hover,
-  menu menuitem check:indeterminate:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.check:indeterminate:backdrop,
-  menu menuitem check:indeterminate:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.check:indeterminate:disabled,
-menu menuitem check:indeterminate:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.check:indeterminate:disabled:hover,
-  menu menuitem check:indeterminate:disabled:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.check:indeterminate:disabled:backdrop,
-  menu menuitem check:indeterminate:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.check:checked,
-menu menuitem check:checked {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.check:checked:hover,
-  menu menuitem check:checked:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.check:checked:backdrop,
-  menu menuitem check:checked:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.check:checked:disabled,
-menu menuitem check:checked:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.check:checked:disabled:hover,
-  menu menuitem check:checked:disabled:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.check:checked:disabled:backdrop,
-  menu menuitem check:checked:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio, radio {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected.png"), url("assets/radio-unselected@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:backdrop, radio:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:hover, radio:hover {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-over.png"), url("assets/radio-unselected-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:hover:backdrop, radio:hover:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:active, radio:active {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-over.png"), url("assets/radio-unselected-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:active:backdrop, radio:active:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:disabled, radio:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-insensitive.png"), url("assets/radio-unselected-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:disabled:backdrop, radio:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:indeterminate, radio:indeterminate {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:indeterminate:backdrop, radio:indeterminate:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:indeterminate:hover, radio:indeterminate:hover {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-over.png"), url("assets/radio-mixed-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:indeterminate:hover:backdrop, radio:indeterminate:hover:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:indeterminate:active, radio:indeterminate:active {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-over.png"), url("assets/radio-mixed-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:indeterminate:active:backdrop, radio:indeterminate:active:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:indeterminate:disabled, radio:indeterminate:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:indeterminate:disabled:backdrop, radio:indeterminate:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:checked, radio:checked {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-selected.png"), url("assets/radio-selected@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:checked:backdrop, radio:checked:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:checked:hover, radio:checked:hover {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-over.png"), url("assets/radio-selected-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:checked:hover:backdrop, radio:checked:hover:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:checked:active, radio:checked:active {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-over.png"), url("assets/radio-selected-over@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:checked:active:backdrop, radio:checked:active:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-.radio:checked:disabled, radio:checked:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-insensitive.png"), url("assets/radio-selected-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  .radio:checked:disabled:backdrop, radio:checked:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.radio,
-menu menuitem radio {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected.png"), url("assets/radio-unselected@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.radio:hover,
-  menu menuitem radio:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected.png"), url("assets/radio-unselected@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.radio:backdrop,
-  menu menuitem radio:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.radio:disabled,
-menu menuitem radio:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-insensitive.png"), url("assets/radio-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.radio:disabled:hover,
-  menu menuitem radio:disabled:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-insensitive.png"), url("assets/radio-insensitive@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.radio:disabled:backdrop,
-  menu menuitem radio:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.radio:indeterminate,
-menu menuitem radio:indeterminate {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.radio:indeterminate:hover,
-  menu menuitem radio:indeterminate:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.radio:indeterminate:backdrop,
-  menu menuitem radio:indeterminate:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.radio:indeterminate:disabled,
-menu menuitem radio:indeterminate:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.radio:indeterminate:disabled:hover,
-  menu menuitem radio:indeterminate:disabled:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.radio:indeterminate:disabled:backdrop,
-  menu menuitem radio:indeterminate:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.radio:checked,
-menu menuitem radio:checked {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-selected.png"), url("assets/radio-selected@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.radio:checked:hover,
-  menu menuitem radio:checked:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/radio-selected.png"), url("assets/radio-selected@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.radio:checked:backdrop,
-  menu menuitem radio:checked:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-menu menuitem.radio:checked:disabled,
-menu menuitem radio:checked:disabled {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-insensitive.png"), url("assets/radio-selected-insensitive@2.png"));
-  -gtk-icon-shadow: none; }
-  menu menuitem.radio:checked:disabled:hover,
-  menu menuitem radio:checked:disabled:hover {
-    -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-insensitive.png"), url("assets/radio-selected-insensitive@2.png"));
-    animation: none;
-    -gtk-icon-shadow: none;
-    transition: none; }
-  menu menuitem.radio:checked:disabled:backdrop,
-  menu menuitem radio:checked:disabled:backdrop {
-    opacity: 0.8;
-    transition: 0.2s; }
-
-treeview.view check:selected:focus, treeview.view check:selected,
-treeview.view radio:selected:focus,
-treeview.view radio:selected {
-  color: @theme_fg_color;
-  border-color: shade(@theme_selected_bg_color, 0.6); }
-treeview.view check:selected:disabled,
-treeview.view radio:selected:disabled {
-  color: @insensitive_fg_color; }
-  treeview.view check:selected:disabled:backdrop,
-  treeview.view radio:selected:disabled:backdrop {
-    color: shade(@theme_unfocused_fg_color, 1.1); }
-treeview.view check:backdrop:selected, treeview.view check:backdrop,
-treeview.view radio:backdrop:selected,
-treeview.view radio:backdrop {
-  color: @insensitive_fg_color; }
-
-/**********************
- * Scrollbar steppers *
- **********************/
- 
- /* TODO: Fix this also
-
-.scrollbar.button.vertical.top,
-.scrollbar.button.vertical.top:disabled {
-    background-image: -gtk-scaled("scrollbars/up.png");
-    border-image: -gtk-scaled("scrollbars/up.png");
-    background-size: cover;
-    border-width: 0px;
-    border-style: none;
-    color: transparent;
-}
-
-.scrollbar.button.vertical.bottom,
-.scrollbar.button.vertical.bottom:disabled {
-    background-image: -gtk-scaled("scrollbars/down.png");
-    border-image: -gtk-scaled("scrollbars/down.png");
-    background-size: cover;
-    border-width: 0px;
-    border-style: none;
-}
-
-.scrollbar.button.horizontal.left,
-.scrollbar.button.horizontal.left:disabled {
-    background-image: -gtk-scaled("scrollbars/left.png");
-    border-image: -gtk-scaled("scrollbars/left.png");
-    border-width: 0px;
-    border-style: none;
-}
-
-.scrollbar.button.horizontal.right,
-.scrollbar.button.horizontal.right:disabled {
-    background-image: -gtk-scaled("scrollbars/right.png");
-    border-image: -gtk-scaled("scrollbars/right.png");
-    border-width: 0px;
-    border-style: none;
-} */
-
-/******************
- * window actions *
- ******************/
-
-.titlebar .titlebutton.minimize {
-    color: transparent;
-    border-image: none;
-    box-shadow: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-image: url("buttons/minimize-focused-normal.png");
-}
-
-.titlebar .titlebutton.minimize:backdrop {
-    background-image: url("buttons/minimize-unfocused-normal.png");
-    color: transparent;
-}
-
-.titlebar .titlebutton.minimize:hover,
-.titlebar .titlebutton.minimize:active/*,
-.titlebar .titlebutton.minimize:checked*/ {
-    color: transparent;
-    border-image: none;
-    box-shadow: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-image: url("buttons/minimize-focused-active.png");
-}
-
-.titlebar .titlebutton.maximize {
-   color: transparent;
-    border-image: none;
-    box-shadow: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-image: url("buttons/maximize-focused-normal.png");
-}
-
-.titlebar .titlebutton.maximize:backdrop {
-    background-image: url("buttons/maximize-unfocused-normal.png");
-    color: transparent;
-}
-
-
-.titlebar .titlebutton.maximize:hover, 
-.titlebar .titlebutton.maximize:active/*,
-.titlebar .titlebutton.maximize:checked*/  {
-    color: transparent;
-    border-image: none;
-    box-shadow: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-image: url("buttons/maximize-focused-active.png");
-}
-
-.titlebar .titlebutton.close {
-    color: transparent;
-    border-image: none;
-    box-shadow: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-image: url("buttons/close-focused-normal.png");
-}
-
-.titlebar .titlebutton.close:backdrop {
-    background-image: url("buttons/close-unfocused-normal.png");
-    color: transparent;
-}
-
-
-.titlebar .titlebutton.close:hover,
-.titlebar .titlebutton.close:active/*,
-.titlebar .titlebutton.close:checked*/  {
-    color: transparent;
-    border-image: none;
-    box-shadow: none;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-image: url("buttons/close-focused-active.png");
-}
diff --git a/gtk-3.20/gtk-widgets.css b/gtk-3.20/gtk-widgets.css
old mode 100755
new mode 100644
index 2c26ae4..fe866ef
--- a/gtk-3.20/gtk-widgets.css
+++ b/gtk-3.20/gtk-widgets.css
@@ -1,4113 +1,2524 @@
-/* NOTES to contributors:
- * use 4 spaces indents, and keep code ALIGNED and ORDERED */
-
-/* default */
- * {
-    -GtkScrollbar-has-backward-stepper: true;
-    -GtkScrollbar-has-forward-stepper: true;
-    -GtkScrolledwindow-scrollbar-spacing: 0;
-    -GtkScrolledwindow-scrollbars-within-bevel: 1;
-    -textview-error-underline-color: @error_color;
-    -GtkToolbutton-icon-spacing: 6;
-    -GtkTreeview-expander-size: 8;
+* {
+  -GtkScrollbar-has-backward-stepper: true;
+  -GtkScrollbar-has-forward-stepper: true;
+  -GtkScrolledwindow-scrollbar-spacing: 0;
+  -GtkScrolledwindow-scrollbars-within-bevel: 1;
+  -GtkTextView-error-underline-color: @error_color;
+  -GtkToolbutton-icon-spacing: 6;
+  -GtkToolItemGroup-expander-size: 11;
+  -GtkWidget-text-handle-width: 20;
+  -GtkWidget-text-handle-height: 20;
+  -GtkDialog-button-spacing: 4;
+  -GtkDialog-action-area-border: 0;
+  -GtkTreeview-expander-size: 8;
+  background-clip: padding-box;
+  outline-width: 1px;
+  outline-offset: -3px;
+  outline-style: dashed;
+  outline-color: @outline_color;
+  -gtk-outline-radius: 0; }
 
-    background-clip: padding-box;
-
-    outline-color: alpha(@theme_selected_bg_color, 0.5);
-    outline-style: solid;
-    outline-offset: 0;
-}
-
-/***************
- * base states *
- ***************/
 .background {
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-}
-
- * {
-    /* inherit colors from parent */
-    color: inherit;
-    background-color: inherit;
-}
-
- *:selected,
- *:selected:focus {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
- *:disabled {
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
+  color: @theme_fg_color;
+  background-color: alpha(@theme_bg_color, 0.999); }
+  .background:backdrop {
+    color: @theme_unfocused_fg_color;
+    background-color: @theme_unfocused_bg_color; }
 
-/* apply effects to disabled and prelit images */
- *:disabled {
-    -gtk-icon-effect: dim;
-}
-
- *:hover {
-    -gtk-icon-effect: highlight;
-}
+*:disabled {
+  -gtk-icon-effect: dim; }
+*:hover {
+  -gtk-icon-effect: highlight; }
 
 .gtkstyle-fallback {
-    background-color: @theme_bg_color;
+  color: @theme_fg_color;
+  background-color: @theme_bg_color; }
+  .gtkstyle-fallback:hover {
     color: @theme_fg_color;
-}
-
-.gtkstyle-fallback:hover {
-    background-color: shade(@theme_bg_color, 1.1);
+    background-color: shade(@theme_bg_color, 1.1); }
+  .gtkstyle-fallback:active {
     color: @theme_fg_color;
-}
+    background-color: shade(@theme_bg_color, 0.9); }
+  .gtkstyle-fallback:disabled {
+    color: @theme_disabled_fg_color;
+    background-color: @theme_disabled_bg_color; }
+  .gtkstyle-fallback:selected {
+    color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color; }
 
-.gtkstyle-fallback:active {
-    background-color: shade(@theme_bg_color, 0.9);
-    color: @theme_fg_color;
-}
+image, image:disabled, label, label:disabled, box, box:disabled {
+  background-color: transparent; }
 
-.gtkstyle-fallback:disabled {
-    background-color: shade(@theme_bg_color, 0.95);
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
+image:disabled {
+  color: alpha(currentColor, 0.5); }
 
-.gtkstyle-fallback:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-image,
-image:disabled,
-label,
-label:disabled,
-box,
-box:disabled,
-GtkGrid,
-GtkGrid:disabled {
-    background-color: transparent;
-}
+label selection {
+  background-color: @theme_selected_bg_color;
+  color: @theme_selected_fg_color; }
+label.separator {
+  color: @borders; }
+  label.separator:backdrop {
+    color: @unfocused_borders; }
+label.dim-label, label.separator, popover label.separator, popover.background label.separator, label:disabled {
+  opacity: 0.55; }
 
-/******************
- * visual effects *
- ******************/
-/* transitions */
 button {
-    transition: border 100ms ease-in-out;
-}
+  transition: border 100ms ease-in-out; }
 
 entry {
-    transition: border 100ms ease-out;
-}
-
-entry:focus {
-    transition: border 100ms ease-in;
-}
-
-entry.image left {
-    padding-right: 4px;
-}
-
-notebook tab label,
-notebook .hover-page,
-notebook .hover-page label,
-notebook .active-page,
-notebook .active-page label {
-    transition: all 200ms ease-in;
-}
-
-switch slider {
-    transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-}
-
-/* inset shadows */
-button:active,
-.primary-toolbar button:active,
-toolbar button:active,
-headerbar button:active,
-notebook header {
-    box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07),
-    inset 0 1px alpha(@dark_shadow, 0.08),
-    inset -1px 0 alpha(@dark_shadow, 0.07),
-    inset 0 -1px alpha(@dark_shadow, 0.05);
-}
-
-/* disable inset shadow */
-button:active *:disabled,
-.primary-toolbar button:active *:disabled,
-toolbar button:active *:disabled,
-headerbar button:active *:disabled,
-entry:disabled {
-    box-shadow: none;
-}
+  transition: border 100ms ease-out; }
+  entry:focus {
+    transition: border 100ms ease-in; }
+
+notebook tab label, notebook .prelight-page, notebook .prelight-page label, notebook .active-page, notebook .active-page label {
+  transition: all 200ms ease-in; }
+
+scale, progressbar {
+  transition: 200ms ease-out; }
+  scale:backdrop, progressbar:backdrop {
+    transition: 200ms ease-out; }
+
+scale slider, switch slider {
+  transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition-property: background, border, box-shadow; }
+  scale slider:backdrop, switch slider:backdrop {
+    transition: 200ms ease-out; }
+scale:backdrop slider, switch:backdrop slider {
+  transition: 200ms ease-out; }
 
-/*************
- * assistant *
- *************/
-GtkAssistant .sidebar highlight {
-    font-weight: bold;
-}
+scrollbar {
+  transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+  scrollbar:backdrop {
+    transition: 200ms ease-out; }
+  scrollbar slider {
+    transition: 200ms ease-out; }
+
+decoration, decoration:backdrop {
+  transition: 200ms ease-out; }
+
+assistant .sidebar label.highlight {
+  color: @theme_selected_fg_color;
+  background-color: @theme_selected_bg_color; }
+assistant .sidebar {
+  padding: 4px;
+  border-width: 0 1px 0 0;
+  border-style: solid;
+  border-radius: 0;
+  border-right-color: @borders;
+  color: @theme_fg_color;
+  background-color: @theme_bg_color; }
 
-GtkAssistant .sidebar {
-    padding: 4px;
-    border-width: 0 1px 0 0;
-    border-style: solid;
-    border-right-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0;
-    background-color: @theme_bg_color;
-    color: mix(@theme_fg_color, @theme_bg_color, 0.1);
-}
-
-/****************
- * link buttons *
- ****************/
- *:link, button:link,
+button:link > label,
+button:visited > label,
+*:link,
+button:link,
 button:visited {
-    color: @link_color;
-}
-
- *:link:visited,
+  color: @link_color; }
+  button:link > label:visited,
+  button:visited > label:visited,
+  *:link:visited,
+  button:visited {
+    color: mix(@link_color, @theme_fg_color, 0.2); }
+    *:selected button:link > label:visited,
+    *:selected button:visited > label:visited, *:selected
+    *:link:visited, *:selected
+    button:visited:link,
+    *:selected button:visited {
+      color: mix(@selected_fg_color, @selected_bg_color, 0.4); }
+  button:link > label:hover,
+  button:visited > label:hover,
+  *:link:hover,
+  button:hover:link,
+  button:hover:visited {
+    color: shade(@link_color, 1.1); }
+    *:selected button:link > label:hover,
+    *:selected button:visited > label:hover, *:selected
+    *:link:hover, *:selected
+    button:hover:link,
+    *:selected button:hover:visited {
+      color: mix(@selected_fg_color, @selected_bg_color, 0.9); }
+  button:link > label:active,
+  button:visited > label:active,
+  *:link:active,
+  button:active:link,
+  button:active:visited {
+    color: @link_color; }
+    *:selected button:link > label:active,
+    *:selected button:visited > label:active, *:selected
+    *:link:active, *:selected
+    button:active:link,
+    *:selected button:active:visited {
+      color: mix(@selected_fg_color, @selected_bg_color, 0.8); }
+  button:link > label:backdrop:backdrop:hover,
+  button:visited > label:backdrop:backdrop:hover, button:link > label:backdrop:backdrop:hover:selected,
+  button:visited > label:backdrop:backdrop:hover:selected, button:link > label:backdrop,
+  button:visited > label:backdrop,
+  *:link:backdrop:backdrop:hover,
+  button:backdrop:backdrop:hover:link,
+  button:backdrop:backdrop:hover:visited,
+  *:link:backdrop:backdrop:hover:selected,
+  button:backdrop:backdrop:hover:selected:link,
+  button:backdrop:backdrop:hover:selected:visited,
+  *:link:backdrop,
+  button:backdrop:link,
+  button:backdrop:visited {
+    color: @selected_bg_color; }
+  button:link > label:selected,
+  button:visited > label:selected, *:selected button:link > label,
+  *:selected button:visited > label,
+  *:link:selected,
+  button:selected:link,
+  button:selected:visited, *:selected
+  *:link, *:selected
+  button:link,
+  *:selected button:visited {
+    color: mix(@selected_fg_color, @selected_bg_color, 0.8); }
+
+button:link,
 button:visited {
-    color: mix(@link_color, @theme_fg_color, 0.2);
-}
-
- *:selected *:link:visited,
- *:selected button:visited:link,
- *:selected button:visited {
-    color: mix(@link_color, @theme_selected_fg_color, 0.65);
-}
-
- *:link:hover,
-button:hover:link,
-button:hover:visited {
-    color: shade(mix(@link_color, @theme_fg_color, 0.2), 1.15);
-}
-
- *:selected *:link:hover,
- *:selected button:hover:link,
- *:selected button:hover:visited {
-    color: mix(@link_color, @theme_selected_fg_color, 0.75);
-}
-
- *:link:active,
-button:active:link,
-button:active:visited {
-    color: shade(@link_color, 0.85);
-}
-
- *:selected *:link:active,
- *:selected button:active:link,
- *:selected button:active:visited {
-    color: mix(@link_color, @theme_selected_fg_color, 0.5);
-}
-
-infobar.info *:link,
-infobar.info button:link,
-infobar.info button:visited,
-infobar.question *:link,
-infobar.question button:link,
-infobar.question button:visited,
-infobar.warning *:link,
-infobar.warning button:link,
-infobar.warning button:visited,
-infobar.error *:link,
-infobar.error button:link,
-infobar.error button:visited,
- *:link:selected,
-button:selected:link,
-button:selected:visited,
-headerbar.selection-mode .subtitle:link,
-.selection-mode.titlebar:not(headerbar) .subtitle:link,
- *:selected *:link,
- *:selected button:link,
- *:selected button:visited {
-    color: mix(@link_color, @theme_selected_fg_color, 0.5);
-}
-
-button:link > label,
-button:visited > label {
-    text-decoration-line: underline;
-}
+  border-color: transparent;
+  background-color: transparent;
+  text-shadow: none; }
+  button:link:hover, button:link:active, button:link:checked, button:link:focus:active,
+  button:visited:hover,
+  button:visited:active,
+  button:visited:checked,
+  button:visited:focus:active {
+    border-color: transparent;
+    background-color: transparent;
+    text-shadow: none; }
+  button:link > label,
+  button:visited > label {
+    text-decoration-line: underline; }
 
-/**********
- * button *
- **********/
 button {
-    padding: 3px;
-    border-width: 1px;
-    border-radius: 0px;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    background-color: shade(@theme_bg_color, 1.08);
-    background-image: none;
+  padding: 3px;
+  border-style: solid;
+  border-width: 1px;
+  border-radius: 0px;
+  color: @theme_fg_color;
+  border-color: @borders;
+  background-color: @theme_bg_color; }
+  button:hover {
     color: @theme_fg_color;
-}
-
-button:hover {
     border-color: shade(@theme_selected_bg_color, 0.7);
-    background-color: shade(@theme_selected_bg_color, 1.02);
-    background-image: none;
-}
-
-button:active,
-button:checked {
+    background-color: shade(@theme_selected_bg_color, 1.02); }
+  button:active, button:checked {
+    color: @theme_fg_color;
     border-color: shade(@theme_selected_bg_color, 0.8);
-    background-color: shade(@theme_selected_bg_color, 0.95);
-    background-image: none;
-}
-
-button:active:hover {
-    border-color: shade(@theme_selected_bg_color, 0.7);
-}
-
-button:focus,
-button:hover:focus,
-button:active:focus,
-button:active:hover:focus {
-    border-color: shade(@theme_selected_bg_color, 0.7);
-}
-
-button:disabled {
-    border-color: shade(@theme_bg_color, 0.85);
-    background-color: shade(@theme_bg_color, 0.9);
-    background-image: none;
-}
-
-button:checked:disabled {
-    border-color: shade(@theme_bg_color, 0.75);
-    background-color: shade(@theme_bg_color, 0.80);
-    background-image: none;
-}
-
-button.flat,
-button.flat:backdrop {
-    padding: 3px;
-    border-width: 1px;
-    border-radius: 5px;
-    border-style: solid;
-    box-shadow: none;
+    background-color: shade(@theme_selected_bg_color, 0.95); }
+    button:active:backdrop, button:checked:backdrop {
+      color: @theme_unfocused_fg_color;
+      border-color: shade(@theme_unfocused_bg_color, 0.85);
+      background-color: shade(@theme_unfocused_bg_color, 0.85); }
+  button:focus, button:hover:focus, button:active:focus, button:active:hover:focus {
+    border-color: shade(@theme_selected_bg_color, 0.7); }
+  button:disabled {
+    color: mix(@theme_fg_color, @theme_unfocused_disabled_fg_color, 0.1);
+    border-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.6);
+    background-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.1); }
+    button:disabled:backdrop {
+      color: @theme_unfocused_disabled_fg_color;
+      border-color: @unfocused_borders;
+      background-color: @theme_unfocused_disabled_bg_color; }
+  button:backdrop {
+    border-color: @unfocused_borders;
+    color: @theme_unfocused_fg_color;
+    background-color: @theme_unfocused_bg_color; }
+button.flat {
+  border-color: transparent;
+  border-radius: 0px;
+  color: @theme_fg_color;
+  background-color: transparent; }
+  button.flat:disabled {
     border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-}
-
-/****************
- * cell and row *
- ****************/
-.cell {
-    border-width: 0;
-    border-radius: 0;
-}
-
-.cell:selected,
-.cell:selected:focus {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-row {
+    color: alpha(@theme_fg_color, 0.8);
+    background-color: transparent; }
+    button.flat:disabled:backdrop {
+      border-color: transparent;
+      color: alpha(@theme_fg_color, 0.7);
+      background-color: transparent; }
+  button.flat:backdrop {
+    color: @theme_unfocused_fg_color; }
+
+row:selected, row:selected:hover, row:selected:focus {
+  border: none;
+  color: @theme_selected_fg_color;
+  background-color: @theme_selected_bg_color; }
+  row:selected switch:checked, row:selected:hover switch:checked, row:selected:focus switch:checked {
+    background: shade(@theme_selected_bg_color, 1.15);
+    border-color: shade(@theme_selected_bg_color, 1.15); }
+
+checkbutton.text-button, radiobutton.text-button {
+  padding: 4px;
+  outline-offset: 0; }
+
+checkbutton:hover, checkbutton:active:hover {
+  padding: 4px;
+  border-style: none;
+  background-color: transparent; }
+checkbutton:selected {
+  padding: 4px;
+  border-style: none;
+  background-color: transparent; }
+  checkbutton:selected:focus {
     padding: 4px;
-}
-
-row:selected,
-row:selected:hover,
-row:selected:focus {
-    border: none;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-/*******************
- * check and radio *
- *******************/
-check,
-radio,
-check:disabled,
-radio:disabled {
     border-style: none;
-    background-color: transparent;
-}
-
-checkbutton:hover,
-checkbutton:active:hover,
-checkbutton:selected,
-checkbutton:selected:focus {
-    background-color: transparent;
-}
-
-/*****************
- * treeview header *
- *****************/
-treeview header button,
-treeview header button:active {
-    border-width: 0 1px 1px 0;
-    border-radius: 0;
-}
-
-treeview header button,
-treeview header button:active,
-treeview header button:focus,
-treeview header button:active:focus {
-    border-color: shade(@theme_base_color, 0.9);
-    border-bottom-color: shade(@theme_base_color, 0.8);
-    background-color: shade(@theme_base_color, 0.97);
-    background-image: none;
-}
-
-treeview header button:hover,
-treeview header button:active:hover,
-treeview header button:hover:focus,
-treeview header button:active:hover:focus {
-    border-color: shade(@theme_base_color, 0.9);
-    border-bottom-color: shade(@theme_base_color, 0.8);
-    background-color: shade(@theme_base_color, 0.99);
-    background-image: none;
-}
-
-treeview header:last-child button {
-    border-width: 0 0 1px 0;
-}
-
-/****************
- * content view *
- ****************/
-.content-view view {
-    background-color: @theme_base_color;
-}
-
-.content-view view:hover {
-    background-color: alpha(@theme_selected_bg_color, 0.6);
-}
-
-.content-view view:selected,
-.content-view view:active {
-    background-color: @theme_selected_bg_color;
-}
-
-.content-view view:disabled {
-    background-color: shade(@theme_base_color, 0.9);
-}
-
-view.content-view {
-/*    icon-size: 40;*/
-}
-
-view.content-view check {
-    background-color: transparent;
-}
-
-view.content-view check:active {
-    background-color: transparent;
-}
-
-.content-view view check,
-.content-view view check:active {
-    background-color: transparent;
-}
+    background-color: transparent; }
+
+view.content-view check, .content-view.view check {
+  background-color: transparent; }
+  view.content-view check:active, .content-view.view check:active {
+    background-color: transparent; }
+
+view.content-view check:hover, view.content-view check:disabled, view.content-view check:selected {
+  background-color: transparent; }
+
+check, radio, check:disabled, radio:disabled {
+  padding: 4px;
+  border-style: none;
+  background-color: transparent; }
+
+check {
+  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); }
+  check row:selected {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); }
+    check row:selected:focus {
+      -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); }
+  check:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-unfocused.png"), url("assets/checkbox-unchecked-unfocused@2.png")); }
+  check row:selected:backdrop, check row:selected:focus:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-unfocused.png"), url("assets/checkbox-unchecked-unfocused@2.png")); }
+  check:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png")); }
+  check row:selected:disabled, check row:selected:focus:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png")); }
+  check:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-unfocused.png"), url("assets/checkbox-unchecked-insensitive-unfocused@2.png")); }
+  check row:selected:disabled:backdrop, check row:selected:focus:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-unfocused.png"), url("assets/checkbox-unchecked-insensitive-unfocused@2.png")); }
+  check:active, check:checked {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); }
+  check row:selected:active, check row:selected:checked {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); }
+  check row:selected:focus:active, check row:selected:focus:checked {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); }
+  check:active:backdrop, check:checked:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-unfocused.png"), url("assets/checkbox-checked-unfocused@2.png")); }
+  check row:selected:active:backdrop, check row:selected:checked:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-unfocused.png"), url("assets/checkbox-checked-unfocused@2.png")); }
+  check row:selected:focus:active:backdrop, check row:selected:focus:checked:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-unfocused.png"), url("assets/checkbox-checked-unfocused@2.png")); }
+  check:active:disabled, check:checked:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); }
+  check row:selected:active:disabled, check row:selected:checked:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); }
+  check row:selected:focus:active:disabled, check row:selected:focus:checked:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); }
+  check:active:disabled:backdrop, check:checked:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-unfocused.png")); }
+  check row:selected:active:disabled:backdrop, check row:selected:checked:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-unfocused.png")); }
+  check row:selected:focus:active:disabled:backdrop, check row:selected:focus:checked:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-unfocused.png")); }
+  check:indeterminate {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); }
+  check row:selected:indeterminate, check row:selected:focus:indeterminate {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); }
+  check:indeterminate:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-unfocused.png"), url("assets/checkbox-mixed-unfocused@2.png")); }
+  check row:selected:indeterminate:backdrop, check row:selected:focus:indeterminate:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-unfocused.png"), url("assets/checkbox-mixed-unfocused@2.png")); }
+  check:indeterminate:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png")); }
+  check row:selected:indeterminate:disabled, check row:selected:focus:indeterminate:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png")); }
+  check:indeterminate:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-unfocused.png"), url("assets/checkbox-mixed-insensitive-unfocused@2.png")); }
+  check row:selected:indeterminate:disabled:backdrop, check row:selected:focus:indeterminate:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-unfocused.png"), url("assets/checkbox-mixed-insensitive-unfocused@2.png")); }
+
+radio {
+  -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); }
+  radio row:selected {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); }
+    radio row:selected:focus {
+      -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); }
+  radio:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-unfocused.png"), url("assets/radio-unchecked-unfocused@2.png")); }
+  radio row:selected:backdrop, radio row:selected:focus:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-unfocused.png"), url("assets/radio-unchecked-unfocused@2.png")); }
+  radio:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png")); }
+  radio row:selected:disabled, radio row:selected:focus:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png")); }
+  radio:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-unfocused.png"), url("assets/radio-unchecked-insensitive-unfocused@2.png")); }
+  radio row:selected:disabled:backdrop, radio row:selected:focus:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-unfocused.png"), url("assets/radio-unchecked-insensitive-unfocused@2.png")); }
+  radio:active, radio:checked {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); }
+  radio row:selected:active, radio row:selected:checked {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); }
+  radio row:selected:focus:active, radio row:selected:focus:checked {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); }
+  radio:active:backdrop, radio:checked:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-unfocused.png"), url("assets/radio-checked-unfocused@2.png")); }
+  radio row:selected:active:backdrop, radio row:selected:checked:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-unfocused.png"), url("assets/radio-checked-unfocused@2.png")); }
+  radio row:selected:focus:active:backdrop, radio row:selected:focus:checked:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-unfocused.png"), url("assets/radio-checked-unfocused@2.png")); }
+  radio:active:disabled, radio:checked:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); }
+  radio row:selected:active:disabled, radio row:selected:checked:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); }
+  radio row:selected:focus:active:disabled, radio row:selected:focus:checked:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); }
+  radio:active:disabled:backdrop, radio:checked:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-unfocused.png"), url("assets/radio-checked-insensitive-unfocused@2.png")); }
+  radio row:selected:active:disabled:backdrop, radio row:selected:checked:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-unfocused.png"), url("assets/radio-checked-insensitive-unfocused@2.png")); }
+  radio row:selected:focus:active:disabled:backdrop, radio row:selected:focus:checked:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-unfocused.png"), url("assets/radio-checked-insensitive-unfocused@2.png")); }
+  radio:indeterminate {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); }
+  radio row:selected:indeterminate, radio row:selected:focus:indeterminate {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); }
+  radio:indeterminate:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-unfocused.png"), url("assets/radio-mixed-unfocused@2.png")); }
+  radio row:selected:indeterminate:backdrop, radio row:selected:focus:indeterminate:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-unfocused.png"), url("assets/radio-mixed-unfocused@2.png")); }
+  radio:indeterminate:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png")); }
+  radio row:selected:indeterminate:disabled, radio row:selected:focus:indeterminate:disabled {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png")); }
+  radio:indeterminate:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-unfocused.png"), url("assets/radio-mixed-insensitive-unfocused@2.png")); }
+  radio row:selected:indeterminate:disabled:backdrop, radio row:selected:focus:indeterminate:disabled:backdrop {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-unfocused.png"), url("assets/radio-mixed-insensitive-unfocused@2.png")); }
+
+menuitem check {
+  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png"));
+  color: @theme_fg_color;
+  -gtk-icon-shadow: none; }
+  menuitem check:active, menuitem check:checked {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); }
+  menuitem check:indeterminate {
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); }
+  menuitem check:active:hover {
+    color: @theme_selected_fg_color; }
+  menuitem check:disabled {
+    color: @theme_disabled_fg_color; }
+menuitem radio {
+  -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
+  color: @theme_fg_color;
+  -gtk-icon-shadow: none; }
+  menuitem radio:active, menuitem radio:checked {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); }
+  menuitem radio:indeterminate {
+    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); }
+  menuitem radio:hover {
+    color: @theme_selected_fg_color; }
+  menuitem radio:disabled {
+    color: @theme_disabled_fg_color; }
+
+.content-view.view {
+  background-color: @theme_base_color; }
+  .content-view.view:hover {
+    background-color: alpha(@theme_selected_bg_color, 0.6); }
+  .content-view.view:selected, .content-view.view:active {
+    background-color: @theme_selected_bg_color; }
+  .content-view.view:disabled {
+    background-color: shade(@theme_base_color, 0.9); }
 
-view.content-view check:hover,
-view.content-view check:disabled,
-view.content-view check:selected {
-    background-color: transparent;
-}
-
-/****************
- * drawing area *
- ****************/
-GtkDrawingArea {
-    background-color: @theme_base_color;
-}
-
-GtkDrawingArea:disabled {
-    background-color: shade(@theme_base_color, 0.9);
-}
-
-/***********
- * gtkhtml *
- ***********/
-GtkHTML {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-/***********
- * calendar *
- ************/
 calendar {
-    padding: 4px;
-}
-
-calendar:indeterminate {
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-calendar view,
-calendar header,
-calendar button,
-calendar button:hover,
-calendar button:disabled {
-    border-width: 0;
-    background-color: transparent;
-    background-image: none;
-}
-
-highlight,
-calendar highlight {
-    border-width: 0;
-    background-color: transparent;
-    color: @theme_selected_bg_color;
-}
-
-/******************
- * combobox entry *
- ******************/
-combobox entry,
-combobox entry:active,
-combobox entry:focus,
-combobox entry:disabled {
-    border-width: 1px 0 1px 1px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-button.combo,
-button.combo:hover,
-button.combo:active,
-button.combo:disabled {
-    border-width: 1px 1px 1px 1px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
+  padding: 2px;
+  border-width: 1px;
+  border-radius: 0px;
+  border-style: solid;
+  border-color: @borders;
+  color: @theme_fg_color; }
+  calendar.header {
+    border: none;
+    color: @theme_selected_bg_color; }
+  calendar.button {
+    color: @theme_selected_bg_color; }
+  calendar:selected {
+    border-radius: 0;
+    color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color; }
+  calendar:indeterminate {
+    color: alpha(currentColor, 0.55); }
+  calendar.highlight {
+    color: @theme_selected_bg_color; }
 
-/*********
- * entry *
- *********/
 entry {
-    padding: 4px 3px;
-    border-width: 1px;
+  padding: 4px 3px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: @borders;
+  border-radius: 0px;
+  color: @theme_text_color;
+  caret-color: currentColor;
+  background-color: @theme_base_color; }
+  entry:active, entry:focus {
+    border-color: shade(@theme_selected_bg_color, 0.6); }
+  entry:selected, entry:selected:focus, entry selection, entry selection:focus {
+    color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color; }
+  entry:disabled {
+    color: @theme_disabled_text_color;
+    border-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.6);
+    background-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.1); }
+    entry:disabled:backdrop {
+      color: @theme_unfocused_disabled_fg_color;
+      border-color: @unfocused_borders;
+      background-color: @theme_unfocused_disabled_bg_color; }
+  entry.read-only {
+    background-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.1); }
+  entry:backdrop {
+    color: @theme_unfocused_fg_color;
+    background-color: @theme_unfocused_base_color; }
+  entry > image.left {
+    padding-right: 5px; }
+  entry > image.right {
+    padding-left: 5px; }
+  entry progress {
+    margin: -4px -3px;
+    border-width: 0 0 2px;
+    border-radius: 0;
     border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0px;
-    background-color: @theme_base_color;
-    background-image: none;
-    color: @theme_text_color;
-}
-
-entry:active,
-entry:focus {
     border-color: shade(@theme_selected_bg_color, 0.6);
-}
-
-entry:selected,
-entry:selected:focus {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-entry:disabled {
-    background-color: shade(@theme_bg_color, 0.95);
-    background-image: none;
-    color: mix(@theme_text_color, @theme_base_color, 0.5);
-}
-
-entry progress {
-    border-width: 0;
-    border-radius: 0px;
-    background-color: @theme_bg_color;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-entry entry {
+    background-color: transparent; }
+  entry.flat, entry.flat:focus {
+    padding: 3px;
     border: none;
-    box-shadow: none;
-    background-color: transparent;
-    background-image: none;
-}
-
-/* nemo icon view entry */
-.nemo-window .nemo-window-pane widget.entry {
-    border: 1px solid;
     border-radius: 0;
-    color: @theme_fg_color;
-    border-color: shade(@theme_selected_bg_color, 0.6);
-    background-color: @theme_base_color;
-}
-
-.nemo-window .nemo-window-pane widget.entry:selected,
-.nemo-window .nemo-window-pane widget.entry:selected:focus {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
+    background-color: transparent; }
+  entry.search {
+    border-radius: 0px; }
 
-/************
- * expander *
- ************/
 expander arrow {
-    min-width: 16px;
-    min-height: 16px;
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-}
-
-expander arrow:dir(rtl) {
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
-}
-
-expander arrow:checked {
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-}
-
-expander {
-    color: alpha(currentColor, 0.7);
-}
-
-expander:hover {
-    color: alpha(currentColor, 0.8);
-}
-
-expander:checked {
-    color: alpha(currentColor, 0.9);
-}
-
-/**************
- * ComboBoxes *
- **************/
-arrow,
-combobox arrow {
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-    min-height: 16px;
-    min-width: 16px;
-}
-
-combobox:drop(active) {
-    box-shadow: none;
-}
+  min-width: 16px;
+  min-height: 16px;
+  -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+  expander arrow:dir(rtl) {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
+  expander arrow:hover {
+    color: @theme_selected_bg_color; }
+  expander arrow:checked {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-/**************
- * list boxes *
- **************/
 list {
-    background-color: shade(@theme_bg_color, 0.97);
-    color: @theme_fg_color;
-}
-
-list-row:hover {
-    background-color: shade(@theme_bg_color, 1.02);
-}
-
-list-row:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
+  color: @theme_fg_color;
+  background-color: @theme_base_color; }
+  list row {
+    padding: 2px; }
+    list row:hover {
+      background-color: mix(@theme_bg_color, @theme_fg_color, 0.1); }
+    list row:selected {
+      color: @theme_selected_fg_color;
+      background-color: @theme_selected_bg_color; }
+      list row:selected:disabled {
+        color: alpha(@theme_selected_fg_color, 0.7);
+        background-color: @theme_selected_bg_color; }
+  list separator, list separator:backdrop {
+    background: none; }
 
-/*********
- * frame *
- *********/
 frame > border {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0;
-    box-shadow: none;
-}
-
-frame.flat > border,
-frame > border.flat,
-statusbar frame > border {
-    border: none;
-}
+  border-width: 1px;
+  border-style: solid;
+  border-color: @borders;
+  border-radius: 0;
+  box-shadow: none; }
+frame.flat > border, frame > border.flat, statusbar frame > border {
+  border: none; }
 
 .frame {
-	background: none;
-}
-
-/*******************
- * scrolled window *
- *******************/
-scrolledwindow frame {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0;
-}
-
-/* avoid double borders when a viewport is
- * packed into a scrolledwindow */
-scrolledwindow viewport frame {
-    border-style: none;
-}
-
-/************
- * iconview *
- ************/
-view.view.cell:selected,
-view.view.cell:selected:focus {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    border-radius: 0px;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
+  background: none; }
+
+iconview:selected, iconview:selected:focus, iconview text:selected, iconview text selection, iconview text:selected:focus, iconview text selection:focus {
+  border-width: 1px;
+  border-style: solid;
+  border-color: @theme_selected_bg_color;
+  color: @theme_selected_fg_color;
+  background-color: @theme_selected_bg_color; }
+iconview:selected:backdrop, iconview selection:backdrop, iconview text:selected:backdrop, iconview text selection:backdrop {
+  color: @theme_unfocused_selected_fg_color;
+  background-color: @theme_unfocused_selected_bg_color; }
+
+rubberband, flowbox rubberband, treeview.view rubberband, .content-view rubberband, .rubberband, view rubberband, .view.rubberband, .rubberband {
+  border-width: 1px;
+  border-style: solid;
+  border-color: @theme_selected_bg_color;
+  background: none;
+  background-color: alpha(@theme_selected_bg_color, 0.3); }
+
+flowbox flowboxchild {
+  padding: 3px;
+  border-radius: 0px; }
+  flowbox flowboxchild:selected {
+    outline-offset: -2px;
     color: @theme_selected_fg_color;
-}
-
-.content-view.view.rubberband,
-view rubberband,
-.view.rubberband,
-rubberband,
-.rubberband {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    border-radius: 0;
-    background-color: alpha(@theme_selected_bg_color, 0.3);
-}
+    background-color: @theme_selected_bg_color; }
 
-/***********
- * infobar *
- ***********/
 infobar {
-    border-width: 0;
-    border-style: none;
-}
+  border: none; }
 
 .info {
-    border-width: 1px;
-    border-style: solid;
+  border-width: 1px;
+  border-style: solid;
+  border-color: shade(@info_bg_color, 0.8);
+  color: @info_fg_color;
+  background-color: @info_bg_color; }
+  .info button {
     border-color: shade(@info_bg_color, 0.8);
-    background-color: @info_bg_color;
-    background-image: none;
-    color: @info_fg_color;
-}
-
-.info button {
-    border-top-color: shade(@info_bg_color, 0.8);
-    border-right-color: shade(@info_bg_color, 0.72);
-    border-left-color: shade(@info_bg_color, 0.72);
-    border-bottom-color: shade(@info_bg_color, 0.7);
-    background-color: shade(@info_bg_color, 1.08);
-    color: @info_fg_color;
-}
-
-.info button:hover {
-    border-top-color: shade(@info_bg_color, 0.85);
-    border-right-color: shade(@info_bg_color, 0.78);
-    border-left-color: shade(@info_bg_color, 0.78);
-    border-bottom-color: shade(@info_bg_color, 0.7);
-    background-color: shade(@info_bg_color, 1.10);
-}
-
-.info button:active {
-    border-color: shade(@info_bg_color, 0.6);
-    background-color: shade(@info_bg_color, 0.95);
-}
-
-.info button:active:hover {
-    border-top-color: shade(@info_bg_color, 0.85);
-    border-right-color: shade(@info_bg_color, 0.78);
-    border-left-color: shade(@info_bg_color, 0.78);
-    border-bottom-color: shade(@info_bg_color, 0.7);
-}
-
-.info button.close {
-    color: @info_fg_color;
-}
-
-.info button.close:hover {
-    background-color: alpha(white, 0.2);
-}
-
-.info button.close:active {
     color: @info_fg_color;
-    background-color: alpha(black, 0.1);
-}
+    background-color: shade(@info_bg_color, 1.08); }
+    .info button:hover {
+      border-color: shade(@info_bg_color, 0.85);
+      background-color: shade(@info_bg_color, 1.1); }
+    .info button:active {
+      border-color: shade(@info_bg_color, 0.6);
+      background-color: shade(@info_bg_color, 0.95); }
+      .info button:active:hover {
+        border-color: shade(@info_bg_color, 0.85); }
+    .info button.close {
+      color: @info_fg_color; }
+      .info button.close:hover {
+        background-color: alpha(@light_shadow, 0.2); }
+      .info button.close:active {
+        color: @info_fg_color;
+        background-color: alpha(@dark_shadow, 0.1); }
 
 .warning {
-    border-width: 1px;
-    border-style: solid;
+  border-width: 1px;
+  border-style: solid;
+  border-color: shade(@warning_bg_color, 0.8);
+  color: @warning_fg_color;
+  background-color: @warning_bg_color; }
+  .warning button {
     border-color: shade(@warning_bg_color, 0.8);
-    background-color: @warning_bg_color;
-    background-image: none;
-    color: @warning_fg_color;
-}
-
-.warning button {
-    border-top-color: shade(@warning_bg_color, 0.8);
-    border-right-color: shade(@warning_bg_color, 0.72);
-    border-left-color: shade(@warning_bg_color, 0.72);
-    border-bottom-color: shade(@warning_bg_color, 0.7);
-    background-color: shade(@warning_bg_color, 1.08);
-    color: @warning_fg_color;
-}
-
-.warning button:hover {
-    border-top-color: shade(@warning_bg_color, 0.85);
-    border-right-color: shade(@warning_bg_color, 0.78);
-    border-left-color: shade(@warning_bg_color, 0.78);
-    border-bottom-color: shade(@warning_bg_color, 0.7);
-    background-color: shade(@warning_bg_color, 1.10);
-}
-
-.warning button:active {
-    border-color: shade(@warning_bg_color, 0.6);
-    background-color: shade(@warning_bg_color, 0.95);
-}
-
-.warning button:active:hover {
-    border-top-color: shade(@warning_bg_color, 0.85);
-    border-right-color: shade(@warning_bg_color, 0.78);
-    border-left-color: shade(@warning_bg_color, 0.78);
-    border-bottom-color: shade(@warning_bg_color, 0.7);
-}
-
-.warning button.close {
-    color: @warning_fg_color;
-}
-
-.warning button.close:hover {
-    background-color: alpha(white, 0.2);
-}
-
-.warning button.close:active {
     color: @warning_fg_color;
-    background-color: alpha(black, 0.1);
-}
+    background-color: shade(@warning_bg_color, 1.08); }
+    .warning button:hover {
+      border-color: shade(@warning_bg_color, 0.85);
+      background-color: shade(@warning_bg_color, 1.1); }
+    .warning button:active {
+      border-color: shade(@warning_bg_color, 0.6);
+      background-color: shade(@warning_bg_color, 0.95); }
+      .warning button:active:hover {
+        border-color: shade(@warning_bg_color, 0.85); }
+    .warning button.close {
+      color: @warning_fg_color; }
+      .warning button.close:hover {
+        background-color: alpha(@light_shadow, 0.2); }
+      .warning button.close:active {
+        color: @warning_fg_color;
+        background-color: alpha(@dark_shadow, 0.1); }
 
 .question {
-    border-width: 1px;
-    border-style: solid;
+  border-width: 1px;
+  border-style: solid;
+  border-color: shade(@question_bg_color, 0.8);
+  color: @question_fg_color;
+  background-color: @question_bg_color; }
+  .question button {
     border-color: shade(@question_bg_color, 0.8);
-    background-color: @question_bg_color;
-    background-image: none;
-    color: @question_fg_color;
-}
-
-.question button {
-    border-top-color: shade(@question_bg_color, 0.8);
-    border-right-color: shade(@question_bg_color, 0.72);
-    border-left-color: shade(@question_bg_color, 0.72);
-    border-bottom-color: shade(@question_bg_color, 0.7);
-    background-color: shade(@question_bg_color, 1.08);
-    color: @question_fg_color;
-}
-
-.question button:hover {
-    border-top-color: shade(@question_bg_color, 0.85);
-    border-right-color: shade(@question_bg_color, 0.78);
-    border-left-color: shade(@question_bg_color, 0.78);
-    border-bottom-color: shade(@question_bg_color, 0.7);
-    background-color: shade(@question_bg_color, 1.10);
-}
-
-.question button:active {
-    border-color: shade(@question_bg_color, 0.6);
-    background-color: shade(@question_bg_color, 0.95);
-}
-
-.question button:active:hover {
-    border-top-color: shade(@question_bg_color, 0.85);
-    border-right-color: shade(@question_bg_color, 0.78);
-    border-left-color: shade(@question_bg_color, 0.78);
-    border-bottom-color: shade(@question_bg_color, 0.7);
-}
-
-.question button.close {
     color: @question_fg_color;
-}
-
-.question button.close:hover {
-    background-color: alpha(white, 0.2);
-}
-
-.question button.close:active {
-    color: @question_fg_color;
-    background-color: alpha(black, 0.1);
-}
+    background-color: shade(@question_bg_color, 1.08); }
+    .question button:hover {
+      border-color: shade(@question_bg_color, 0.85);
+      background-color: shade(@question_bg_color, 1.1); }
+    .question button:active {
+      border-color: shade(@question_bg_color, 0.6);
+      background-color: shade(@question_bg_color, 0.95); }
+      .question button:active:hover {
+        border-color: shade(@question_bg_color, 0.85); }
+    .question button.close {
+      color: @question_fg_color; }
+      .question button.close:hover {
+        background-color: alpha(@light_shadow, 0.2); }
+      .question button.close:active {
+        color: @question_fg_color;
+        background-color: alpha(@dark_shadow, 0.1); }
 
 .error {
-    border-width: 1px;
-    border-style: solid;
+  border-width: 1px;
+  border-style: solid;
+  border-color: shade(@error_bg_color, 0.8);
+  background-color: @error_bg_color;
+  color: @error_fg_color; }
+  .error button {
     border-color: shade(@error_bg_color, 0.8);
-    background-color: @error_bg_color;
-    background-image: none;
-    color: @error_fg_color;
-}
-
-.error button {
-    border-top-color: shade(@error_bg_color, 0.8);
-    border-right-color: shade(@error_bg_color, 0.72);
-    border-left-color: shade(@error_bg_color, 0.72);
-    border-bottom-color: shade(@error_bg_color, 0.7);
-    background-color: shade(@error_bg_color, 1.08);
-    color: @error_fg_color;
-}
-
-.error button:hover {
-    border-top-color: shade(@error_bg_color, 0.85);
-    border-right-color: shade(@error_bg_color, 0.78);
-    border-left-color: shade(@error_bg_color, 0.78);
-    border-bottom-color: shade(@error_bg_color, 0.7);
-    background-color: shade(@error_bg_color, 1.10);
-}
-
-.error button:active {
-    border-color: shade(@error_bg_color, 0.6);
-    background-color: shade(@error_bg_color, 0.95);
-}
-
-.error button:active:hover {
-    border-top-color: shade(@error_bg_color, 0.85);
-    border-right-color: shade(@error_bg_color, 0.78);
-    border-left-color: shade(@error_bg_color, 0.78);
-    border-bottom-color: shade(@error_bg_color, 0.7);
-}
-
-.error button.close {
-    color: @error_fg_color;
-}
-
-.error button.close:hover {
-    background-color: alpha(white, 0.2);
-}
-
-.error button.close:active {
     color: @error_fg_color;
-    background-color: alpha(black, 0.1);
-}
+    background-color: shade(@error_bg_color, 1.08); }
+    .error button:hover {
+      border-color: shade(@error_bg_color, 0.85);
+      background-color: shade(@error_bg_color, 1.1); }
+    .error button:active {
+      border-color: shade(@error_bg_color, 0.6);
+      background-color: shade(@error_bg_color, 0.95); }
+      .error button:active:hover {
+        border-color: shade(@error_bg_color, 0.85); }
+    .error button.close {
+      color: @error_fg_color; }
+      .error button.close:hover {
+        background-color: alpha(@light_shadow, 0.2); }
+      .error button.close:active {
+        color: @error_fg_color;
+        background-color: alpha(@dark_shadow, 0.1); }
 
-/*******************
- * symbolic images *
- *******************/
 image {
-    color: alpha(currentColor, 0.5);
-}
-
-image:hover {
-    color: alpha(currentColor, 0.9);
-}
+  color: alpha(currentColor, 0.75); }
+  image:hover {
+    color: alpha(currentColor, 0.9); }
+  image:selected, image:selected:hover {
+    color: @theme_selected_fg_color; }
+  view image, view image:hover {
+    color: alpha(currentColor, 0.9); }
+  view image:selected, view image:selected:hover {
+    color: @theme_selected_fg_color; }
 
-image:selected,
-image:selected:hover {
-    color: @theme_selected_fg_color;
-}
-
-view image,
-view image:hover {
-    color: alpha(currentColor, 0.9);
-}
-
-view image:selected,
-view image:selected:hover {
-    color: @theme_selected_fg_color;
-}
-
-/*****************
- * miscellaneous *
- *****************/
 .floating-bar {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0px;
-    background-color: @theme_bg_color;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-.floating-bar top {
-    border-top-width: 0;
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-}
-
-.floating-bar right {
-    border-right-width: 0;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.floating-bar bottom {
-    border-bottom-width: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-}
-
-.floating-bar left {
-    border-left-width: 0;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-.floating-bar button {
+  border-width: 1px;
+  border-style: solid;
+  border-color: shade(@theme_base_color, 0.85);
+  border-radius: 0px;
+  background-color: @theme_base_color;
+  color: @theme_fg_color; }
+  .floating-bar.top {
+    border-top-width: 0px;
+    border-top-right-radius: 0px;
+    border-top-left-radius: 0px; }
+  .floating-bar.bottom {
+    border-bottom-width: 0px;
+    border-bottom-right-radius: 0px;
+    border-bottom-left-radius: 0px; }
+  .floating-bar.top.left, .floating-bar.bottom.left {
+    border-left-width: 0px;
+    border-bottom-left-radius: 0px;
+    border-top-left-radius: 0px; }
+  .floating-bar.top.right, .floating-bar.bottom.right {
+    border-right-width: 0px;
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px; }
+  .floating-bar button {
     border-style: none;
-    background-color: transparent;
-    background-image: none;
-}
-
-.dim-label {
-    color: alpha(currentColor, 0.5);
-}
+    background-color: transparent; }
 
 .dnd {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_selected_bg_color, 0.9);
-}
-
-grip {
-    background-color: transparent;
-}
-
-arrow,
-combobox arrow {
-    color: alpha(currentColor, 0.7);
-}
-
-/********
- * menu *
- ********/
-menu,
-.menu,
-treemenu menu,
-toolbutton menu,
-combobox menu {
-    background-color: @menu_bg_color;
-}
-
-.primary-toolbar  menu,
-.primary-toolbar button  menu,
-toolbar  menu,
-toolbar .primary-toolbar  menu,
-headerbar  menu,
-headerbar .primary-toolbar  menu,
-menu {
-    margin: 4px;    /* avoid minify of menu */
-    padding: 0;
+  border-width: 1px;
+  border-style: solid;
+  border-color: @borders; }
+
+.terminal-screen, terminal-window, vte-terminal {
+  background-color: @terminal_bg_color;
+  color: @terminal_fg_color; }
+
+.nautilus-window notebook, .nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: @theme_base_color; }
+
+.caja-location-entry {
+  padding: 3px 5px; }
+
+scrolledwindow viewport.frame {
+  border: none; }
+
+arrow, combobox arrow {
+  color: alpha(currentColor, 0.75);
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px; }
+
+.context-menu, popover.touch-selection, .csd popover.touch-selection,
+popover.background.touch-selection, .csd popover.background.touch-selection {
+  font: initial; }
+
+.monospace {
+  font-family: Monospace; }
+
+.gedit-search-entry-occurrences-tag {
+  color: alpha(currentColor, 0.7);
+  border: none;
+  margin: 2px;
+  padding: 2px; }
+
+.gedit-search-slider {
+  border-color: @borders;
+  padding: 6px;
+  border-radius: 0 0 0px 0px;
+  border-width: 0 1px 1px 1px;
+  border-style: solid;
+  background-color: @theme_bg_color; }
+
+menu, .menu {
+  margin: 4px;
+  padding: 0;
+  border-radius: 0;
+  border-style: none;
+  color: @menu_fg_color;
+  background-color: @menu_bg_color; }
+  .csd menu, .csd .menu {
+    padding: 4px 0px;
     border-radius: 0;
-    border-style: none;
-    background-color: @menu_bg_color;
-    color: @menu_fg_color;
-}
-
-menu:selected {
-    background-color: @theme_selected_bg_color;
-}
-
-menu button:hover,
-menu button:active,
-menu button:active *:disabled,
-menu button:disabled,
-menu button {
-    border-width: 0;
+    border: none; }
+  menu > arrow, .menu > arrow {
+    padding: 4px;
+    border-color: transparent;
     background-color: @menu_bg_color;
-    background-image: none;
-}
-
-.context-menu {
-    font: initial;
-}
-
-menu > arrow.top,
-.menu > arrow.top {
-    margin-top: -3px;
-    border-bottom: 1px solid shade(@theme_bg_color, 0.9);
-    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-}
-
-menu > arrow.bottom,
-.menu > arrow.bottom {
-    margin-bottom: -3px;
-    border-top: 1px solid shade(@theme_bg_color, 0.9);
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-}
-
-/***********
- * menubar *
- ***********/
-menubar {
-    -GtkWidget-window-dragging: true;
-    
+    min-width: 16px;
+    min-height: 16px; }
+    menu > arrow.top, .menu > arrow.top {
+      margin-top: -6px;
+      border-bottom: 1px solid shade(@menu_bg_color, 0.9);
+      -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
+    menu > arrow.bottom, .menu > arrow.bottom {
+      margin-bottom: -6px;
+      border-top: 1px solid shade(@menu_bg_color, 0.9);
+      -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
+
+menubar, .menubar {
+  -GtkWidget-window-dragging: true;
+  padding: 0;
+  border-style: none;
+  background-color: @menubar_bg_color;
+  color: @menubar_fg_color; }
+  menubar:backdrop, .menubar:backdrop {
+    color: @theme_unfocused_fg_color;
+    background-color: @theme_unfocused_bg_color; }
+
+menubar > menuitem, .menubar > menuitem {
+  padding: 3px 5px;
+  border: none;
+  color: @menubar_fg_color;
+  background-color: transparent; }
+  menubar > menuitem:hover, .menubar > menuitem:hover {
+    color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color; }
+  menubar > menuitem:disabled, .menubar > menuitem:disabled {
+    color: @theme_disabled_fg_color;
+    background-color: transparent; }
+  menubar > menuitem:backdrop, .menubar > menuitem:backdrop {
+    color: @theme_unfocused_fg_color;
+    background-color: transparent; }
+
+menu menuitem, .menu menuitem {
+  min-height: 16px;
+  min-width: 40px;
+  padding: 4px;
+  border: none;
+  border-radius: 0;
+  color: @menu_fg_color;
+  background-color: @menu_bg_color; }
+  menu menuitem:hover, .menu menuitem:hover {
+    color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color; }
+  menu menuitem:disabled, .menu menuitem:disabled {
+    color: mix(@menu_fg_color, @menu_bg_color, 0.5); }
+  menu menuitem arrow, .menu menuitem arrow {
+    min-width: 16px;
+    min-height: 16px; }
+    menu menuitem arrow:dir(ltr), .menu menuitem arrow:dir(ltr) {
+      margin-left: 10px;
+      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+    menu menuitem arrow:dir(rtl), .menu menuitem arrow:dir(rtl) {
+      margin-right: 10px;
+      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
+
+menuitem check, menuitem radio {
+  min-height: 16px;
+  min-width: 16px; }
+menuitem accelerator {
+  color: alpha(currentColor, 0.55); }
+  menuitem accelerator:hover {
+    color: alpha(@theme_selected_fg_color, 0.8); }
+  menuitem accelerator:disabled {
+    color: @theme_disabled_fg_color; }
+
+popover, popover.background {
+  padding: 2px;
+  border-color: @borders;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 0px;
+  color: @theme_fg_color;
+  background-clip: border-box;
+  background-color: @theme_bg_color;
+  box-shadow: none; }
+  .csd popover, popover, .csd popover.background, popover.background {
+    border: 1px solid @borders; }
+  popover > list, popover > .view, popover > iconview, popover > toolbar, popover > .inline-toolbar, popover.background > list, popover.background > .view, popover.background > iconview, popover.background > toolbar, popover.background > .inline-toolbar {
     border-style: none;
-    background-color: @menubar_bg_color;
-    background-image: none;
-    color: @menubar_fg_color;
-}
-
-/***************
- * menubaritem *
- ***************/
-menubar > menuitem {
-    padding: 3px 5px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: @menubar_fg_color;
-}
-
-menubar > menuitem:hover {
-    border-color: @theme_selected_bg_color;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: shade(@menubar_fg_color, 1.08);
-}
-
-menubar > menuitem *:hover {
-    color: shade(@menubar_fg_color, 1.08);
-}
-
-/************
- * menuitem *
- ************/
-treemenu  menuitem {
-    padding: 0;
+    background-color: transparent; }
+  popover checkbutton:selected, popover radiobutton:selected, popover.background checkbutton:selected, popover.background radiobutton:selected {
+    color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color; }
+popover.osd {
+  box-shadow: none; }
+  popover.osd > toolbar button {
     border-width: 0;
-}
+    border-radius: 0;
+    background-color: transparent; }
+popover:backdrop {
+  border-color: @unfocused_borders;
+  color: @theme_unfocused_fg_color;
+  background-color: @theme_unfocused_bg_color;
+  box-shadow: none; }
+
+modelbutton.flat, menuitem.button.flat, .menuitem.button.flat {
+  padding: 2px 8px;
+  border: none;
+  color: @theme_fg_color;
+  background-color: transparent; }
+  modelbutton.flat:hover, modelbutton.flat:selected, modelbutton.flat:active:hover, menuitem.button.flat:hover, menuitem.button.flat:selected, menuitem.button.flat:active:hover, .menuitem.button.flat:hover, .menuitem.button.flat:selected, .menuitem.button.flat:active:hover {
+    color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color; }
+  modelbutton.flat > image, menuitem.button.flat > image, .menuitem.button.flat > image {
+    padding-right: 4px; }
+  modelbutton.flat.flat arrow.left, menuitem.button.flat.flat arrow.left, .menuitem.button.flat.flat arrow.left {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+  modelbutton.flat.flat arrow.right, menuitem.button.flat.flat arrow.right, .menuitem.button.flat.flat arrow.right {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 
-menuitem,
-menu  menuitem {
-    padding: 3px;
+notebook {
+  padding: 0; }
+  notebook.frame {
+    margin: -1px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: @borders; }
+    notebook.frame > header {
+      margin: -1px; }
+      notebook.frame > header.top {
+        margin-bottom: 0; }
+      notebook.frame > header.bottom {
+        margin-top: 0; }
+      notebook.frame > header.left {
+        margin-right: 0; }
+      notebook.frame > header.right {
+        margin-left: 0; }
+      notebook.frame > header.top, notebook.frame > header.bottom {
+        padding-left: 0;
+        padding-right: 0; }
+      notebook.frame > header.left, notebook.frame > header.right {
+        padding-top: 0;
+        padding-bottom: 0; }
+  notebook > stack:not(:only-child) {
+    background-color: @theme_base_color; }
+  notebook tab {
+    padding: 6px 20px;
     border-width: 1px;
     border-style: solid;
-    border-color: transparent;
     border-radius: 0;
-    background-color: transparent;
-    background-image: none;
-    color: @menu_fg_color;
-}
-
-menu  menuitem:active,
-menu  menuitem:hover {
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-}
-
-menu  menuitem:active,
-menu  menuitem *:active,
-menu  menuitem:hover,
-menu  menuitem *:hover {
-    color: @theme_selected_fg_color;
-}
+    border-color: @borders;
+    color: @theme_fg_color;
+    background-color: @theme_bg_color; }
+    notebook tab:checked {
+      border-color: @borders;
+      background-color: @theme_base_color; }
+      notebook tab:checked:backdrop {
+        border-color: @unfocused_borders;
+        background-color: @theme_unfocused_base_color; }
+    notebook tab:backdrop {
+      background-color: @theme_unfocused_bg_color; }
+    notebook tab button, notebook tab button:hover, notebook tab button:focus, notebook tab button:active, notebook tab button:checked, notebook tab button:active:hover, notebook tab button:checked:hover, notebook tab button:backdrop, notebook tab:checked button, notebook tab:checked button:hover, notebook tab:checked button:focus, notebook tab:checked button:active, notebook tab:checked button:checked, notebook tab:checked button:active:hover, notebook tab:checked button:checked:hover, notebook tab:checked button:backdrop {
+      border-color: transparent;
+      background-color: transparent;
+      color: @theme_fg_color; }
+  notebook > header {
+    background-color: @theme_bg_color; }
+    notebook > header.top {
+      padding-top: 2px;
+      box-shadow: 0 1px @borders; }
+      notebook > header.top > tabs > tab {
+        border-bottom: none;
+        margin-top: 2px; }
+        notebook > header.top > tabs > tab:checked {
+          border-top-left-radius: 0px;
+          border-top-right-radius: 0px;
+          margin-top: 0;
+          margin-bottom: -1px; }
+    notebook > header.bottom {
+      box-shadow: 0 -1px @borders; }
+      notebook > header.bottom > tabs > tab {
+        border-top: none;
+        margin-bottom: 2px; }
+        notebook > header.bottom > tabs > tab:checked {
+          border-bottom-left-radius: 0px;
+          border-bottom-right-radius: 0px;
+          margin-bottom: 0;
+          margin-top: -1px; }
+    notebook > header.right {
+      box-shadow: -1px 0 @borders; }
+      notebook > header.right > tabs > tab {
+        border-left: none;
+        margin-right: 2px; }
+        notebook > header.right > tabs > tab:checked {
+          border-top-right-radius: 0px;
+          border-bottom-right-radius: 0px;
+          margin-right: 0;
+          margin-left: -1px; }
+    notebook > header.left {
+      box-shadow: 1px 0 @borders; }
+      notebook > header.left > tabs > tab {
+        border-right: none;
+        margin-left: 2px; }
+        notebook > header.left > tabs > tab:checked {
+          border-top-left-radius: 0px;
+          border-bottom-left-radius: 0px;
+          margin: 0;
+          margin-right: -1px; }
+  notebook > header.top > tabs > arrow.up, notebook > header.bottom > tabs > arrow.up {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+    notebook > header.top > tabs > arrow.up:last-child, notebook > header.bottom > tabs > arrow.up:last-child {
+      margin-left: 2px; }
+  notebook > header.top > tabs > arrow.down, notebook > header.bottom > tabs > arrow.down {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
+    notebook > header.top > tabs > arrow.down:first-child, notebook > header.bottom > tabs > arrow.down:first-child {
+      margin-right: 2px; }
+  notebook > header.left > tabs > arrow.up, notebook > header.right > tabs > arrow.up {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
+    notebook > header.left > tabs > arrow.up:last-child, notebook > header.right > tabs > arrow.up:last-child {
+      margin-top: 2px; }
+  notebook > header.left > tabs > arrow.down, notebook > header.right > tabs > arrow.down {
+    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
+    notebook > header.left > tabs > arrow.down:first-child, notebook > header.right > tabs > arrow.down:first-child {
+      margin-bottom: 2px; }
+  notebook > header > tabs > arrow {
+    color: @theme_fg_color; }
+    notebook > header > tabs > arrow:hover {
+      color: shade(@theme_fg_color, 1.2); }
+    notebook > header > tabs > arrow:active {
+      color: shade(@theme_fg_color, 0.8); }
+    notebook > header > tabs > arrow:disabled {
+      color: shade(@theme_bg_color, 0.6); }
 
-menu  menuitem:disabled,
-menu  menuitem *:disabled {
-    color: mix(@menu_fg_color, @menu_bg_color, 0.5);
-}
+paned > separator {
+  border: none;
+  color: transparent;
+  background-color: @borders; }
+  paned > separator:backdrop {
+    background-color: @unfocused_borders; }
+  paned > separator:selected {
+    background-color: @borders; }
+paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar {
+  border-style: none; }
+
+/* not implemented in windows 10 */
+overshoot.top {
+  background-color: transparent;
+  border: none;
+  box-shadow: none; }
+overshoot.bottom {
+  background-color: transparent;
+  border: none;
+  box-shadow: none; }
+overshoot.left {
+  background-color: transparent;
+  border: none;
+  box-shadow: none; }
+overshoot.right {
+  background-color: transparent;
+  border: none;
+  box-shadow: none; }
 
-/* menu arrow */
-menu menuitem arrow,
-.menu menuitem arrow {
-    min-height: 16px;
-    min-width: 16px;
-}
-
-menu menuitem arrow:dir(ltr),
-.menu menuitem arrow:dir(ltr) {
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    margin-left: 10px;
-}
-
-menu menuitem arrow:dir(rtl),
-.menu menuitem arrow:dir(rtl) {
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
-    margin-right: 10px;
-}
-
-menuitem check,
-menuitem radio,
-menuitem check:hover,
-menuitem radio:hover,
-menuitem check:disabled,
-menuitem radio:disabled {
-    border-style: none;
-    min-width: 16px;
-    min-height: 16px;
-    background-color: transparent;
-    background-image: none;
-}
+/* not implemented in windows 10 */
+undershoot.top {
+  background-color: transparent;
+  padding-top: 1px;
+  background-size: 10px 1px;
+  background-repeat: repeat-x;
+  background-origin: content-box;
+  background-position: center top; }
+undershoot.bottom {
+  background-color: transparent;
+  padding-bottom: 1px;
+  background-size: 10px 1px;
+  background-repeat: repeat-x;
+  background-origin: content-box;
+  background-position: center bottom; }
+undershoot.left {
+  background-color: transparent;
+  padding-left: 1px;
+  background-size: 1px 10px;
+  background-repeat: repeat-y;
+  background-origin: content-box;
+  background-position: left center; }
+undershoot.right {
+  background-color: transparent;
+  padding-right: 1px;
+  background-size: 1px 10px;
+  background-repeat: repeat-y;
+  background-origin: content-box;
+  background-position: right center; }
 
-menuitem check:active,
-menuitem radio:active {
-    border-style: none;
-    background-color: transparent;
-}
+.overlay-bar {
+  background-color: alpha(@dark_shadow, 0.8);
+  border-radius: 0;
+  padding: 3px 6px;
+  margin: 3px; }
+  .overlay-bar label {
+    color: @tooltip_fg_color; }
 
-menuitem calendar:indeterminate {
-    color: mix(@menu_fg_color, @menu_bg_color, 0.5);
-}
+progressbar {
+  padding: 0;
+  border: none;
+  color: mix(@theme_fg_color, @theme_selected_fg_color, 0.5);
+  background-color: transparent; }
+  progressbar progress {
+    border: none;
+    border-radius: 0px;
+    background-color: @progressbar_bg_color; }
+    progressbar progress:backdrop {
+      background-color: @progressbar_bg_color; }
+  progressbar trough {
+    border: 1px solid shade(@borders, 0.85);
+    border-radius: 0px;
+    background-color: alpha(@dark_shadow, 0.1); }
+    progressbar trough:backdrop {
+      background-color: shade(@theme_unfocused_bg_color, 0.95); }
+  progressbar.horizontal trough, progressbar.horizontal progress {
+    min-height: 14px; }
+  progressbar.vertical trough, progressbar.vertical progress {
+    min-width: 14px; }
+
+treeview.view.progressbar, treeview.view.progressbar:disabled {
+  color: @theme_selected_fg_color;
+  border-radius: 0;
+  background-color: @progressbar_bg_color; }
+treeview.view.progressbar:focus, treeview.view.progressbar:selected:focus, treeview.view.progressbar:focus:selected, treeview.view.progressbar:focus:selected:focus, treeview.view.progressbar:disabled:selected {
+  border-radius: 0;
+  color: @theme_selected_bg_color;
+  background-color: @progressbar_bg_color; }
+treeview.view.trough {
+  color: @theme_fg_color;
+  background-color: alpha(@dark_shadow, 0.1);
+  border-radius: 0;
+  border: none; }
+  treeview.view.trough:selected, treeview.view.trough:selected:focus {
+    color: @theme_selected_fg_color;
+    background-color: alpha(@dark_shadow, 0.1);
+    border-radius: 0;
+    border: none; }
+infobar treeview.view trough, row:selected treeview.view trough {
+  background-color: alpha(@dark_shadow, 0.1); }
 
-menuitem calendar button {
-    border-style: none;
-    background-color: transparent;
-    background-image: none;
-}
-
-menuitem entry {
-    border-color: shade(@theme_bg_color, 0.6);
-    background-color: @menu_bg_color;
-    background-image: none;
-    color: @menu_fg_color;
-}
-
-menuitem entry:active,
-menuitem entry:focus {
-    border-color: shade(@theme_selected_bg_color, 0.6);
-}
-
-menuitem  accelerator {
-    color: alpha(@menu_fg_color, 0.6);
-}
-
-menuitem  accelerator:hover {
-    color: alpha(@theme_selected_fg_color, 0.8);
-}
-
-menuitem  accelerator:disabled {
-    color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6);
-}
-
-modelbutton > image {
-    padding-right: 4px;
-}
-
-/************
- * popovers *
- ************/
-popover {
-    margin: 10px;
-    padding: 2px;
-    border-radius: 0px;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-width: 1px;
-    border-style: solid;
-    background-clip: border-box;
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-    box-shadow: 0 2px 3px alpha(black, 0.5);
-}
-
-popover.osd {
-    box-shadow: 0 2px 7px 3px alpha(black, 0.5);
-}
-
-popover > list,
-popover > view,
-popover > toolbar {
-    background-color: transparent;
-}
-
-popover.osd > toolbar button {
-    border-radius: 0;
-    border-width: 0;
-    background-image: none;
-    background-color: transparent;
-}
-
-popover separator {
-    border: 0;
-    background-color: transparent;
-    color: alpha(currentColor, 0.5);
-    font-size: 80%;
-    font-weight: bold;
-}
-
-modelbutton.flat,
-modelbutton.flat:active,
-modelbutton.flat:disabled,
-modelbutton.flat:active:disabled {
-    padding: 3px;
-    background-color: transparent;
-    background-image: none;
-    border-color: transparent;
-    border-style: none;
-    box-shadow: none;
-    color: @theme_fg_color;
-}
-
-modelbutton.flat:hover,
-modelbutton.flat:selected,
-modelbutton.flat:active:hover {
-    border-width: 0;
-    border-color: transparent;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-modelbutton.flat arrow.left {
-    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
-}
-
-modelbutton.flat arrow.right {
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-}
-
-popover.background,
-.csd popover.background {
-    box-shadow: 0 0 2px 0px gray;
-    border: 1px solid shade(@theme_bg_color, 0.9);
-}
-
-popover.background:backdrop {
-    background-color: @theme_bg_color;
-    box-shadow: none;
-}
-
-/************
- * notebook *
- ************/
-notebook {
-    background-color: @theme_base_color;
-    background-image: none;
-    border-radius: 0;
-    padding: 0;
-    background-clip: border-box;
-    border-color: shade(@theme_bg_color, 0.82);
-    border-width: 0;
-    border-style: solid;
-}
-
-notebook frame {
-    border-width: 0;
-}
-
-notebook > header {
-    border-width: 0;
-    background-color: @theme_bg_color;
-}
-
-notebook > header .frame {
-    border-color: @theme_bg_color;
-    box-shadow: none;
-    border-width: 0;
-}
-
-notebook view {
-    border-width: 0;
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-notebook > stack:not(:only-child) {
-    background-color: @theme_base_color;
-    border: 1px solid shade(@theme_bg_color, 0.8);
-    box-shadow: none;
-}
-
-notebook tab {
-    background-image: none;
-    background-color: shade(@theme_bg_color, 0.9);
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-width: 1px;
-    border-radius: 0px;
-    box-shadow: none;
-}
-
-notebook tab:checked {
-    border-color: shade(@theme_bg_color, 0.82);
-    border-style: solid;
-    border-width: 1px;
-    background-color: @theme_base_color;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-notebook tab label {
-    padding: 4px 8px 4px 8px;
-}
-
-notebook tab {
-    color: shade(@theme_bg_color, 0.48);
-}
-
-notebook header.top tab:checked {
-    padding: 3px 7px 1px 7px;
-    box-shadow: 0 1px @theme_base_color;
-    margin-top: 0;
-}
-
-notebook header.top tab {
-    padding: 2px 5px 0 5px;
-    border-bottom-width: 0;
-    margin-top: 2px;
-}
-
-notebook header.right tab:checked {
-    padding: 4px 6px 4px 1px;
-    background-image: none;
-    background-color: @theme_base_color;
-    box-shadow: -1px 0 @theme_base_color;
-    margin-right: 0;
-}
-
-notebook header.right tab {
-    padding: 3px 4px 3px 0;
-    margin-right: 2px;
-    border-left-width: 0;
-}
-
-notebook header.bottom tab:checked {
-    padding: 1px 7px 4px 7px;
-    background-image: none;
-    background-color: @theme_base_color;
-    box-shadow: 0 -1px @theme_base_color;
-    margin-bottom: 0;
-}
-
-notebook header.bottom tab {
-    padding: 0 5px 3px 5px;
-    margin-bottom: 2px;
-    border-top-width: 0;
-}
-
-notebook header.left tab:checked {
-    padding: 4px 1px 4px 6px;
-    background-image: none;
-    background-color: @theme_base_color;
-    box-shadow: 1px 0 @theme_base_color;
-    margin-left: 0;
-}
-
-notebook header.left tab {
-    padding: 3px 0 3px 4px;
-    margin-left: 2px;
-    border-right-width: 0;
-}
-
-/* close button styling */
-notebook tab button,
-notebook tab button:hover,
-notebook tab button:focus,
-notebook tab button:active,
-notebook tab button:checked,
-notebook tab button:active:hover,
-notebook tab button:checked:hover,
-notebook tab button:backdrop,
-notebook tab:checked button,
-notebook tab:checked button:hover,
-notebook tab:checked button:focus,
-notebook tab:checked button:active,
-notebook tab:checked button:checked,
-notebook tab:checked button:active:hover,
-notebook tab:checked button:checked:hover,
-notebook tab:checked button:backdrop {
-    border-color: transparent;
-    box-shadow: none;
-    background-color: transparent;
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-notebook > header.top > tabs > arrow.up,
-notebook > header.bottom > tabs > arrow.up {
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-}
-
-notebook > header.top > tabs > arrow.up:last-child,
-notebook > header.bottom > tabs > arrow.up:last-child {
-    margin-left: 2px;
-}
-
-notebook > header.top > tabs > arrow.down,
-notebook > header.bottom > tabs > arrow.down {
-    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
-}
-
-notebook > header.top > tabs > arrow.down:first-child,
-notebook > header.bottom > tabs > arrow.down:first-child {
-    margin-right: 2px;
-}
-
-notebook > header.left > tabs > arrow.up,
-notebook > header.right > tabs > arrow.up {
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-}
-
-notebook > header.left > tabs > arrow.up:last-child,
-notebook > header.right > tabs > arrow.up:last-child {
-    margin-top: 2px;
-}
-
-notebook > header.left > tabs > arrow.down,
-notebook > header.right > tabs > arrow.down {
-    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-}
-
-notebook > header.left > tabs > arrow.down:first-child,
-notebook > header.right > tabs > arrow.down:first-child {
-    margin-bottom: 2px;
-}
-
-notebook > header > tabs > arrow {
-    color: @theme_fg_color;
-}
-
-notebook > header > tabs > arrow:hover {
-    color: shade(@theme_fg_color, 1.2);
-}
-
-notebook > header > tabs > arrow:active {
-    color: shade(@theme_fg_color, 0.8);
-}
-
-notebook > header > tabs > arrow:disabled {
-    color: shade(@theme_bg_color, 0.6);
-}
-
-/******************
- * pane separator *
- ******************/
-paned > separator {
-    background-color: shade(@theme_bg_color, 0.95);
-    color: transparent;
-    border-style: none;
-}
-
-paned .sidebar.left,
-paned .sidebar.right,
-paned .sidebar.left:dir(rtl),
-paned .sidebar:dir(rtl),
-paned .sidebar:dir(ltr),
-paned .sidebar {
-    border-style: none;
-}
-
-/*************************
- * progressbar and scale *
- *************************/
-progressbar {
-    padding: 0;
-    border-width: 1px;
-    border-radius: 0px;
-}
-
-progressbar.horizontal progress,
-progressbar.horizontal trough {
-    min-height: 14px;
-}
-
-progressbar.vertical progress,
-progressbar.vertical trough {
-    min-width: 14px;
-}
-
-progressbar progress,
-treeview.view.progressbar,
-treeview.view.progressbar:focus {
-    background-image: none;
-    background-color: @progressbar_color; 
-    box-shadow:none;
-    border: 1px solid transparent;
-    border-image: image(@progressbar_color) 8 8 8 8 / 8px 8px 8px 8px stretch;
-}
-
-row:selected progressbar progress,
-treeview.view.progressbar:selected,
-treeview.view.progressbar:selected:focus,
-treeview.view.progressbar:focus:selected,
-treeview.view.progressbar:focus:selected:focus {
-    color: @theme_selected_fg_color;
-    background-color: @progressbar_color;
-}
-
-progressbar trough,
-treeview.view trough,
-row:selected progressbar trough {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.7);
-    background-color: shade(@theme_bg_color, 0.85);
-    background-image: image(shade(@theme_bg_color, 0.85));
-}
-
-treeview.view trough:selected,
-treeview.view trough:selected:focus {
-    color: @theme_fg_color;
-    background-color: shade(@theme_bg_color, 0.85);
-}
-
-/* level bars as used for password quality or remaining power */
 levelbar trough {
-    padding: 1px;
-    border-radius: 4px;
-}
-
+  padding: 1px;
+  border-radius: 0; }
+levelbar.horizontal.discrete block {
+  margin: 0 1px; }
+levelbar.vertical.discrete block {
+  margin: 1px 0; }
 levelbar block {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: @theme_selected_bg_color;
-}
+  border: none;
+  padding: 2px;
+  border-radius: 0px;
+  background-color: @theme_selected_bg_color; }
+  levelbar block.high {
+    background-color: shade(@success_color, 0.9); }
+  levelbar block.low {
+    background-color: shade(@warning_color, 0.9); }
+  levelbar block.empty {
+    background-color: alpha(@dark_shadow, 0.1); }
 
-levelbar.indicator-continuous block {
-    padding: 1px;
-    border-radius: 4px;
-}
-
-levelbar.indicator-discrete block.horizontal {
-    margin: 0 1px;
-}
-
-levelbar.indicator-discrete block.vertical {
-    margin: 1px 0px;
-}
-
-/* discrete indicator border rounding,
-   uncomment when :nth-child will be working
-   on the widget
-
-levelbar.indicator-discrete block.horizontal:first-child {
-    border-radius: 2px 0 0 2px;
-}
-
-levelbar.indicator-discrete block.horizontal:last-child {
-    border-radius: 0 2px 2px 0px;
-}
-
-levelbar.indicator-discrete block.vertical:first-child {
-    border-radius: 2px 2px 0 0px;
-}
-
-levelbar.indicator-discrete block.vertical:last-child {
-    border-radius: 0 0 2px 2px;
-}
-*/
-
-levelbar block.high {
-    border-color: shade(@success_color, 0.85);
-    background-image: linear-gradient(to bottom,
-                                      shade(@success_color, 1.2),
-                                      @success_color 75%,
-                                      shade(@success_color, 0.95)
-                                      );
-}
-
-levelbar block.low {
-    border-color: shade(@warning_color, 0.80);
-    background-image: linear-gradient(to bottom,
-                                      shade(@warning_color, 1.3),
-                                      @warning_color 75%,
-                                      shade(@warning_color, 0.9)
-                                      );
-}
-
-levelbar block.empty {
-    border-color: alpha(@theme_fg_color, 0.1);
-    background-color: transparent;
-    background-image: none;
-}
-
-/*********
- * Scale *
- *********/
 scale {
-    min-height: 10px;
-    min-width: 10px;
-    padding: 12px;
-    background-color: transparent;    
-}
-
-scale slider {
-    min-height: 19px;
-    min-width: 19px;
-    margin: -9px; 
-}
-
-scale.fine-tune.horizontal {
-    padding-top: 9px;
-    padding-bottom: 9px;
-    min-height: 16px; 
-}
-
-scale.fine-tune.vertical {
-    padding-left: 9px;
-    padding-right: 9px;
-    min-width: 16px; 
-}
-
-scale.fine-tune slider {
-    margin: -6px; 
-}
-
-scale.fine-tune fill,
-scale.fine-tune highlight,
-scale.fine-tune trough {
+  min-height: 10px;
+  min-width: 10px;
+  padding: 12px; }
+  scale fill, scale trough {
+    border: 1px solid @borders;
     border-radius: 0;
-    -gtk-outline-radius: 0; 
-}
-
-scale trough {
-    margin: 8px 0;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0px;
-    background-color: shade(@theme_bg_color, 0.9);
-    background-image: none;
-}
-
-scale slider,
-scale slider.horizontal {
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horiz.png")); 
-}
-
-scale.vertical slider {
-    background-image: -gtk-scaled(url("assets/slider-vert.png")); 
-}
-
-scale.vertical slider:hover, 
-scale.vertical slider:active {
-    background-image: -gtk-scaled(url("assets/slider-vert-hover.png")); 
-}
-
-scale.vertical slider:backdrop,
-scale.vertical slider:disabled,
-scale.vertical slider:backdrop:disabled {
-    background-image: -gtk-scaled(url("assets/slider-vert-insensitive.png")); 
-}
-
-scale slider {
-	background-image: -gtk-scaled(url("assets/slider-horiz.png")); 
-	background-position: center;
-    background-repeat: no-repeat;
-}
-
-scale slider:hover,
-scale slider:active {
-	background-image: -gtk-scaled(url("assets/slider-horiz-hover.png")); 
-	background-position: center;
-    background-repeat: no-repeat;
-}
-
-scale slider:disabled {
-	background-image: -gtk-scaled(url("assets/slider-horiz-insensitive.png")); 
-	background-position: center;
-    background-repeat: no-repeat;
-}
-
-scale slider:backdrop {
-	background-image: -gtk-scaled(url("assets/slider-horiz-insensitive.png"));
-	background-position: center;
-    background-repeat: no-repeat;
-}
-
-scale value {
-    color: alpha(currentColor,0.55); 
-}
-
-scale marks {
-    color: alpha(currentColor,0.55); 
-}
-
-scale marks.top {
-    margin-bottom: 6px;
-    margin-top: -12px; 
-}
-
-scale marks.bottom {
-    margin-top: 6px;
-    margin-bottom: -12px; 
-}
-
-scale marks.top {
-    margin-right: 6px;
-    margin-left: -12px; 
-}
-
-scale marks.bottom {
-    margin-left: 6px;
-    margin-right: -12px; 
-}
-
-scale.fine-tune marks.top {
-    margin-bottom: 6px;
-    margin-top: -9px; 
-}
-
-scale.fine-tune marks.bottom {
-    margin-top: 6px;
-    margin-bottom: -9px; 
-}
-
-scale.fine-tune marks.top {
-    margin-right: 6px;
-    margin-left: -9px; 
-}
-
-scale.fine-tune marks.bottom {
-    margin-left: 6px;
-    margin-right: -9px; 
-}
-
-scale.horizontal indicator {
+    background-color: alpha(@dark_shadow, 0.1);
+    outline-offset: 2px;
+    -gtk-outline-radius: 0; }
+    scale fill:disabled, scale trough:disabled {
+      background-color: alpha(@dark_shadow, 0.05); }
+      scale fill:disabled:backdrop, scale trough:disabled:backdrop {
+        background-color: alpha(@dark_shadow, 0.05); }
+    scale fill:backdrop, scale trough:backdrop {
+      background-color: alpha(@dark_shadow, 0.1); }
+  scale highlight {
+    border: none;
+    border-radius: 4px;
+    background-color: transparent; }
+    scale highlight:disabled {
+      background-color: transparent; }
+      scale highlight:disabled:backdrop {
+        background-color: transparent; }
+    scale highlight:backdrop {
+      background-color: transparent; }
+  scale.horizontal indicator {
     min-height: 6px;
-    min-width: 1px; 
-}
-
-scale.horizontal.fine-tune indicator {
-    min-height: 3px; 
-}
-
-scale.vertical indicator {
+    min-width: 1px; }
+  scale.horizontal.fine-tune indicator {
+    min-height: 3px; }
+  scale.vertical indicator {
     min-height: 1px;
-    min-width: 6px; 
-}
-
-scale.vertical.fine-tune indicator {
-    min-width: 3px;
-}
-
-/*************
- * scrollbar *
- *************/
-scrollbar {
-    border-width: 0;
-    border-style: solid;
-    padding: 0;
+    min-width: 6px; }
+  scale.vertical.fine-tune indicator {
+    min-width: 3px; }
+  scale.fine-tune.horizontal {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    min-height: 14px; }
+  scale.fine-tune.vertical {
+    padding-left: 10px;
+    padding-right: 10px;
+    min-width: 14px; }
+  scale.fine-tune slider {
+    margin-top: -6px;
+    margin-bottom: -9px; }
+  scale.fine-tune fill, scale.fine-tune trough, scale.fine-tune highlight {
     border-radius: 0;
-    background-color: shade(@theme_bg_color, 0.9);
-    background-image: none;
-    border-image: none;
-}
-
-scrollbar button,
-scrollbar button:hover,
-scrollbar button:active:hover {
-    border-width: 0;
+    -gtk-outline-radius: 0; }
+  scale.fine-tune marks.top {
+    margin-bottom: 8px;
+    margin-top: -13px; }
+  scale.fine-tune marks.bottom {
+    margin-top: 8px;
+    margin-bottom: -13px; }
+  scale.fine-tune marks.top {
+    margin-right: 8px;
+    margin-left: -13px; }
+  scale.fine-tune marks.bottom {
+    margin-left: 8px;
+    margin-right: -13px; }
+  scale slider {
+    min-height: 19px;
+    min-width: 11px;
+    margin: -5px;
+    margin-bottom: -10px;
+    border: none;
     border-radius: 0;
-    min-height: 14px;
-    min-width: 0px;
-    box-shadow: none;
+    color: @theme_selected_fg_color;
     background-color: transparent;
-    background-image: none;
-    color: shade(@theme_bg_color, 0.4);
-}
-
-scrollbar.horizontal button {
-    min-height: 0;
-    min-width: 14px;
-}
+    background-image: url("assets/slider-horiz.png"); }
+    scale slider:hover {
+      color: @theme_selected_fg_color;
+      background-image: url("assets/slider-horiz-hover.png"); }
+    scale slider:disabled {
+      -gtk-icon-shadow: none;
+      background-image: url("assets/slider-horiz-insensitive.png"); }
+      scale slider:disabled:backdrop {
+        -gtk-icon-shadow: none;
+        background-image: url("assets/slider-horiz-insensitive.png"); }
+    scale slider:backdrop {
+      color: @theme_unfocused_selected_fg_color;
+      background-image: url("assets/slider-horiz-insensitive.png"); }
+  scale.vertical slider {
+    min-height: 11px;
+    min-width: 19px;
+    margin: -5px;
+    margin-right: -10px;
+    background-image: url("assets/slider-vert.png"); }
+    scale.vertical slider:hover {
+      background-image: url("assets/slider-vert-hover.png"); }
+    scale.vertical slider:disabled {
+      background-image: url("assets/slider-vert-insensitive.png"); }
+      scale.vertical slider:disabled:backdrop {
+        background-image: url("assets/slider-vert-insensitive.png"); }
+    scale.vertical slider:backdrop {
+      background-image: url("assets/slider-vert-insensitive.png"); }
+  scale value {
+    color: alpha(currentColor, 0.35); }
+  scale marks {
+    color: alpha(currentColor, 0.35); }
+    scale marks.top {
+      margin-bottom: 6px;
+      margin-top: -12px; }
+    scale marks.bottom {
+      margin-top: 6px;
+      margin-bottom: -12px; }
+    scale marks.top {
+      margin-right: 6px;
+      margin-left: -12px; }
+    scale marks.bottom {
+      margin-left: 6px;
+      margin-right: -12px; }
 
-scrollbar slider {
-    border-width: 0;
+scrollbar {
+  border: none;
+  background-color: shade(@theme_bg_color, 0.9); }
+  scrollbar trough {
+    border: none;
+    border-radius: 0; }
+  scrollbar:backdrop {
+    background-color: shade(@theme_bg_color, 0.9); }
+  scrollbar button, scrollbar button:hover, scrollbar button:active, scrollbar button:disabled {
+    padding: 3px;
+    border-color: shade(@theme_bg_color, 0.9);
+    background-color: shade(@theme_bg_color, 0.9); }
+  scrollbar slider {
     min-width: 45px;
     min-height: 14px;
-    border-color: transparent;
-    border-radius: 0;
-    background-color: mix(@theme_bg_color, @theme_fg_color, 0.32);
-}
-
-scrollbar.vertical slider {
+    margin: 0;
+    border: none;
+    border-radius: 0px;
+    background-clip: padding-box;
+    background-color: shade(@theme_bg_color, 0.6); }
+    scrollbar slider:hover {
+      background-color: shade(@theme_bg_color, 0.6); }
+      scrollbar slider:hover:active {
+        background-color: shade(@theme_bg_color, 0.55); }
+    scrollbar slider:backdrop {
+      background-color: shade(@theme_bg_color, 0.55); }
+    scrollbar slider:disabled {
+      background-color: transparent; }
+  scrollbar.vertical slider {
     min-width: 14px;
-    min-height: 45px;
-}
-
-scrollbar slider:hover,
-scrollbar.vertical slider:hover {
-    border-color: transparent;
-    background-color: mix(@theme_bg_color, @theme_fg_color, 0.5);
-}
-
-scrollbar slider:active,
-scrollbar.vertical slider:active {
-    border-color: transparent;
-    background-color: shade(@theme_bg_color, 0.5);
-}
+    min-height: 45px; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
+    border: none;
+    opacity: 0.7;
+    margin: 0;
+    background-color: transparent; }
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+      margin: 0;
+      min-width: 2px;
+      min-height: 2px;
+      background-color: mix(@theme_bg_color, @theme_fg_color, 0.6);
+      border: 2px solid transparent;
+      border-radius: 2px; }
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
+      margin: 0;
+      min-width: 40px; }
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
+      margin: 0;
+      min-height: 40px; }
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering) button {
+      min-width: 0;
+      min-height: 0;
+      padding: 0;
+      border: none;
+      box-shadow: none;
+      color: transparent;
+      background-color: transparent; }
+  scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
+    opacity: 1; }
+  scrollbar.horizontal slider {
+    min-width: 40px; }
+  scrollbar.horizontal button {
+    min-height: 6px;
+    min-width: 6px; }
+    scrollbar.horizontal button.down {
+      -gtk-icon-source: url("assets/right.svg"); }
+    scrollbar.horizontal button.up {
+      -gtk-icon-source: url("assets/left.svg"); }
+  scrollbar.vertical slider {
+    min-height: 40px; }
+  scrollbar.vertical button {
+    min-height: 6px;
+    min-width: 6px; }
+    scrollbar.vertical button.down {
+      -gtk-icon-source: url("assets/down.svg"); }
+    scrollbar.vertical button.up {
+      -gtk-icon-source: url("assets/up.svg"); }
+  treeview ~ scrollbar.vertical {
+    border-top: 1px solid @borders;
+    margin-top: -1px; }
 
-scrollbar slider.fine-tune:hover:active {
-    border-width: 2px;
-    border-color: transparent;
-}
-
-scrollbar.vertical button.down {
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-}
-
-scrollbar.vertical button.up {
-    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-}
-
-scrollbar.horizontal button.down {
-/*    -gtk-icon-source: -gtk-icontheme("pan-right-symbolic");*/
-    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-}
-
-scrollbar.horizontal button.up {
-/*    -gtk-icon-source: -gtk-icontheme("pan-left-symbolic");*/
-    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
-}
-
-treeview ~ scrollbar.vertical {
-    border-top: 1px solid shade(@theme_bg_color, 0.9);
-    margin-top: -1px;
-}
-
-/*************
- * separator *
- *************/
-.sidebar view separator,
-view separator,
-separator,
 separator {
+  -gtk-icon-source: none;
+  min-width: 1px;
+  min-height: 1px;
+  background-color: @borders; }
+  separator:backdrop {
+    background-color: @unfocused_borders; }
+  button separator {
+    margin: 4px 1px; }
+  .sidebar view separator, view separator, separator .separator, separator {
+    border: none;
+    background-color: @borders; }
+    .sidebar view separator:backdrop, view separator:backdrop, separator .separator:backdrop, separator:backdrop {
+      border: none;
+      background-color: @unfocused_borders; }
+  .primary-toolbar separator, toolbar separator {
+    background-color: mix(@borders, @toolbar_bg_color, 0.5); }
+    .primary-toolbar separator:backdrop, toolbar separator:backdrop {
+      background-color: @unfocused_borders; }
+  headerbar separator {
+    -GtkWidget-window-dragging: true;
+    margin-top: 4px;
+    margin-bottom: 4px;
+    background-color: mix(@borders, @headerbar_bg_color, 0.5); }
+    headerbar separator:backdrop {
+      background-color: @unfocused_borders; }
+  .titlebar separator, .titlebar:not(headerbar) > separator, .titlebar separator.titlebutton, .titlebar:not(headerbar) > separator.titlebutton {
+    -GtkWidget-window-dragging: true;
+    background-color: mix(@borders, @titlebar_bg_color, 0.5); }
+    .titlebar separator:backdrop, .titlebar:not(headerbar) > separator:backdrop, .titlebar separator.titlebutton:backdrop, .titlebar:not(headerbar) > separator.titlebutton:backdrop {
+      background-color: @unfocused_borders; }
+  headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton {
     min-width: 1px;
     min-height: 1px;
-    -gtk-icon-source: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: image(shade(@theme_bg_color, 0.9));
-    background-size: 1px 1px;
-}
-
-button separator,
-button > separator {
-    min-width: 1px;
-    min-height: 1px;
-    -gtk-icon-source: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: image(shade(@theme_bg_color, 0.95));
-    background-size: 1px 1px;
-}
-
-button separator:disabled,
-button > separator:disabled {
-    min-width: 1px;
-    min-height: 1px;
-    -gtk-icon-source: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: image(shade(@theme_bg_color, 0.85));
-    background-size: 1px 1px;
-}
-
-.primary-toolbar GtkSeparatorToolItem,
-.primary-toolbar separator,
-.primary-toolbar separator:disabled,
-toolbar GtkSeparatorToolItem,
-toolbar separator,
-toolbar separator:disabled {
-    min-width: 1px;
-    min-height: 1px;
-    -gtk-icon-source: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: image(shade(@toolbar_bg_color, 0.9));
-    background-size: 1px 1px;
-}
-
-headerbar GtkSeparatorToolItem,
-headerbar separator,
-headerbar separator:disabled,
-.titlebar GtkSeparatorToolItem,
-.titlebar separator,
-.titlebar separator:disabled {
-    min-width: 1px;
-    min-height: 1px;
-    -gtk-icon-source: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: image(shade(@titlebar_bg_color, 0.95));
-    background-size: 1px 1px;
-}
-
-.primary-toolbar button separator,
-.primary-toolbar button separator,
-toolbar button separator,
-toolbar button separator {
-    min-width: 1px;
-    min-height: 1px;
-    -gtk-icon-source: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: image(shade(@toolbar_bg_color, 0.95));
-    background-size: 1px 1px;
-}
-
-headerbar button separator,
-headerbar button separator,
-.titlebar button separator,
-.titlebar button separator {
-    min-width: 1px;
-    min-height: 1px;
-    -gtk-icon-source: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: image(shade(@titlebar_bg_color, 0.95));
-    background-size: 1px 1px;
-}
-
-.primary-toolbar button separator:disabled,
-.primary-toolbar button separator:disabled,
-toolbar button separator:disabled,
-toolbar button separator:disabled {
-    min-width: 1px;
-    min-height: 1px;
-    -gtk-icon-source: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: image(shade(@toolbar_bg_color, 0.85));
-    background-size: 1px 1px;
-}
-
-headerbar button separator:disabled,
-headerbar button separator:disabled,
-.titlebar button separator:disabled,
-.titlebar button separator:disabled {
-    min-width: 1px;
-    min-height: 1px;
-    -gtk-icon-source: none;
-    border-style: none;
-    background-color: transparent;
-    background-image: image(shade(@titlebar_bg_color, 0.85));
-    background-size: 1px 1px;
-}
-
-menuitem separator {
+    background-color: mix(@borders, @titlebar_bg_color, 0.5); }
+    headerbar separator.titlebutton:backdrop, .titlebar:not(headerbar) separator.titlebutton:backdrop {
+      background-color: @unfocused_borders; }
+  .primary-toolbar button separator, toolbar button separator, .primary-toolbar:not(.libreoffice-toolbar) separator {
+    border-color: @borders; }
+    .primary-toolbar button separator:backdrop, toolbar button separator:backdrop, .primary-toolbar:not(.libreoffice-toolbar) separator:backdrop {
+      border-color: @unfocused_borders; }
+  headerbar button separator {
+    border-color: mix(@borders, @headerbar_bg_color, 0.5); }
+    headerbar button separator:backdrop {
+      border-color: @unfocused_borders; }
+  .titlebutton button separator, .titlebutton separator.titlebutton {
+    border-color: mix(@borders, @headerbar_bg_color, 0.5); }
+    .titlebutton button separator:backdrop, .titlebutton separator.titlebutton:backdrop {
+      border-color: @unfocused_borders; }
+  menuitem separator {
     border-width: 1px;
     border-style: none;
-    color: shade(@menu_bg_color, 0.9);
-}
-
-combobox separator {
-    border-style: none;
-}
-
-/***********
- * sidebar *
- ***********/
-.sidebar,
-.sidebar view,
-.sidebar > view,
-.sidebar scrolledwindow {
-    background-color: @theme_bg_color;
-    color: mix(@theme_fg_color, @theme_bg_color, 0.1);
-}
-
-.sidebar row:selected,
-.sidebar row:selected:hover,
-.sidebar row:selected:focus,
-.sidebar view row:selected,
-.sidebar view row:selected:hover,
-.sidebar view row:selected:focus {
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-.sidebar row:hover,
-.sidebar view row:hover {
-    border-color: shade(@theme_selected_bg_color, 1.5);
-    background-color: shade(@theme_selected_bg_color, 0.85);
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-.sidebar row:selected:hover,
-.sidebar view row:selected:hover {
-    border-color: shade(@theme_selected_bg_color, 1.05);
-    background-color: shade(@theme_selected_bg_color, 1.05);
-    background-image: none;
+    color: mix(@borders, @menu_bg_color, 0.5); }
+  popover separator {
+    border: 0;
+    color: alpha(currentColor, 0.5);
+    background-color: transparent; }
+  combobox separator {
+    border: none; }
+
+filechooser.csd.background, filechooser placessidebar list {
+  background-color: @sidebar_bg_color; }
+filechooser placessidebar.sidebar row, filechooser placessidebar.sidebar view row, filechooser placessidebar.sidebar row.sidebar-row {
+  border: none;
+  color: @sidebar_fg_color; }
+  filechooser placessidebar.sidebar row:hover, filechooser placessidebar.sidebar row:selected:hover, filechooser placessidebar.sidebar view row:hover, filechooser placessidebar.sidebar view row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:hover, filechooser placessidebar.sidebar row.sidebar-row:selected:hover {
+    color: @sidebar_fg_color;
+    background-color: mix(@sidebar_bg_color, @sidebar_fg_color, 0.15); }
+  filechooser placessidebar.sidebar row:selected, filechooser placessidebar.sidebar row:selected:hover, filechooser placessidebar.sidebar row:selected:focus, filechooser placessidebar.sidebar view row:selected, filechooser placessidebar.sidebar view row:selected:hover, filechooser placessidebar.sidebar view row:selected:focus, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:selected:focus {
+    color: @sidebar_fg_color;
+    background-color: mix(@sidebar_bg_color, @dark_shadow, 0.15); }
+
+.nautilus-window.csd.background,
+.nautilus-window placessidebar list {
+  background-color: @sidebar_bg_color; }
+
+.nautilus-window placessidebar.sidebar row.sidebar-row {
+  border: none;
+  color: @sidebar_fg_color; }
+  .nautilus-window placessidebar.sidebar row.sidebar-row:checked, .nautilus-window placessidebar.sidebar row.sidebar-row:selected {
+    color: @theme_selected_fg_color; }
+
+.sidebar frame, .sidebar.frame {
+  border: none; }
+.sidebar scrollbar {
+  background-color: transparent; }
+  .sidebar scrollbar slider, .sidebar scrollbar slider:hover, .sidebar scrollbar slider:active, .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+    background-color: alpha(@sidebar_fg_color, 0.3); }
+paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar {
+  border: none; }
+
+stacksidebar row {
+  padding: 10px 4px; }
+  stacksidebar row:selected {
     color: @theme_selected_fg_color;
-}
+    background-color: @theme_selected_bg_color; }
+  stacksidebar row > label {
+    padding-left: 6px;
+    padding-right: 6px; }
+  stacksidebar row.needs-attention > label {
+    background-size: 6px 6px, 0 0; }
 
-.sidebar frame {
-    border-width: 0;
-}
-
-/* nemo sidebar padding */
-NemoWindow .sidebar .cell {
-    padding: 2px 2px; 
-}
-
-.nemo-window .sidebar {
-    background-color: @theme_bg_color;
-}
-
-.nemo-window .sidebar .view,
-.nemo-window .sidebar iconview,
-.nemo-window .sidebar row {
-    background-color: transparent;
-}
-
-.nemo-window .sidebar .view.cell:selected,
-.nemo-window .sidebar iconview.cell:selected,
-.nemo-window .sidebar row.cell:selected {
-    border-color: shade(@theme_bg_color, 0.85);
-    background-color: shade(@theme_bg_color, 0.85);
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-/* .nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, .nemo-window .sidebar row.expander {
-color: #787e8a;
-}
- */
-/* .nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, .nemo-window .sidebar row.expander:hover {
-color: #BAC3CF;
-}
- */
-.nemo-window .sidebar separator {
-    background-color: transparent;
-}
-
-
-/* Sidebar spacing for 3.20 */
 placessidebar > viewport.frame {
-    border-style: none;
-}
-
+  border-style: none; }
 placessidebar row {
-    min-height: 36px;
-    padding: 0px;
-}
-
-placessidebar row > revealer {
-    padding: 0 14px;
-}
-
-placessidebar row image.sidebar-icon {
-    opacity: 0.7;
-}
-
-placessidebar row image.sidebar-icon:dir(ltr) {
-    padding-right: 8px;
-}
-
-placessidebar row image.sidebar-icon:dir(rtl) {
-    padding-left: 8px;
-}
-
-placessidebar row label.sidebar-label:dir(ltr) {
-    padding-right: 2px;
-}
-
-placessidebar row label.sidebar-label:dir(rtl) {
-    padding-left: 2px;
-}
-
-button.sidebar-button {
-    min-height: 26px;
-    min-width: 26px;
-    margin-top: 3px;
-    margin-bottom: 3px;
-    padding: 0;
-    border-radius: 100%;
-    -gtk-outline-radius: 100%;
-}
-
-/**************
- * spinbutton *
- **************/
-spinbutton {
-    color: mix(@theme_text_color, @theme_base_color, 0.4);
-    padding: 2px 4px;
-    border-width: 0;
-    border-radius: 0;
-    border-style: none;
-    background-color: transparent;
-    background-image: none;
-}
-
-spinbutton:disabled {
-    color: mix(@theme_text_color, @theme_base_color, 0.7);
-    /*    box-shadow: inset 1px 0 shade(@theme_bg_color, 0.95);*/
-}
-
-spinbutton:active,
-spinbutton:hover {
-    color: @theme_fg_color;
-}
-
-/* HORIZONTAL */
+  min-height: 36px;
+  padding: 0px; }
+  placessidebar row > revealer {
+    padding: 0 14px; }
+  placessidebar row image.sidebar-icon {
+    opacity: 0.75; }
+    placessidebar row image.sidebar-icon:dir(ltr) {
+      padding-right: 8px; }
+    placessidebar row image.sidebar-icon:dir(rtl) {
+      padding-left: 8px; }
+  placessidebar row label.sidebar-label:dir(ltr) {
+    padding-right: 2px; }
+  placessidebar row label.sidebar-label:dir(rtl) {
+    padding-left: 2px; }
+
+button.sidebar-button, button.sidebar-button:backdrop {
+  min-width: 22px;
+  min-height: 22px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  padding: 0;
+  border-radius: 100%;
+  color: @sidebar_fg_color;
+  -gtk-outline-radius: 100%; }
+button.sidebar-button:hover, button.sidebar-button:active {
+  color: @theme_fg_color; }
+button.sidebar-button:not(:hover):not(:active) > image {
+  opacity: 0.5; }
+
+spinbutton:not(.vertical) selection, spinbutton:not(.vertical) selection:focus {
+  color: @theme_selected_fg_color;
+  background-color: @theme_selected_bg_color; }
+spinbutton button:disabled, spinbutton entry:disabled {
+  color: @theme_disabled_fg_color; }
+  spinbutton button:disabled:backdrop, spinbutton entry:disabled:backdrop {
+    color: @theme_unfocused_disabled_fg_color; }
 spinbutton.horizontal entry {
-    padding: 7px 15px;
-}
-
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  padding: 7px 15px; }
 spinbutton.horizontal button.down {
-    border-radius: 0;
-    border-right-width: 0;
-    border-left-width: 0;
-    box-shadow: none;
-    margin-right: 0;
-}
-
+  border-right-width: 0;
+  border-left-width: 0;
+  border-radius: 0; }
 spinbutton.horizontal button.up {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    margin-left: 0;
-    box-shadow: none;
-}
-
-/* VERTICAL */
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0; }
 spinbutton.vertical entry {
-    border-radius: 0;
-    box-shadow: none;
-    background-image: none;
-    border-color: shade(@theme_bg_color, 0.85);
-}
-
+  border-radius: 0; }
 spinbutton.vertical button.up {
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-width: 0;
-    box-shadow: none;
-    background-image: none;
-}
-
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-width: 0; }
 spinbutton.vertical button.down {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-    border-top-width: 0;
-    box-shadow: none;
-    background-image: none;
-}
+  border-top-width: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
 
-/***********
- * spinner *
- ***********/
 @keyframes spin {
-    to {
-      -gtk-icon-transform: rotate(1turn);
-    }
-}
-
+  to {
+    -gtk-icon-transform: rotate(1turn); } }
 spinner {
-    background: none;
-    opacity: 0;
-    -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
-}
-
-spinner:checked {
+  background: none;
+  opacity: 0;
+  -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
+  spinner:checked {
     opacity: 1;
-    animation: spin 1s linear infinite;
-}
-
-spinner:checked:disabled {
-    opacity: 0.5;
-}
+    animation: spin 1s linear infinite; }
+    spinner:checked:disabled {
+      opacity: 0.5; }
 
-/*************
- * statusbar *
- *************/
 statusbar {
-    padding: 4px;
-    color: @theme_fg_color;
-}
-
-statusbar  frame {
-    border-width: 0;
-}
+  padding: 4px;
+  color: @theme_fg_color; }
+  statusbar frame > border {
+    border: none; }
 
-/**********
- * switch *
- **********/
 switch {
-    font-size: 0;
-    outline-offset: -4px;
-    border: 2px solid alpha(@theme_fg_color, 0.8);
-    border-radius: 16px;
-    color: transparent;
-    min-width: 40px;
-    background-color: @theme_base_color;
-}
-
-switch:hover {
-    border-color: @theme_fg_color;
-}
-
-switch:checked {
-    border-color: shade(@theme_selected_bg_color, 0.8);
-    background-color: shade(@theme_selected_bg_color, 0.8);
-}
-
-switch:disabled {
-    border-color: shade(@theme_fg_color, 0.4);
-}
-
-switch:backdrop {
-    border-color: shade(@theme_fg_color, 0.6);
-    background-color: shade(@theme_bg_color, 0.85);
-    transition: 200ms ease-out;
-}
-
-switch:backdrop:checked {
-    border-color: @theme_selected_bg_color;
-    background-color: @theme_selected_bg_color;
-}
-
-switch:backdrop:disabled {
-    border-color: shade(@theme_fg_color, 0.2);
-}
-
-switch slider {
-    min-width: 7px;
+  font-size: 0;
+  outline-offset: -4px;
+  margin: 4px;
+  margin-left: -3px;
+  margin-right: -3px;
+  border: 3px solid @theme_fg_color;
+  border-radius: 16px;
+  background-color: transparent;
+  min-width: 42px; }
+  switch:checked {
+    border-color: shade(@theme_selected_bg_color, 0.6);
+    background-color: shade(@theme_selected_bg_color, 0.6);
+    box-shadow: none; }
+    switch:checked:disabled {
+      border-color: mix(@theme_selected_bg_color, @theme_disabled_bg_color, 0.4); }
+    switch:checked:backdrop {
+      border-color: shade(@theme_unfocused_selected_bg_color, 0.6);
+      background-color: shade(@theme_unfocused_selected_bg_color, 0.6); }
+  switch:disabled {
+    border-color: @theme_disabled_fg_color; }
+    switch:disabled:backdrop {
+      border-color: @theme_unfocused_disabled_fg_color; }
+  switch:backdrop {
+    border-color: @theme_unfocused_fg_color; }
+  switch slider {
+    min-width: 12px;
     min-height: 12px;
-    border: none;
     margin: 3px;
-    margin-left: 4px;
-    margin-right: 4px;
-    border-radius: 14px;
-    background-image: none;
-    border-color: transparent;
-    background-color: alpha(@theme_fg_color, 0.8);
-    box-shadow: none;
-}
-
-switch:hover slider {
+    border: none;
+    border-radius: 100%;
+    color: @theme_fg_color;
     background-color: @theme_fg_color;
-}
-
-switch:disabled slider {
-    background-color: shade(@theme_fg_color, 0.4);
-}
-
-switch:disabled slider label, switch:disabled slider {
-    color: alpha(@theme_fg_color, 0.85);
-}
-
-switch:backdrop slider {
-    /*    transition: 200ms ease-out;*/
-    background-color: shade(@theme_fg_color, 0.6);
-}
-
-switch:backdrop:disabled slider {
-    background-color: shade(@theme_fg_color, 0.2);
-}
-
-row:selected switch {
-    box-shadow: none;
-}
+    margin-left: 4px;
+    margin-right: 4px; }
+  switch:checked slider {
+    background-color: @theme_base_color; }
+  switch:checked:disabled slider {
+    background-color: @theme_disabled_bg_color; }
+  switch:checked:disabled:backdrop slider {
+    background-color: @theme_unfocused_disabled_bg_color; }
+  switch:checked:backdrop slider {
+    background-color: @theme_unfocused_bg_color; }
+  switch:disabled slider {
+    background-color: @theme_disabled_fg_color; }
+  switch:disabled:backdrop slider {
+    background-color: @theme_unfocused_disabled_fg_color; }
+  switch:backdrop slider {
+    background-color: @theme_unfocused_fg_color; }
 
-/************
- * textview *
- ************/
 textview {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-/* Firefox adress bar */
-label.separator {
-    color: @theme_fg_color;
-}
-
-label.separator:backdrop {
-    color: shade(@theme_fg_color, 0.9);
-}
-
-label selection {
-    background-color: @theme_selected_bg_color;
+  color: @theme_text_color;
+  background-color: @theme_base_color; }
+  textview text:selected, textview text selection, textview text:selected:focus, textview text selection:focus {
     color: @theme_selected_fg_color;
-}
-
-label:backdrop {
-    color: alpha(@theme_fg_color, 0.5);
-}
-
-/* Textview selection background */
-.view:selected:focus,
-iconview:selected:focus,
-.view:selected,
-iconview:selected,
-.view text:selected:focus,
-iconview text:selected:focus,
-textview text:selected:focus,
-.view text:selected,
-iconview text:selected,
-textview text:selected,
-.view text selection:focus,
-iconview text selection:focus,
-.view text selection,
-iconview text selection,
-textview text selection:focus,
-textview text selection,
-flowbox flowboxchild:selected,
-spinbutton:not(.vertical) selection:focus,
-spinbutton:not(.vertical) selection,
-entry selection:focus,
-entry selection,
-modelbutton.flat:selected,
-popover.background checkbutton:selected,
-popover.background radiobutton:selected,
-.menuitem.button.flat:selected,
-treeview.view:selected:focus,
-treeview.view:selected,
-row:selected, calendar:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-/*****************
- * color chooser *
- *****************/
-colorswatch,
-colorswatch:selected {
-    border-width: 1px;
-    border-style: solid;
-    border-color: alpha(black, 0.1);
-    border-radius: 0px;
-    background-color: transparent;
-    background-clip: border-box;
-}
-
-colorswatch:hover,
-colorswatch:selected:hover {
-    border-color: alpha(black, 0.3);
-}
-
-colorswatch.color-dark:hover {
-}
-
-colorswatch.color-light:hover {
-}
-
-colorswatch.color-light:selected:hover,
-colorswatch.color-dark:selected:hover {
-    background-image: none;
-}
-
-colorswatch left,
-colorswatch:first-child {
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-}
-
-colorswatch right,
-colorswatch:last-child {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-}
-
-colorswatch:only-child {
-    border-radius: 0px;
-}
-
-colorswatch top {
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
-}
-
-colorswatch bottom {
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
-}
-
-GtkColorChooserWidget #add-color-button {
-    background-clip: padding-box;
-    border-color: alpha(black, 0.1);
-    background-color: shade(@theme_bg_color, 0.95);
-    color: @theme_fg_color;
-}
-
-GtkColorChooserWidget #add-color-button:hover {
-    border-color: alpha(black, 0.3);
-    background-color: shade(@theme_bg_color, 0.90);
-    color: @theme_fg_color;
-}
-
-/*
-.color-active-badge,
-.color-active-badge:selected {
-    border-width: 1px;
-    border-style: solid;
-    border-width: 2px;
-    background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-    border-color: alpha(black, 0.3);
-    color: alpha(black, 0.3);
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-    border-color: alpha(white, 0.3);
-    color: alpha(white, 0.3);
-}
-
-GtkColorEditor colorswatch {
-    border-radius: 0px;
-}
-
-GtkColorEditor colorswatch.color-dark:hover,
-GtkColorEditor colorswatch.color-light:hover {
-    background-image: none;
-    border-color: alpha(black, 0.3);
-}
-
-GtkColorButton button {
-    padding: 2px;
-} */
+    background-color: @theme_selected_bg_color; }
+
+colorswatch.top {
+  border-top-left-radius: 2.5px;
+  border-top-right-radius: 2.5px; }
+  colorswatch.top overlay {
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px; }
+colorswatch.bottom {
+  border-bottom-left-radius: 2.5px;
+  border-bottom-right-radius: 2.5px; }
+  colorswatch.bottom overlay {
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px; }
+colorswatch.left, colorswatch:first-child:not(.top) {
+  border-top-left-radius: 2.5px;
+  border-bottom-left-radius: 2.5px; }
+  colorswatch.left overlay, colorswatch:first-child:not(.top) overlay {
+    border-top-left-radius: 2px;
+    border-bottom-left-radius: 2px; }
+colorswatch.right, colorswatch:last-child:not(.bottom) {
+  border-top-right-radius: 2.5px;
+  border-bottom-right-radius: 2.5px; }
+  colorswatch.right overlay, colorswatch:last-child:not(.bottom) overlay {
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px; }
+colorswatch.dark overlay {
+  color: alpha(@light_shadow, 0.7); }
+  colorswatch.dark overlay:hover {
+    border-color: alpha(@dark_shadow, 0.5); }
+colorswatch.light overlay {
+  color: alpha(@light_shadow, 0.7); }
+  colorswatch.light overlay:hover {
+    border-color: alpha(@dark_shadow, 0.3); }
+colorswatch overlay {
+  border: 1px solid alpha(@dark_shadow, 0.15); }
+  colorswatch overlay:hover {
+    background-color: alpha(@light_shadow, 0.2); }
+colorswatch:disabled {
+  opacity: 0.5; }
+  colorswatch:disabled overlay {
+    border-color: alpha(@dark_shadow, 0.6);
+    box-shadow: none; }
 
 button.color {
-    padding: 2px;
-}
-
-/************
- * Pathbars *
- ************/
-.path-bar button.text-button, .path-bar button.image-button, .path-bar button {
-    padding-left: 4px;
-    padding-right: 4px;
-}
-
-.path-bar button.text-button.image-button label {
-    padding-left: 0;
-    padding-right: 0;
-}
-
-.path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
-    padding-right: 8px;
-}
-
-.path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
-    padding-left: 8px;
-}
-
-.path-bar button image {
-    padding-left: 4px;
-    padding-right: 4px;
-}
-
-.path-bar button.slider-button {
-    padding-left: 0;
-    padding-right: 0;
-}
-
-.path-bar button.slider-button:dir(ltr) {
-    border-right-width: 0;
-}
-
-/**************
- * header-bar *
- **************/
-headerbar {
-    padding: 4px;
-    border-width: 0 0 1px 0;
-    border-style: solid;
-    border-color: shade(@titlebar_bg_color, 0.8);
-    background-color: @titlebar_bg_color;
-    background-image: none;
-    color: @titlebar_fg_color;
-}
-
-headerbar button,
-headerbar button.text-button {
-    padding: 4px;
-}
-
-headerbar button.image-button {
-    padding: 6px;
-}
-
-headerbar .title {
-    font-weight: bold;
-    padding: 0 12px;
-}
-
-headerbar .subtitle {
-    font-size: smaller;
-    padding: 0 12px;
-}
-
-/*
-headerbar combobox,
-headerbar button {
-    border-color: shade(@titlebar_bg_color, 0.8);
-    background-color: shade(@titlebar_bg_color, 1.08);
-    background-image: none;
-    color: @titlebar_fg_color;
-}
-
-headerbar button:hover {
-    border-color: shade(@theme_selected_bg_color, 0.7);
-    background-color: shade(@theme_selected_bg_color, 1.02);
-    background-image: none;
-}
-
-headerbar button:active,
-headerbar button:checked {
-    border-color: shade(@theme_selected_bg_color, 0.8);
-    background-color: shade(@theme_selected_bg_color, 0.95);
-    background-image: none;
-}
-
-headerbar button:active:hover {
-    border-color: shade(@theme_selected_bg_color, 0.7);
-}
-
-headerbar button:focus,
-headerbar button:hover:focus,
-headerbar button:active:focus,
-headerbar button:active:hover:focus {
-    border-color: shade(@theme_selected_bg_color, 0.78);
-}
-
-headerbar button:disabled {
-    border-color: shade(@titlebar_bg_color, 0.85);
-    background-color: shade(@titlebar_bg_color, 0.9);
-    background-image: none;
-}
-
-headerbar button:active *:disabled {
-    border-color: shade(@titlebar_bg_color, 0.75);
-    background-color: shade(@titlebar_bg_color, 0.80);
-    background-image: none;
-}
-
-headerbar entry {
-    border-width: 1px;
-    border-color: shade(@theme_bg_color, 0.6);
-}
-
-headerbar entry:active,
-headerbar entry:focus {
-    border-width: 1px;
-    border-color: shade(@theme_selected_bg_color, 0.6);
-} */
-
-headerbar switch {
-    margin: 3px;
-}
-
-/***********
- * toolbar *
- ***********/
-toolbar,
-toolbar:backdrop {
-    padding: 4px;
-    border-style: none;
-    background-color: @toolbar_bg_color;
-    background-image: none;
-    color: @toolbar_fg_color;
-}
-
-toolbar button {
-    padding: 2px;
-}
-
-toolbar:disabled {
-    background-color: shade(@toolbar_bg_color, 0.9);
-    color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.5);
-}
-
-/* menubar toolbars */
-toolbar menubar {
-    -GtkToolbar-button-relief: normal;
-}
-
-/*******************
- * primary-toolbar *
- *******************/
-.primary-toolbar,
-.primary-toolbar > toolbar,
-.primary-toolbar toolbar {
-    -GtkWidget-window-dragging: true;
-    
-    padding: 4px;
-    border-width: 0;
-    border-style: solid;
-    border-color: shade(@toolbar_bg_color, 0.8);
-    background-color: @toolbar_bg_color;
-    background-image: none;
-    color: @toolbar_fg_color;
-}
-
-.primary-toolbar combobox,
-.primary-toolbar button {
-    padding: 2px;
-    border-width: 0;
-    border-color: transparent;
-    border-radius: 0px;
-    background-color: transparent;
-    background-image: none;
-    color: @toolbar_fg_color;
-}
-
-.primary-toolbar .raised button,
-.primary-toolbar .raised button,
-toolbar combobox,
-toolbar button {
-    padding: 10px;
-    border-color: transparent;
-    background-color: shade(@toolbar_bg_color, 1.08);
-    background-image: none;
-    color: @toolbar_fg_color;
-}
-
-.primary-toolbar button:hover,
-toolbar button:hover {
-    border-color: transparent;
-    background-color: shade(@toolbar_bg_color, 1.10);
-    background-image: none;
-}
-
-.primary-toolbar button:checked,
-.primary-toolbar button:active,
-toolbar button:active {
-    border-color: shade(@theme_selected_bg_color, 0.8);
-    background-color: shade(@theme_selected_bg_color, 0.9);
-    background-image: none;
-}
-
-.primary-toolbar button:active:hover,
-toolbar button:active:hover {
-    border-color: transparent;
-}
-
-.primary-toolbar button:focus,
-.primary-toolbar button:hover:focus,
-.primary-toolbar button:active:focus,
-.primary-toolbar button:active:hover:focus,
-toolbar button:focus,
-toolbar button:hover:focus,
-toolbar button:active:focus,
-toolbar button:active:hover:focus {
-    border-color: transparent;
-}
-
-.primary-toolbar button:disabled,
-toolbar button:disabled {
-    border-color: transparent;
-    background-color: @toolbar_bg_color;
-    background-image: none;
-}
-
-.primary-toolbar button:active *:disabled,
-toolbar button:active *:disabled {
-    border-color: transparent;
-    background-color: shade(@toolbar_bg_color, 0.80);
-    background-image: none;
-}
-
-.primary-toolbar entry,
-toolbar entry {
-    border-width: 1px;
-    border-color: shade(@theme_bg_color, 0.6);
-}
-
-.primary-toolbar entry:active,
-.primary-toolbar entry:focus,
-toolbar entry:active,
-toolbar entry:focus {
-    border-width: 1px;
-    border-color: shade(@theme_selected_bg_color, 0.6);
-}
-
-/* inline-toolbar */
-.inline-toolbar toolbar {
-    -GtkToolbar-button-relief: normal;
-    
-    padding: 1px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0;
-    background-color: @theme_bg_color;
-    background-image: none;
-}
-
-.inline-toolbar toolbar:last-child {
-    border-width: 1px;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0;
-}
-
-.inline-toolbar toolbar button {
-    padding: 1px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0;
-    background-color: shade(@theme_bg_color, 1.08);
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-.inline-toolbar toolbar button:hover {
-    border-color: shade(@theme_bg_color, 0.7);
-    background-color: shade(@theme_bg_color, 1.10);
-    background-image: none;
-}
-
-.inline-toolbar toolbar button:active {
-    border-color: shade(@theme_bg_color, 0.8);
-    background-color: shade(@theme_bg_color, 0.95);
-    background-image: none;
-}
-
-.inline-toolbar toolbar button:active:hover {
-    border-color: shade(@theme_bg_color, 0.7);
-}
-
-.inline-toolbar toolbar button:focus,
-.inline-toolbar toolbar button:hover:focus,
-.inline-toolbar toolbar button:active:focus,
-.inline-toolbar toolbar button:active:hover:focus {
-    border-color: shade(@theme_bg_color, 0.7);
-}
-
-.inline-toolbar toolbar button:disabled,
-.inline-toolbar toolbar toolbutton button:disabled {
-    border-color: shade(@theme_bg_color, 0.85);
+  padding: 0; }
+  button.color colorswatch:first-child:last-child, button.color colorswatch:first-child:last-child overlay {
+    margin: 4px;
+    border-radius: 0; }
+
+colorchooser .popover.osd {
+  border-radius: 0; }
+colorchooser #add-color-button {
+  background-clip: padding-box;
+  border-color: alpha(@dark_shadow, 0.1);
+  background-color: shade(@theme_bg_color, 0.95);
+  color: @theme_fg_color; }
+  colorchooser #add-color-button:hover {
+    border-color: alpha(@dark_shadow, 0.3);
     background-color: shade(@theme_bg_color, 0.9);
-    background-image: none;
-}
-
-.inline-toolbar toolbar button:active *:disabled
-.inline-toolbar toolbar toolbutton button:active *:disabled {
-    border-color: shade(@theme_bg_color, 0.75);
-    background-color: shade(@theme_bg_color, 0.80);
-    background-image: none;
-}
-
-/******************
- * linked buttons *
- *****************/
-/* set up shadows for visual separation */
-.linked button,
-.inline-toolbar toolbar button,
-.inline-toolbar toolbar toolbutton button,
-.inline-toolbar toolbar toolbutton > button {
-    box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9);
-}
-
-.linked button:active,
-.inline-toolbar toolbar button:active,
-.inline-toolbar toolbar toolbutton button:active,
-.inline-toolbar toolbar toolbutton > button:active {
-    box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9),
-    inset 1px 0 alpha(@dark_shadow, 0.07),
-    inset 0 1px alpha(@dark_shadow, 0.08),
-    inset 0 -1px alpha(@dark_shadow, 0.05);
-}
-
-.linked button:disabled,
-.inline-toolbar toolbar button:disabled,
-.inline-toolbar toolbar toolbutton button:disabled,
-.inline-toolbar toolbar toolbutton > button:disabled {
-    box-shadow: inset -1px 0 shade(@theme_bg_color, 0.85);
-}
-
-/* remove box shadow from last-child and only-child */
-.linked button:last-child,
-.linked button:only-child,
-.linked button:disabled:last-child,
-.linked button:disabled:only-child,
-.linked button:active *:disabled:last-child,
-.linked button:active *:disabled:only-child,
-.inline-toolbar toolbar button:last-child,
-.inline-toolbar toolbar button:only-child,
-.inline-toolbar toolbar button:disabled:last-child,
-.inline-toolbar toolbar button:disabled:only-child,
-.inline-toolbar toolbar button:active *:disabled:last-child,
-.inline-toolbar toolbar button:active *:disabled:only-child,
-.inline-toolbar toolbar toolbutton:last-child > button,
-.inline-toolbar toolbar toolbutton:only-child > button,
-.inline-toolbar toolbar toolbutton:last-child > button:disabled,
-.inline-toolbar toolbar toolbutton:only-child > button:disabled,
-.inline-toolbar toolbar toolbutton:last-child > button:active *:disabled,
-.inline-toolbar toolbar toolbutton:only-child > button:active *:disabled {
-    box-shadow: none;
-}
-
-/* add back the inset shadow effect */
-.linked button:active:last-child,
-.linked button:active:only-child,
-.inline-toolbar toolbar button:active:last-child,
-.inline-toolbar toolbar button:active:only-child,
-.inline-toolbar toolbar toolbutton:last-child > button:active,
-.inline-toolbar toolbar toolbutton:only-child > button:active {
-    box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07),
-    inset 0 1px alpha(@dark_shadow, 0.08),
-    inset -1px 0 alpha(@dark_shadow, 0.07);
-}
-
-/* middle button */
-.linked entry,
-.linked button,
-.linked button:active,
-.linked button:active:hover,
-.linked button:disabled,
-.inline-toolbar toolbar button,
-.inline-toolbar toolbar button:active,
-.inline-toolbar toolbar button:disabled,
-.inline-toolbar toolbar toolbutton button,
-.inline-toolbar toolbar toolbutton button:active,
-.inline-toolbar toolbar toolbutton button:disabled {
-    border-width: 1px;
-    border-radius: 0;
-    border-right-width: 0;
-    border-left-width: 0;
-}
-
-/*leftmost button */
-.linked entry:first-child,
-.linked button:first-child,
-.linked button:active:first-child,
-.linked button:active:hover:first-child,
-.linked button:disabled:first-child,
-.inline-toolbar toolbar button:first-child,
-.inline-toolbar toolbar button:active:first-child,
-.inline-toolbar toolbar button:disabled:first-child,
-.inline-toolbar toolbar toolbutton:first-child button,
-.inline-toolbar toolbar toolbutton:first-child button:active,
-.inline-toolbar toolbar toolbutton:first-child button:disabled {
-    border-width: 1px;
-    border-radius: 0px;
-    border-right-width: 0;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/* rightmost button */
-.linked entry:last-child,
-.linked button:last-child,
-.linked button:active:last-child,
-.linked button:active:hover:last-child,
-.linked button:disabled:last-child,
-.inline-toolbar toolbar button:last-child,
-.inline-toolbar toolbar button:active:last-child,
-.inline-toolbar toolbar button:disabled:last-child,
-.inline-toolbar toolbar toolbutton:last-child button,
-.inline-toolbar toolbar toolbutton:last-child button:active,
-.inline-toolbar toolbar toolbutton:last-child button:disabled {
-    border-width: 1px;
-    border-radius: 0px;
-    border-left-width: 0;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-/* linked single button */
-.linked entry:only-child,
-.linked button:only-child,
-.linked button:active:only-child,
-.linked button:active:hover:only-child,
-.linked button:disabled:only-child,
-.inline-toolbar toolbar button:only-child,
-.inline-toolbar toolbar button:active:only-child,
-.inline-toolbar toolbar button:disabled:only-child,
-.inline-toolbar toolbar toolbutton:only-child button,
-.inline-toolbar toolbar toolbutton:only-child button:active,
-.inline-toolbar toolbar toolbutton:only-child button:disabled {
-    border-width: 1px;
-    border-radius: 0px;
-}
-
-/* linked button shadows (vertical) */
-.linked.vertical button,
-.inline-toolbar toolbar.vertical button,
-.inline-toolbar toolbar.vertical toolbutton > button {
-    box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9);
-}
-
-.linked.vertical button:active,
-.inline-toolbar toolbar.vertical button:active,
-.inline-toolbar toolbar.vertical toolbutton > button:active {
-    box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9),
-    inset 1px 0 alpha(@dark_shadow, 0.07),
-    inset 0 1px alpha(@dark_shadow, 0.08),
-    inset -1px 0 alpha(@dark_shadow, 0.07);
-}
-
-.linked.vertical button:disabled,
-.inline-toolbar toolbar.vertical button:disabled,
-.inline-toolbar toolbar.vertical toolbutton > button:disabled {
-    box-shadow: inset 0 -1px shade(@theme_bg_color, 0.85);
-}
-
-/* remove box shadow from last-child and only-child */
-.linked.vertical button:last-child,
-.linked.vertical button:only-child,
-.linked.vertical button:disabled:last-child,
-.linked.vertical button:disabled:only-child,
-.linked.vertical button:active *:disabled:last-child,
-.linked.vertical button:active *:disabled:only-child,
-.inline-toolbar toolbar.vertical button:last-child,
-.inline-toolbar toolbar.vertical button:only-child,
-.inline-toolbar toolbar.vertical button:disabled:last-child,
-.inline-toolbar toolbar.vertical button:disabled:only-child,
-.inline-toolbar toolbar.vertical button:active *:disabled:last-child,
-.inline-toolbar toolbar.vertical button:active *:disabled:only-child,
-.inline-toolbar toolbar.vertical toolbutton:last-child > button,
-.inline-toolbar toolbar.vertical toolbutton:only-child > button,
-.inline-toolbar toolbar.vertical toolbutton:last-child > button:disabled,
-.inline-toolbar toolbar.vertical toolbutton:only-child > button:disabled,
-.inline-toolbar toolbar.vertical toolbutton:last-child > button:active *:disabled,
-.inline-toolbar toolbar.vertical toolbutton:only-child > button:active *:disabled {
-    box-shadow: none;
-}
-
-/* add back the inset shadow effect */
-.linked.vertical button:active:last-child,
-.linked.vertical button:active:only-child,
-.inline-toolbar toolbar.vertical button:active:last-child,
-.inline-toolbar toolbar.vertical button:active:only-child,
-.inline-toolbar toolbar.vertical toolbutton:last-child > button:active,
-.inline-toolbar toolbar.vertical toolbutton:only-child > button:active {
-    box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07),
-    inset 0 1px alpha(@dark_shadow, 0.08),
-    inset -1px 0 alpha(@dark_shadow, 0.07);
-}
-
-/* middle button (vertical) */
-.linked.vertical entry,
-.linked.vertical button,
-.linked.vertical button:active,
-.linked.vertical button:active:hover,
-.linked.vertical button:disabled {
-    border-width: 1px;
-    border-radius: 0;
-    border-top-width: 0;
-    border-bottom-width: 0;
-}
-
-/* top button (vertical) */
-.linked.vertical entry:first-child,
-.linked.vertical button:first-child,
-.linked.vertical button:active:first-child,
-.linked.vertical button:active:hover:first-child,
-.linked.vertical button:disabled:first-child {
-    border-width: 1px;
-    border-radius: 0px;
-    border-bottom-width: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-}
-
-/* bottom button (vertical) */
-.linked.vertical entry:last-child,
-.linked.vertical button:last-child,
-.linked.vertical button:active:last-child,
-.linked.vertical button:active:hover:last-child,
-.linked.vertical button:disabled:last-child {
-    border-width: 1px;
-    border-radius: 0px;
-    border-top-width: 0;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/* linked single button (vertical) */
-.linked.vertical entry:only-child,
-.linked.vertical button:only-child,
-.linked.vertical button:active:only-child,
-.linked.vertical button:active:hover:only-child,
-.linked.vertical button:disabled:only-child {
-    border-width: 1px;
-    border-radius: 0px;
-}
-
-/* linked toolbar buttons */
-.primary-toolbar button.raised.linked,
-.primary-toolbar .raised.linked button,
-toolbar button.raised.linked,
-toolbar .raised.linked button,
-toolbar .linked button {
-    box-shadow: none;
-}
-
-.primary-toolbar button.raised.linked:active,
-.primary-toolbar .raised.linked button:active,
-toolbar button.raised.linked:active,
-toolbar .raised.linked button:active,
-toolbar .linked button:active {
-    box-shadow: none;
-}
-
-.primary-toolbar button.raised.linked:disabled,
-.primary-toolbar .raised.linked button:disabled,
-toolbar button.raised.linked:disabled,
-toolbar .raised.linked button:disabled,
-toolbar .linked button:disabled {
-    box-shadow: none;
-}
-
-/* remove box shadow from last-child and only-child */
-.primary-toolbar button.raised.linked:last-child,
-.primary-toolbar button.raised.linked:only-child,
-.primary-toolbar button:disabled.raised.linked:last-child,
-.primary-toolbar button:disabled.raised.linked:only-child,
-.primary-toolbar button:active *:disabled.raised.linked:last-child,
-.primary-toolbar button:active *:disabled.raised.linked:only-child,
-.primary-toolbar .raised.linked button:last-child,
-.primary-toolbar .raised.linked button:only-child,
-.primary-toolbar .raised.linked button:disabled:last-child,
-.primary-toolbar .raised.linked button:disabled:only-child,
-.primary-toolbar .raised.linked button:active *:disabled:last-child,
-.primary-toolbar .raised.linked button:active *:disabled:only-child,
-toolbar button.raised.linked:last-child,
-toolbar button.raised.linked:only-child,
-toolbar button:disabled.raised.linked:last-child,
-toolbar button:disabled.raised.linked:only-child,
-toolbar button:active *:disabled.raised.linked:last-child,
-toolbar button:active *:disabled.raised.linked:only-child,
-toolbar .raised.linked button:last-child,
-toolbar .raised.linked button:only-child,
-toolbar .raised.linked button:disabled:last-child,
-toolbar .raised.linked button:disabled:only-child,
-toolbar .raised.linked button:active *:disabled:last-child,
-toolbar .raised.linked button:active *:disabled:only-child,
-toolbar .linked button:last-child,
-toolbar .linked button:only-child,
-toolbar .linked button:disabled:last-child,
-toolbar .linked button:disabled:only-child,
-toolbar .linked button:active *:disabled:last-child,
-toolbar .linked button:active *:disabled:only-child {
-    box-shadow: none;
-}
-
-/* add back the inset shadow effect */
-.primary-toolbar button:active.raised.linked:last-child,
-.primary-toolbar button:active.raised.linked:only-child,
-.primary-toolbar .raised.linked button:active:last-child,
-.primary-toolbar .raised.linked button:active:only-child,
-toolbar button:active.raised.linked:last-child,
-toolbar button:active.raised.linked:only-child,
-toolbar .raised.linked button:active:last-child,
-toolbar .raised.linked button:active:only-child,
-toolbar .linked button:active:last-child,
-toolbar .linked button:active:only-child {
-    box-shadow: none;
-}
-
-/* middle button */
-.primary-toolbar button.raised.linked,
-.primary-toolbar button.raised.linked:active,
-.primary-toolbar button.raised.linked:disabled,
-.primary-toolbar .raised.linked button,
-.primary-toolbar .raised.linked button:active,
-.primary-toolbar .raised.linked button:disabled,
-toolbar button.raised.linked,
-toolbar button.raised.linked:active,
-toolbar button.raised.linked:disabled,
-toolbar .raised.linked button,
-toolbar .raised.linked button:active,
-toolbar .raised.linked button:disabled,
-toolbar .linked button,
-toolbar .linked button:active,
-toolbar .linked button:disabled {
-    border-width: 1px;
-    border-radius: 0;
-    border-right-width: 0;
-    border-left-width: 0;
-}
-
-/* leftmost button */
-.primary-toolbar button.raised.linked:first-child,
-.primary-toolbar button.raised.linked:active:first-child,
-.primary-toolbar button.raised.linked:disabled:first-child,
-.primary-toolbar .raised.linked button:first-child,
-.primary-toolbar .raised.linked button:active:first-child,
-.primary-toolbar .raised.linked button:disabled:first-child,
-toolbar button.raised.linked:first-child,
-toolbar button.raised.linked:active:first-child,
-toolbar button.raised.linked:disabled:first-child,
-toolbar .raised.linked button:first-child,
-toolbar .raised.linked button:active:first-child,
-toolbar .raised.linked button:disabled:first-child,
-toolbar .linked button:first-child,
-toolbar .linked button:active:first-child {
+    color: @theme_fg_color; }
+
+.path-bar button.text-button, .path-bar button.image-button, .path-bar button button {
+  padding-left: 4px;
+  padding-right: 4px; }
+.path-bar button.text-button.image-button label, .path-bar button label {
+  padding-left: 0;
+  padding-right: 0; }
+  .path-bar button.text-button.image-button label:last-child, .path-bar button label:last-child {
+    padding-right: 8px; }
+  .path-bar button.text-button.image-button label:first-child, .path-bar button label:first-child {
+    padding-left: 8px; }
+.path-bar button image {
+  padding-left: 4px;
+  padding-right: 4px; }
+.path-bar button.slider-button {
+  padding-left: 0;
+  padding-right: 0; }
+
+headerbar, headerbar:not(.titlebar) {
+  padding: 4px 8px;
+  border-width: 0;
+  border-style: solid;
+  border-color: mix(@borders, @headerbar_bg_color, 0.5);
+  border-bottom-width: 1px;
+  color: @headerbar_fg_color;
+  background-color: @headerbar_bg_color; }
+  headerbar:backdrop, headerbar:not(.titlebar):backdrop {
+    border-color: @unfocused_borders;
+    color: @theme_unfocused_fg_color;
+    background-color: @theme_unfocused_bg_color; }
+  .titlebar headerbar, .titlebar headerbar:backdrop, .titlebar headerbar:not(.titlebar), .titlebar headerbar:not(.titlebar):backdrop {
+    background-color: transparent; }
+  .tiled headerbar, .tiled headerbar:backdrop, .maximized headerbar, .maximized headerbar:backdrop, .tiled headerbar:not(.titlebar), .tiled headerbar:not(.titlebar):backdrop, .maximized headerbar:not(.titlebar), .maximized headerbar:not(.titlebar):backdrop {
+    border-radius: 0; }
+  headerbar .title, headerbar:not(.titlebar) .title {
+    padding-left: 12px;
+    padding-right: 12px;
+    font-weight: bold; }
+  headerbar .subtitle, headerbar:not(.titlebar) .subtitle {
+    font-size: smaller;
+    padding-left: 12px;
+    padding-right: 12px;
+    color: alpha(currentColor, 0.7); }
+  headerbar entry, headerbar:not(.titlebar) entry {
+    padding: 4px 8px; }
+
+toolbar {
+  padding: 4px;
+  border: none;
+  color: @toolbar_fg_color;
+  background-color: @toolbar_bg_color; }
+  toolbar:backdrop {
+    color: @theme_unfocused_fg_color;
+    background-color: @theme_unfocused_bg_color; }
+  toolbar:disabled {
+    color: @theme_disabled_fg_color;
+    background-color: @theme_disabled_bg_color; }
+  toolbar button.flat {
+    border-color: transparent;
+    border-radius: 0px;
+    color: @toolbar_fg_color;
+    background-color: transparent; }
+    toolbar button.flat:disabled {
+      border-color: transparent;
+      color: alpha(@toolbar_fg_color, 0.8);
+      background-color: transparent; }
+      toolbar button.flat:disabled:backdrop {
+        border-color: transparent;
+        color: alpha(@toolbar_fg_color, 0.7);
+        background-color: transparent; }
+    toolbar button.flat:backdrop {
+      color: @theme_unfocused_fg_color; }
+  toolbar menubar {
+    -GtkToolbar-button-relief: normal; }
+
+.primary-toolbar {
+  -GtkWidget-window-dragging: true;
+  padding: 4px;
+  border-width: 0 0 1px 0;
+  border-style: solid;
+  border-color: mix(@borders, @toolbar_bg_color, 0.5);
+  color: @toolbar_fg_color;
+  background-color: @toolbar_bg_color; }
+  .primary-toolbar:backdrop {
+    border-color: @theme_unfocused_bg_color;
+    color: @theme_unfocused_fg_color;
+    background-color: @theme_unfocused_bg_color; }
+  .primary-toolbar button, .primary-toolbar .raised button {
+    padding: 3px;
+    border-style: solid;
     border-width: 1px;
     border-radius: 0px;
-    border-right-width: 0;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/* rightmost button */
-.primary-toolbar button.raised.linked:last-child,
-.primary-toolbar button.raised.linked:active:last-child,
-.primary-toolbar button.raised.linked:disabled:last-child,
-.primary-toolbar .raised.linked button:last-child,
-.primary-toolbar .raised.linked button:active:last-child,
-.primary-toolbar .raised.linked button:disabled:last-child,
-toolbar button.raised.linked:last-child,
-toolbar button.raised.linked:active:last-child,
-toolbar button.raised.linked:disabled:last-child,
-toolbar .raised.linked button:last-child,
-toolbar .raised.linked button:active:last-child,
-toolbar .raised.linked button:disabled:last-child,
-toolbar .linked button:last-child,
-toolbar .linked button:active:last-child,
-toolbar .linked button:disabled:last-child {
+    color: @toolbar_fg_color;
+    border-color: @borders;
+    background-color: @toolbar_bg_color; }
+    .primary-toolbar button:hover, .primary-toolbar .raised button:hover {
+      color: @toolbar_fg_color;
+      border-color: shade(@theme_selected_bg_color, 0.7);
+      background-color: shade(@theme_selected_bg_color, 1.02); }
+    .primary-toolbar button:active, .primary-toolbar button:checked, .primary-toolbar .raised button:active, .primary-toolbar .raised button:checked {
+      color: @toolbar_fg_color;
+      border-color: shade(@theme_selected_bg_color, 0.8);
+      background-color: shade(@theme_selected_bg_color, 0.95); }
+      .primary-toolbar button:active:backdrop, .primary-toolbar button:checked:backdrop, .primary-toolbar .raised button:active:backdrop, .primary-toolbar .raised button:checked:backdrop {
+        color: @theme_unfocused_fg_color;
+        border-color: shade(@theme_unfocused_bg_color, 0.85);
+        background-color: shade(@theme_unfocused_bg_color, 0.85); }
+    .primary-toolbar button:focus, .primary-toolbar button:hover:focus, .primary-toolbar button:active:focus, .primary-toolbar button:active:hover:focus, .primary-toolbar .raised button:focus, .primary-toolbar .raised button:hover:focus, .primary-toolbar .raised button:active:focus, .primary-toolbar .raised button:active:hover:focus {
+      border-color: shade(@theme_selected_bg_color, 0.7); }
+    .primary-toolbar button:disabled, .primary-toolbar .raised button:disabled {
+      color: mix(@toolbar_fg_color, @theme_unfocused_disabled_fg_color, 0.1);
+      border-color: mix(@toolbar_bg_color, @theme_disabled_bg_color, 0.6);
+      background-color: mix(@toolbar_bg_color, @theme_disabled_bg_color, 0.1); }
+      .primary-toolbar button:disabled:backdrop, .primary-toolbar .raised button:disabled:backdrop {
+        color: @theme_unfocused_disabled_fg_color;
+        border-color: @unfocused_borders;
+        background-color: @theme_unfocused_disabled_bg_color; }
+    .primary-toolbar button:backdrop, .primary-toolbar .raised button:backdrop {
+      border-color: @unfocused_borders;
+      color: @theme_unfocused_fg_color;
+      background-color: @theme_unfocused_bg_color; }
+
+.inline-toolbar toolbar {
+  -GtkToolbar-button-relief: normal;
+  padding: 1px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: mix(@borders, @toolbar_bg_color, 0.5);
+  border-radius: 0;
+  background-color: @toolbar_bg_color; }
+  .inline-toolbar toolbar:last-child {
+    border-width: 0 1px 1px 1px;
+    border-radius: 0; }
+  .inline-toolbar toolbar button {
+    padding: 3px;
+    border-style: solid;
     border-width: 1px;
     border-radius: 0px;
+    color: @toolbar_fg_color;
+    border-color: @borders;
+    background-color: @toolbar_bg_color; }
+    .inline-toolbar toolbar button:hover {
+      color: @toolbar_fg_color;
+      border-color: shade(@theme_selected_bg_color, 0.7);
+      background-color: shade(@theme_selected_bg_color, 1.02); }
+    .inline-toolbar toolbar button:active, .inline-toolbar toolbar button:checked {
+      color: @toolbar_fg_color;
+      border-color: shade(@theme_selected_bg_color, 0.8);
+      background-color: shade(@theme_selected_bg_color, 0.95); }
+      .inline-toolbar toolbar button:active:backdrop, .inline-toolbar toolbar button:checked:backdrop {
+        color: @theme_unfocused_fg_color;
+        border-color: shade(@theme_unfocused_bg_color, 0.85);
+        background-color: shade(@theme_unfocused_bg_color, 0.85); }
+    .inline-toolbar toolbar button:focus, .inline-toolbar toolbar button:hover:focus, .inline-toolbar toolbar button:active:focus, .inline-toolbar toolbar button:active:hover:focus {
+      border-color: shade(@theme_selected_bg_color, 0.7); }
+    .inline-toolbar toolbar button:disabled {
+      color: mix(@toolbar_fg_color, @theme_unfocused_disabled_fg_color, 0.1);
+      border-color: mix(@toolbar_bg_color, @theme_disabled_bg_color, 0.6);
+      background-color: mix(@toolbar_bg_color, @theme_disabled_bg_color, 0.1); }
+      .inline-toolbar toolbar button:disabled:backdrop {
+        color: @theme_unfocused_disabled_fg_color;
+        border-color: @unfocused_borders;
+        background-color: @theme_unfocused_disabled_bg_color; }
+    .inline-toolbar toolbar button:backdrop {
+      border-color: @unfocused_borders;
+      color: @theme_unfocused_fg_color;
+      background-color: @theme_unfocused_bg_color; }
+
+.linked button, .linked .raised button, .inline-toolbar button, .inline-toolbar .raised button, .primary-toolbar button, .primary-toolbar .raised button {
+  border-radius: 0;
+  border-left-width: 0; }
+  .linked button:first-child, .linked .raised button:first-child, .inline-toolbar button:first-child, .inline-toolbar .raised button:first-child, .primary-toolbar button:first-child, .primary-toolbar .raised button:first-child {
+    border-left-width: 1px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px; }
+  .linked button:last-child, .linked .raised button:last-child, .inline-toolbar button:last-child, .inline-toolbar .raised button:last-child, .primary-toolbar button:last-child, .primary-toolbar .raised button:last-child {
     border-left-width: 0;
-    border-bottom-left-radius: 0;
     border-top-left-radius: 0;
-}
-
-/* linked single button */
-.primary-toolbar button.raised.linked:only-child,
-.primary-toolbar button.raised.linked:active:only-child,
-.primary-toolbar button.raised.linked:disabled:only-child,
-.primary-toolbar .raised.linked button:only-child,
-.primary-toolbar .raised.linked button:active:only-child,
-.primary-toolbar .raised.linked button:disabled:only-child,
-toolbar button.raised.linked:only-child,
-toolbar button.raised.linked:active:only-child,
-toolbar button.raised.linked:disabled:only-child,
-toolbar .raised.linked button:only-child,
-toolbar .raised.linked button:active:only-child,
-toolbar .raised.linked button:disabled:only-child,
-toolbar .linked button:only-child,
-toolbar .linked button:active:only-child,
-toolbar .linked button:disabled:only-child {
-    border-width: 1px;
-    border-radius: 0px;
-}
-
-/* linked titlebar buttons */
-headerbar button.raised.linked,
-headerbar .raised.linked button,
-headerbar .linked button {
-    box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.9);
-}
-
-headerbar button.raised.linked:active,
-headerbar .raised.linked button:active,
-headerbar .linked button:active {
-    box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.9),
-    inset 1px 0 alpha(@dark_shadow, 0.07),
-    inset 0 1px alpha(@dark_shadow, 0.08),
-    inset 0 -1px alpha(@dark_shadow, 0.05);
-}
-
-headerbar button.raised.linked:disabled,
-headerbar .raised.linked button:disabled,
-headerbar .linked button:disabled {
-    box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.85);
-}
-
-/* remove box shadow from last-child and only-child */
-headerbar button.raised.linked:last-child,
-headerbar button.raised.linked:only-child,
-headerbar button:disabled.raised.linked:last-child,
-headerbar button:disabled.raised.linked:only-child,
-headerbar button:active *:disabled.raised.linked:last-child,
-headerbar button:active *:disabled.raised.linked:only-child,
-headerbar .raised.linked button:last-child,
-headerbar .raised.linked button:only-child,
-headerbar .raised.linked button:disabled:last-child,
-headerbar .raised.linked button:disabled:only-child,
-headerbar .raised.linked button:active *:disabled:last-child,
-headerbar .raised.linked button:active *:disabled:only-child,
-headerbar .linked button:last-child,
-headerbar .linked button:only-child,
-headerbar .linked button:disabled:last-child,
-headerbar .linked button:disabled:only-child,
-headerbar .linked button:active *:disabled:last-child,
-headerbar .linked button:active *:disabled:only-child {
-    box-shadow: none;
-}
-
-/* add back the inset shadow effect */
-headerbar button:active.raised.linked:last-child,
-headerbar button:active.raised.linked:only-child,
-headerbar .raised.linked button:active:last-child,
-headerbar .raised.linked button:active:only-child,
-headerbar .linked button:active:last-child,
-headerbar .linked button:active:only-child {
-    box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07),
-    inset 0 1px alpha(@dark_shadow, 0.08),
-    inset -1px 0 alpha(@dark_shadow, 0.07);
-}
-
-/* middle button */
-headerbar button.raised.linked,
-headerbar button.raised.linked:active,
-headerbar button.raised.linked:disabled,
-headerbar .raised.linked button,
-headerbar .raised.linked button:active,
-headerbar .raised.linked button:disabled,
-headerbar .linked button,
-headerbar .linked button:active,
-headerbar .linked button:disabled {
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px; }
+  .linked button:only-child, .linked .raised button:only-child, .inline-toolbar button:only-child, .inline-toolbar .raised button:only-child, .primary-toolbar button:only-child, .primary-toolbar .raised button:only-child {
     border-width: 1px;
-    border-radius: 0;
-    border-right-width: 0;
+    border-radius: 0px; }
+  .linked button:focus, .linked button:hover, .linked button:active, .linked button:checked, .linked .raised button:focus, .linked .raised button:hover, .linked .raised button:active, .linked .raised button:checked, .inline-toolbar button:focus, .inline-toolbar button:hover, .inline-toolbar button:active, .inline-toolbar button:checked, .inline-toolbar .raised button:focus, .inline-toolbar .raised button:hover, .inline-toolbar .raised button:active, .inline-toolbar .raised button:checked, .primary-toolbar button:focus, .primary-toolbar button:hover, .primary-toolbar button:active, .primary-toolbar button:checked, .primary-toolbar .raised button:focus, .primary-toolbar .raised button:hover, .primary-toolbar .raised button:active, .primary-toolbar .raised button:checked {
+    box-shadow: -1px 0 shade(@theme_selected_bg_color, 0.8); }
+    .linked button:focus:backdrop, .linked button:hover:backdrop, .linked button:active:backdrop, .linked button:checked:backdrop, .linked .raised button:focus:backdrop, .linked .raised button:hover:backdrop, .linked .raised button:active:backdrop, .linked .raised button:checked:backdrop, .inline-toolbar button:focus:backdrop, .inline-toolbar button:hover:backdrop, .inline-toolbar button:active:backdrop, .inline-toolbar button:checked:backdrop, .inline-toolbar .raised button:focus:backdrop, .inline-toolbar .raised button:hover:backdrop, .inline-toolbar .raised button:active:backdrop, .inline-toolbar .raised button:checked:backdrop, .primary-toolbar button:focus:backdrop, .primary-toolbar button:hover:backdrop, .primary-toolbar button:active:backdrop, .primary-toolbar button:checked:backdrop, .primary-toolbar .raised button:focus:backdrop, .primary-toolbar .raised button:hover:backdrop, .primary-toolbar .raised button:active:backdrop, .primary-toolbar .raised button:checked:backdrop {
+      box-shadow: -1px 0 shade(@theme_unfocused_bg_color, 0.85); }
+  .linked button:first-child:focus, .linked button:first-child:hover, .linked button:first-child:active, .linked button:first-child:checked, .linked button:only-child:focus, .linked button:only-child:hover, .linked button:only-child:active, .linked button:only-child:checked, .linked .raised button:first-child:focus, .linked .raised button:first-child:hover, .linked .raised button:first-child:active, .linked .raised button:first-child:checked, .linked .raised button:only-child:focus, .linked .raised button:only-child:hover, .linked .raised button:only-child:active, .linked .raised button:only-child:checked, .inline-toolbar button:first-child:focus, .inline-toolbar button:first-child:hover, .inline-toolbar button:first-child:active, .inline-toolbar button:first-child:checked, .inline-toolbar button:only-child:focus, .inline-toolbar button:only-child:hover, .inline-toolbar button:only-child:active, .inline-toolbar button:only-child:checked, .inline-toolbar .raised button:first-child:focus, .inline-toolbar .raised button:first-child:hover, .inline-toolbar .raised button:first-child:active, .inline-toolbar .raised button:first-child:checked, .inline-toolbar .raised button:only-child:focus, .inline-toolbar .raised button:only-child:hover, .inline-toolbar .raised button:only-child:active, .inline-toolbar .raised button:only-child:checked, .primary-toolbar button:first-child:focus, .primary-toolbar button:first-child:hover, .primary-toolbar button:first-child:active, .primary-toolbar button:first-child:checked, .primary-toolbar button:only-child:focus, .primary-toolbar button:only-child:hover, .primary-toolbar button:only-child:active, .primary-toolbar button:only-child:checked, .primary-toolbar .raised button:first-child:focus, .primary-toolbar .raised button:first-child:hover, .primary-toolbar .raised button:first-child:active, .primary-toolbar .raised button:first-child:checked, .primary-toolbar .raised button:only-child:focus, .primary-toolbar .raised button:only-child:hover, .primary-toolbar .raised button:only-child:active, .primary-toolbar .raised button:only-child:checked {
+    box-shadow: none; }
+    .linked button:first-child:focus:backdrop, .linked button:first-child:hover:backdrop, .linked button:first-child:active:backdrop, .linked button:first-child:checked:backdrop, .linked button:only-child:focus:backdrop, .linked button:only-child:hover:backdrop, .linked button:only-child:active:backdrop, .linked button:only-child:checked:backdrop, .linked .raised button:first-child:focus:backdrop, .linked .raised button:first-child:hover:backdrop, .linked .raised button:first-child:active:backdrop, .linked .raised button:first-child:checked:backdrop, .linked .raised button:only-child:focus:backdrop, .linked .raised button:only-child:hover:backdrop, .linked .raised button:only-child:active:backdrop, .linked .raised button:only-child:checked:backdrop, .inline-toolbar button:first-child:focus:backdrop, .inline-toolbar button:first-child:hover:backdrop, .inline-toolbar button:first-child:active:backdrop, .inline-toolbar button:first-child:checked:backdrop, .inline-toolbar button:only-child:focus:backdrop, .inline-toolbar button:only-child:hover:backdrop, .inline-toolbar button:only-child:active:backdrop, .inline-toolbar button:only-child:checked:backdrop, .inline-toolbar .raised button:first-child:focus:backdrop, .inline-toolbar .raised button:first-child:hover:backdrop, .inline-toolbar .raised button:first-child:active:backdrop, .inline-toolbar .raised button:first-child:checked:backdrop, .inline-toolbar .raised button:only-child:focus:backdrop, .inline-toolbar .raised button:only-child:hover:backdrop, .inline-toolbar .raised button:only-child:active:backdrop, .inline-toolbar .raised button:only-child:checked:backdrop, .primary-toolbar button:first-child:focus:backdrop, .primary-toolbar button:first-child:hover:backdrop, .primary-toolbar button:first-child:active:backdrop, .primary-toolbar button:first-child:checked:backdrop, .primary-toolbar button:only-child:focus:backdrop, .primary-toolbar button:only-child:hover:backdrop, .primary-toolbar button:only-child:active:backdrop, .primary-toolbar button:only-child:checked:backdrop, .primary-toolbar .raised button:first-child:focus:backdrop, .primary-toolbar .raised button:first-child:hover:backdrop, .primary-toolbar .raised button:first-child:active:backdrop, .primary-toolbar .raised button:first-child:checked:backdrop, .primary-toolbar .raised button:only-child:focus:backdrop, .primary-toolbar .raised button:only-child:hover:backdrop, .primary-toolbar .raised button:only-child:active:backdrop, .primary-toolbar .raised button:only-child:checked:backdrop {
+      box-shadow: none; }
+.linked entry, .inline-toolbar entry, .primary-toolbar entry {
+  border-radius: 0;
+  border-left-width: 0; }
+  .linked entry:first-child, .inline-toolbar entry:first-child, .primary-toolbar entry:first-child {
+    border-left-width: 1px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px; }
+  .linked entry:last-child, .inline-toolbar entry:last-child, .primary-toolbar entry:last-child {
     border-left-width: 0;
-}
-
-/* leftmost button */
-headerbar button.raised.linked:first-child,
-headerbar button.raised.linked:active:first-child,
-headerbar button.raised.linked:disabled:first-child,
-headerbar .raised.linked button:first-child,
-headerbar .raised.linked button:active:first-child,
-headerbar .raised.linked button:disabled:first-child,
-headerbar .linked button:first-child,
-headerbar .linked button:active:first-child,
-headerbar .linked button:disabled:first-child {
-    border-width: 1px;
-    border-radius: 0px;
-    border-right-width: 0;
+    border-top-left-radius: 0;
     border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/* rightmost button */
-headerbar button.raised.linked:last-child,
-headerbar button.raised.linked:active:last-child,
-headerbar button.raised.linked:disabled:last-child,
-headerbar .raised.linked button:last-child,
-headerbar .raised.linked button:active:last-child,
-headerbar .raised.linked button:disabled:last-child,
-headerbar .linked button:last-child,
-headerbar .linked button:active:last-child,
-headerbar .linked button:disabled:last-child {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px; }
+  .linked entry:only-child, .inline-toolbar entry:only-child, .primary-toolbar entry:only-child {
     border-width: 1px;
-    border-radius: 0px;
-    border-left-width: 0;
+    border-radius: 0px; }
+  .linked entry:focus, .linked entry:last-child:focus, .inline-toolbar entry:focus, .inline-toolbar entry:last-child:focus, .primary-toolbar entry:focus, .primary-toolbar entry:last-child:focus {
+    box-shadow: -1px 0 shade(@theme_selected_bg_color, 0.6); }
+  .linked entry:first-child:focus, .inline-toolbar entry:first-child:focus, .primary-toolbar entry:first-child:focus {
+    box-shadow: none; }
+.linked combobox box.linked button, .inline-toolbar combobox box.linked button, .primary-toolbar combobox box.linked button {
+  border-radius: 0;
+  border-left-width: 0; }
+  .linked combobox box.linked button:focus, .linked combobox box.linked button:hover, .linked combobox box.linked button:active, .linked combobox box.linked button:checked, .inline-toolbar combobox box.linked button:focus, .inline-toolbar combobox box.linked button:hover, .inline-toolbar combobox box.linked button:active, .inline-toolbar combobox box.linked button:checked, .primary-toolbar combobox box.linked button:focus, .primary-toolbar combobox box.linked button:hover, .primary-toolbar combobox box.linked button:active, .primary-toolbar combobox box.linked button:checked {
+    box-shadow: -1px 0 shade(@theme_selected_bg_color, 0.8); }
+    .linked combobox box.linked button:focus:backdrop, .linked combobox box.linked button:hover:backdrop, .linked combobox box.linked button:active:backdrop, .linked combobox box.linked button:checked:backdrop, .inline-toolbar combobox box.linked button:focus:backdrop, .inline-toolbar combobox box.linked button:hover:backdrop, .inline-toolbar combobox box.linked button:active:backdrop, .inline-toolbar combobox box.linked button:checked:backdrop, .primary-toolbar combobox box.linked button:focus:backdrop, .primary-toolbar combobox box.linked button:hover:backdrop, .primary-toolbar combobox box.linked button:active:backdrop, .primary-toolbar combobox box.linked button:checked:backdrop {
+      box-shadow: -1px 0 shade(@theme_unfocused_bg_color, 0.85); }
+.linked combobox:first-child box.linked button, .inline-toolbar combobox:first-child box.linked button, .primary-toolbar combobox:first-child box.linked button {
+  border-left-width: 1px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px; }
+.linked combobox:last-child box.linked button, .inline-toolbar combobox:last-child box.linked button, .primary-toolbar combobox:last-child box.linked button {
+  border-left-width: 0;
+  border-top-left-radius: 0;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px; }
+.linked combobox:only-child box.linked button, .inline-toolbar combobox:only-child box.linked button, .primary-toolbar combobox:only-child box.linked button {
+  border-width: 1px;
+  border-radius: 0px; }
+.linked combobox:first-child box.linked button:focus, .linked combobox:first-child box.linked button:hover, .linked combobox:first-child box.linked button:active, .linked combobox:first-child box.linked button:checked, .linked combobox:only-child box.linked button:focus, .linked combobox:only-child box.linked button:hover, .linked combobox:only-child box.linked button:active, .linked combobox:only-child box.linked button:checked, .inline-toolbar combobox:first-child box.linked button:focus, .inline-toolbar combobox:first-child box.linked button:hover, .inline-toolbar combobox:first-child box.linked button:active, .inline-toolbar combobox:first-child box.linked button:checked, .inline-toolbar combobox:only-child box.linked button:focus, .inline-toolbar combobox:only-child box.linked button:hover, .inline-toolbar combobox:only-child box.linked button:active, .inline-toolbar combobox:only-child box.linked button:checked, .primary-toolbar combobox:first-child box.linked button:focus, .primary-toolbar combobox:first-child box.linked button:hover, .primary-toolbar combobox:first-child box.linked button:active, .primary-toolbar combobox:first-child box.linked button:checked, .primary-toolbar combobox:only-child box.linked button:focus, .primary-toolbar combobox:only-child box.linked button:hover, .primary-toolbar combobox:only-child box.linked button:active, .primary-toolbar combobox:only-child box.linked button:checked {
+  box-shadow: none; }
+  .linked combobox:first-child box.linked button:focus:backdrop, .linked combobox:first-child box.linked button:hover:backdrop, .linked combobox:first-child box.linked button:active:backdrop, .linked combobox:first-child box.linked button:checked:backdrop, .linked combobox:only-child box.linked button:focus:backdrop, .linked combobox:only-child box.linked button:hover:backdrop, .linked combobox:only-child box.linked button:active:backdrop, .linked combobox:only-child box.linked button:checked:backdrop, .inline-toolbar combobox:first-child box.linked button:focus:backdrop, .inline-toolbar combobox:first-child box.linked button:hover:backdrop, .inline-toolbar combobox:first-child box.linked button:active:backdrop, .inline-toolbar combobox:first-child box.linked button:checked:backdrop, .inline-toolbar combobox:only-child box.linked button:focus:backdrop, .inline-toolbar combobox:only-child box.linked button:hover:backdrop, .inline-toolbar combobox:only-child box.linked button:active:backdrop, .inline-toolbar combobox:only-child box.linked button:checked:backdrop, .primary-toolbar combobox:first-child box.linked button:focus:backdrop, .primary-toolbar combobox:first-child box.linked button:hover:backdrop, .primary-toolbar combobox:first-child box.linked button:active:backdrop, .primary-toolbar combobox:first-child box.linked button:checked:backdrop, .primary-toolbar combobox:only-child box.linked button:focus:backdrop, .primary-toolbar combobox:only-child box.linked button:hover:backdrop, .primary-toolbar combobox:only-child box.linked button:active:backdrop, .primary-toolbar combobox:only-child box.linked button:checked:backdrop {
+    box-shadow: none; }
+
+.vertical.linked button {
+  border-left-width: 1px;
+  border-top-width: 0;
+  border-radius: 0; }
+  .vertical.linked button:first-child {
+    border-top-width: 1px;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
     border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0; }
+  .vertical.linked button:last-child {
+    border-top-width: 0;
     border-top-left-radius: 0;
-}
-
-/* linked single button */
-headerbar button.raised.linked:only-child,
-headerbar button.raised.linked:active:only-child,
-headerbar button.raised.linked:disabled:only-child,
-headerbar .raised.linked button:only-child,
-headerbar .raised.linked button:active:only-child,
-headerbar .raised.linked button:disabled:only-child,
-headerbar .linked button:only-child,
-headerbar .linked button:active:only-child,
-headerbar .linked button:disabled:only-child {
-    border-width: 1px;
-    border-radius: 0px;
-}
+    border-top-right-radius: 0;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px; }
+  .vertical.linked button:only-child {
+    border-top-width: 1px; }
+  .vertical.linked button:focus, .vertical.linked button:hover, .vertical.linked button:active, .vertical.linked button:checked {
+    box-shadow: 0 -1px shade(@theme_selected_bg_color, 0.8); }
+    .vertical.linked button:focus:backdrop, .vertical.linked button:hover:backdrop, .vertical.linked button:active:backdrop, .vertical.linked button:checked:backdrop {
+      box-shadow: 0 -1px shade(@theme_unfocused_bg_color, 0.85); }
+  .vertical.linked button:first-child:focus, .vertical.linked button:first-child:hover, .vertical.linked button:first-child:active, .vertical.linked button:first-child:checked, .vertical.linked button:only-child:focus, .vertical.linked button:only-child:hover, .vertical.linked button:only-child:active, .vertical.linked button:only-child:checked {
+    box-shadow: none; }
+    .vertical.linked button:first-child:focus:backdrop, .vertical.linked button:first-child:hover:backdrop, .vertical.linked button:first-child:active:backdrop, .vertical.linked button:first-child:checked:backdrop, .vertical.linked button:only-child:focus:backdrop, .vertical.linked button:only-child:hover:backdrop, .vertical.linked button:only-child:active:backdrop, .vertical.linked button:only-child:checked:backdrop {
+      box-shadow: none; }
+.vertical.linked entry {
+  border-left-width: 1px;
+  border-top-width: 0;
+  border-radius: 0; }
+  .vertical.linked entry:first-child {
+    border-top-width: 1px;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0; }
+  .vertical.linked entry:last-child {
+    border-top-width: 0;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px; }
+  .vertical.linked entry:only-child {
+    border-top-width: 1px; }
+  .vertical.linked entry:focus, .vertical.linked entry:last-child:focus {
+    box-shadow: 0 -1px shade(@theme_selected_bg_color, 0.6); }
+  .vertical.linked entry:first-child:focus {
+    box-shadow: none; }
+.vertical.linked combobox box.linked button {
+  border-left-width: 1px;
+  border-top-width: 0;
+  border-radius: 0; }
+  .vertical.linked combobox box.linked button:focus, .vertical.linked combobox box.linked button:hover, .vertical.linked combobox box.linked button:active, .vertical.linked combobox box.linked button:checked {
+    box-shadow: 0 -1px shade(@theme_selected_bg_color, 0.8); }
+    .vertical.linked combobox box.linked button:focus:backdrop, .vertical.linked combobox box.linked button:hover:backdrop, .vertical.linked combobox box.linked button:active:backdrop, .vertical.linked combobox box.linked button:checked:backdrop {
+      box-shadow: 0 -1px shade(@theme_unfocused_bg_color, 0.85); }
+.vertical.linked combobox:first-child box.linked button {
+  border-top-width: 1px;
+  border-top-left-radius: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+.vertical.linked combobox:last-child box.linked button {
+  border-top-width: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-left-radius: 0px;
+  border-bottom-right-radius: 0px; }
+.vertical.linked combobox:only-child box.linked button {
+  border-top-width: 1px; }
+.vertical.linked combobox:first-child box.linked button:focus, .vertical.linked combobox:first-child box.linked button:hover, .vertical.linked combobox:first-child box.linked button:active, .vertical.linked combobox:first-child box.linked button:checked, .vertical.linked combobox:only-child box.linked button:focus, .vertical.linked combobox:only-child box.linked button:hover, .vertical.linked combobox:only-child box.linked button:active, .vertical.linked combobox:only-child box.linked button:checked {
+  box-shadow: none; }
+  .vertical.linked combobox:first-child box.linked button:focus:backdrop, .vertical.linked combobox:first-child box.linked button:hover:backdrop, .vertical.linked combobox:first-child box.linked button:active:backdrop, .vertical.linked combobox:first-child box.linked button:checked:backdrop, .vertical.linked combobox:only-child box.linked button:focus:backdrop, .vertical.linked combobox:only-child box.linked button:hover:backdrop, .vertical.linked combobox:only-child box.linked button:active:backdrop, .vertical.linked combobox:only-child box.linked button:checked:backdrop {
+    box-shadow: none; }
+
+stackswitcher button.text-button {
+  min-width: 80px; }
 
-/***********
- * tooltip *
- ***********/
 tooltip {
-    border-radius: 0;
-    box-shadow: none;
-}
-
-tooltip.background {
-    border: 1px solid shade(@tooltip_bg_color, 0.8);
-    background-color: @tooltip_bg_color;
-    background-clip: padding-box;
-}
-
-tooltip.background label {
-    padding: 1px;
-}
-
-tooltip decoration {
-    background-color: transparent;
-    box-shadow: none;
-}
-
-tooltip * {
-    background-color: transparent;
-    color: @tooltip_fg_color;
-}
-
-/************
- * treeview *
- ************/
-treeview {
-    -treeview-vertical-separator: 0;
-}
-
-treeview.dnd {
+  border-radius: 0px;
+  box-shadow: none; }
+  tooltip.background {
     border-width: 1px;
     border-style: solid;
-    border-color: @theme_selected_bg_color;
-    border-radius: 0;
-}
+    border-color: @borders;
+    background-color: @tooltip_bg_color; }
+    tooltip.background label {
+      padding: 1px; }
+  tooltip * {
+    background-color: transparent;
+    color: @tooltip_fg_color; }
 
-treeview entry {
-    padding: 0 6px;
-    border-radius: 0;
-    background-color: @theme_base_color;
-    background-image: none;
-}
-
-/************
- * viewport *
- ************/
-viewport frame {
-    border-width: 0;
-}
+treeview {
+  -treeview-vertical-separator: 0; }
+  treeview.view:selected, treeview.view:selected:focus {
+    color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color; }
+  treeview header button {
+    border-width: 0 1px 1px 0;
+    border-radius: 0; }
+    treeview header button, treeview header button:active, treeview header button:focus, treeview header button:active:focus {
+      background-color: @theme_bg_color; }
+    treeview header button:hover, treeview header button:active:hover, treeview header button:hover:focus, treeview header button:active:hover:focus {
+      color: @theme_selected_fg_color;
+      background-color: @theme_selected_bg_color; }
+  treeview header:last-child button {
+    border-width: 0 0 1px 0; }
 
 .view {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-.view:disabled {
-    background-color: shade(@theme_base_color, 0.9);
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
-.view:selected,
-.view:selected:focus {
-    background-color: @theme_selected_bg_color;
+  color: @theme_text_color;
+  background-color: @theme_base_color; }
+  .view:not(treeview) {
+    border-radius: 0; }
+  .view:disabled {
+    color: @theme_disabled_fg_color;
+    background-color: @theme_disabled_bg_color; }
+  .view:selected, .view:selected:focus, .view text:selected, .view text:selected:focus, .view text selection, .view text selection:focus {
     color: @theme_selected_fg_color;
-}
+    background-color: @theme_selected_bg_color; }
+    .view:selected:disabled, .view:selected:focus:disabled, .view text:selected:disabled, .view text:selected:focus:disabled, .view text selection:disabled, .view text selection:focus:disabled {
+      color: mix(@theme_selected_fg_color, @theme_disabled_fg_color, 0.5);
+      background-color: @theme_selected_bg_color; }
+    .view:selected:backdrop, .view:selected:focus:backdrop, .view text:selected:backdrop, .view text:selected:focus:backdrop, .view text selection:backdrop, .view text selection:focus:backdrop {
+      color: @theme_unfocused_selected_fg_color;
+      background-color: @theme_unfocused_selected_bg_color; }
 
-/* backdrop state */
-.view:selected:backdrop, iconview:selected:backdrop, .view:selected:backdrop, iconview:selected:backdrop {
-    background-color: shade(@theme_bg_color, 0.8);
-}
-
-/**************
- * action-bar *
- **************/
 actionbar {
-    padding: 4px;
-    border-width: 1px 0 0 0;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    background-color: shade(@theme_bg_color, 0.9);
-    background-image: none;
-    color: @theme_fg_color;
-}
-
-actionbar button.text-button {
-    padding: 4px;
-}
-
-actionbar button.image-button {
-    padding: 6px;
-}
-
-actionbar .title {
+  padding: 4px;
+  border-width: 1px 0 0 0;
+  border-style: solid;
+  border-color: @borders;
+  color: @theme_fg_color;
+  background-color: @theme_bg_color; }
+  actionbar:backdrop {
+    border-color: @unfocused_borders;
+    color: @theme_unfocused_fg_color;
+    background-color: @theme_unfocused_bg_color; }
+  actionbar button.text-button {
+    padding: 4px; }
+  actionbar button .image-button {
+    padding: 6px; }
+  actionbar .title {
     font-weight: bold;
-    padding: 0 12px;
-}
-
-actionbar .subtitle {
+    padding: 0 12px; }
+  actionbar .subtitle {
     font-size: smaller;
-    padding: 0 12px;
-}
-
-/***************
- * search bars *
- ***************/
-.search-bar {
-    border-width: 0 0 1px 0;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    background-color: shade(@theme_bg_color, 0.98);
-}
+    padding: 0 12px; }
 
-.search-bar button.close-button {
-    padding: 4px;
-}
-
-/********************
- * various choosers *
- ********************/
-fontbutton separator,
-filechooser button separator {
-    /* always disable separators */
-    -GtkWidget-horizontal-separator: 0;
-    -GtkWidget-vertical-separator: 0;
-}
-
-fontbutton label:last-child {
-    color: alpha(currentColor, 0.7);
-}
-
-filechooser button image:last-child {
-    color: alpha(currentColor, 0.7);
-}
-
-/*********************
- * app notifications *
- *********************/
-.app-notification {
-    border-style: solid;
-    border-color: shade(@theme_base_color, 0.8);
-    border-width: 0 1px 1px 1px;
-    border-radius: 0;
-    padding: 8px;
-    background-color: @theme_base_color;
-    background-image: none;
-    color: @theme_text_color;
-}
+searchbar {
+  border-width: 0 0 1px 0;
+  border-style: solid;
+  border-color: @borders;
+  background-color: @theme_bg_color; }
 
-.app-notification border {
-    border: none;
-}
+.app-notification {
+  border-style: solid;
+  border-color: @borders;
+  border-width: 1px;
+  border-radius: 0;
+  margin: 5px;
+  padding: 8px;
+  background-color: @theme_base_color;
+  color: @theme_text_color; }
+  .app-notification border {
+    border: none; }
 
-/*******
- * osd *
- *******/
 .background.osd {
-    color: @osd_fg;
-    background-color: @osd_bg;
-}
-
-GtkOverlay.osd {
-    background-color: transparent;
-}
+  color: @osd_fg;
+  background-color: @osd_bg; }
 
 .osd frame {
-    background-clip: border-box;
-    background-origin: border-box;
-}
-
-.osd button,
-.osd > button {
-    padding: 4px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@osd_bg, 0.8);
-    border-radius: 0px;
-    background-color: shade(@osd_bg, 1.08);
-    background-image: none;
-    color: @osd_fg;
-}
-
-.osd button:hover,
-.osd > button:hover {
+  background-clip: border-box;
+  background-origin: border-box; }
+
+.osd button, button.osd {
+  padding: 4px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: shade(@osd_bg, 0.8);
+  border-radius: 0px;
+  background-color: shade(@osd_bg, 1.08);
+  color: @osd_fg; }
+  .osd button:hover, button.osd:hover {
     border-color: shade(@osd_bg, 0.7);
-    background-color: shade(@osd_bg, 1.10);
-    background-image: none;
-}
-
-.osd button:active,
-.osd > button:active,
-.osd menubutton button:active {
+    background-color: shade(@osd_bg, 1.1);
+    color: @osd_fg; }
+  .osd button:active, .osd button:checked, button.osd:active, button.osd:checked {
     border-color: shade(@osd_bg, 0.8);
     background-color: shade(@osd_bg, 0.95);
-    background-image: none;
-}
-
-.osd button:active:hover,
-.osd > button:active:hover,
-.osd menubutton button:active:hover {
-    border-color: shade(@osd_bg, 0.7);
-}
-
-.osd button:disabled,
-.osd > button:disabled {
+    color: @osd_fg; }
+  .osd button:disabled, button.osd:disabled {
     border-color: shade(@osd_bg, 0.85);
     background-color: shade(@osd_bg, 0.9);
-    background-image: none;
-}
-
-.osd button:active *:disabled,
-.osd > button:active *:disabled {
-    background-color: shade(@osd_bg, 0.80);
-    background-image: none;
-}
-
-.osd toolbar {
-    -GtkToolbar-button-relief: normal;
-    
-    padding: 4px;
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 0px;
-    border-color: shade(@osd_bg, 0.8);
-    background-color: @osd_bg;
-    background-image: none;
-    color: @osd_fg;
-}
-
-.osd toolbar button {
-    padding: 4px;
+    color: alpha(@osd_fg, 0.8); }
+  .osd button:checked:disabled, button.osd:checked:disabled {
+    background-color: shade(@osd_bg, 0.8); }
+
+.osd toolbar, toolbar.osd {
+  -GtkToolbar-button-relief: normal;
+  padding: 4px;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 0;
+  border-color: shade(@osd_bg, 0.8);
+  background-color: @osd_bg;
+  color: @osd_fg; }
+  .osd toolbar button, toolbar.osd button {
+    padding: 2px 4px;
     border-width: 1px;
     border-style: solid;
     border-color: shade(@osd_bg, 0.8);
     border-radius: 0px;
     background-color: shade(@osd_bg, 1.08);
-    background-image: none;
-    color: @osd_fg;
-}
-
-.osd toolbar button:hover {
-    border-color: shade(@osd_bg, 0.7);
-    background-color: shade(@osd_bg, 1.10);
-    background-image: none;
-}
-
-.osd toolbar button:active {
-    border-color: shade(@osd_bg, 0.8);
-    background-color: shade(@osd_bg, 0.95);
-    background-image: none;
-}
-
-.osd toolbar button:active:hover {
-    border-color: shade(@osd_bg, 0.7);
-}
-
-.osd toolbar button:focus,
-.osd toolbar button:hover:focus,
-.osd toolbar button:active:focus,
-.osd toolbar button:active:hover:focus {
-    border-color: shade(@osd_bg, 0.7);
-}
-
-.osd toolbar button:disabled {
+    color: @osd_fg; }
+    .osd toolbar button:hover, toolbar.osd button:hover {
+      border-color: shade(@osd_bg, 0.7);
+      background-color: shade(@osd_bg, 1.1);
+      color: @osd_fg; }
+    .osd toolbar button:active, .osd toolbar button:checked, toolbar.osd button:active, toolbar.osd button:checked {
+      border-color: shade(@osd_bg, 0.8);
+      background-color: shade(@osd_bg, 0.95);
+      color: @osd_fg; }
+    .osd toolbar button:disabled, toolbar.osd button:disabled {
+      border-color: shade(@osd_bg, 0.85);
+      background-color: shade(@osd_bg, 0.9);
+      color: alpha(@osd_fg, 0.8); }
+    .osd toolbar button:checked:disabled, toolbar.osd button:checked:disabled {
+      border-color: shade(@osd_bg, 0.75);
+      background-color: shade(@osd_bg, 0.8); }
+  .osd toolbar separator, toolbar.osd separator {
+    color: shade(@osd_bg, 0.9); }
+
+.osd scale slider, scale.osd slider {
+  background-color: @theme_selected_bg_color; }
+  .osd scale slider:hover, scale.osd slider:hover {
+    background-color: @theme_selected_bg_color; }
+  .osd scale slider:disabled, scale.osd slider:disabled {
+    background-color: mix(@osd_bg, @osd_fg, 0.15); }
+.osd scale trough, scale.osd trough {
+  border-color: mix(@osd_bg, @osd_fg, 0.15); }
+  .osd scale trough:disabled, scale.osd trough:disabled {
     border-color: shade(@osd_bg, 0.85);
-    background-color: shade(@osd_bg, 0.9);
-    background-image: none;
-}
-
-.osd toolbar button:active *:disabled {
-    border-color: shade(@osd_bg, 0.75);
-    background-color: shade(@osd_bg, 0.80);
-    background-image: none;
-}
-
-.osd toolbar button:first-child {
-    border-radius: 0px 0 0 0px;
-    border-width: 1px 0 1px 1px;
-    box-shadow: inset -1px 0 shade(@osd_bg, 0.9);
-}
-
-.osd toolbar button:last-child {
-    box-shadow: none;
-    border-radius: 0;
-    border-width: 1px 1px 1px 0;
-}
-
-.osd toolbar button:only-child,
-.osd toolbar toolbutton button,
-.osd toolbar toolbutton:only-child button,
-.osd toolbar toolbutton:last-child button,
-.osd toolbar toolbutton:first-child button {
-    border-width: 1px;
-    border-radius: 0px;
-    border-style: solid;
-}
-
-.osd toolbar separator {
-    color: shade(@osd_bg, 0.9);
-}
-
-/* used by gnome-settings-daemon's media-keys OSD */
-.osd trough {
-    background-color: shade(@osd_bg, 0.8);
-}
+    background-color: transparent; }
+.osd scale highlight, scale.osd highlight {
+  border-color: @theme_selected_bg_color;
+  background-color: @theme_selected_bg_color; }
 
-.osd progress {
-    background-color: @osd_fg;
-}
+.osd progress, progress.osd {
+  background-color: @osd_fg; }
 
-.osd  scale slider {
-    background-color: shade(@osd_bg, 1.08);
-    background-image: none;
-    /* we will draw the border using box shadow for now */
-    box-shadow: inset 1px 0 shade(@osd_bg, 0.8),
-    inset 0 1px shade(@osd_bg, 0.8),
-    inset -1px 0 shade(@osd_bg, 0.8),
-    inset 0 -1px shade(@osd_bg, 0.8);
-}
-
-.osd  scale slider:hover {
-    box-shadow: inset 1px 0 shade(@osd_bg, 0.7),
-    inset 0 1px shade(@osd_bg, 0.7),
-    inset -1px 0 shade(@osd_bg, 0.7),
-    inset 0 -1px shade(@osd_bg, 0.7);
-}
-
-.osd  scale slider:disabled {
-    background-color: shade(@osd_bg, 0.9);
-    background-image: none;
-    box-shadow: inset 1px 0 shade(@osd_bg, 0.85),
-    inset 0 1px shade(@osd_bg, 0.85),
-    inset -1px 0 shade(@osd_bg, 0.85),
-    inset 0 -1px shade(@osd_bg, 0.85);
-}
-
-.osd  scale trough {
-    border-color: shade(@osd_bg, 0.8);
-    background-color: shade(@osd_bg, 1.08);
-    background-image: none;
-}
-
-.osd  scale trough highlight {
-    border-color: @theme_selected_bg_color;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-}
-
-.osd  scale trough:disabled,
-.osd  scale trough highlight:disabled {
-    border-color: shade(@osd_bg, 0.85);
-    background-color: shade(@osd_bg, 0.9);
-    background-image: none;
-}
-
-.osd progressbar,
-progressbar.osd {
-    -progressbar-xspacing: 0;
-    -progressbar-yspacing: 2px;
-    -progressbar-min-horizontal-bar-height: 2px;
-    
-    padding: 0;
-}
-
-.osd progressbar trough,
-progressbar.osd trough {
+.osd progressbar, progressbar.osd {
+  padding: 0; }
+  .osd progressbar trough, progressbar.osd trough {
     padding: 0;
     border-style: none;
     border-radius: 0;
-    background-image: none;
-    background-color: transparent;
-}
-
-.osd progressbar progress,
-progressbar.osd progress {
+    background-color: transparent; }
+  .osd progressbar progress, progressbar.osd progress {
     border-style: none;
     border-radius: 0;
-    background-color: @progressbar_color;
-    background-image: none;
-}
-
-.osd view,
-.osd.view {
-    background-color: @osd_base;
-}
-
-.osd  scrollbar trough {
-    background-color: @osd_bg;
-}
-
-.osd  scrollbar slider {
-    border-width: 1px;
-    border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.21);
-    border-radius: 0;
-    background-color: mix(@osd_base, @osd_fg, 0.21);
-}
-
-.osd  scrollbar slider:hover {
-    border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.31);
-    background-color: mix(@osd_base, @osd_fg, 0.31);
-}
-
-.osd  scrollbar slider:active {
-    border-color: shade(@theme_bg_color, 0.9);
-    background-color: @theme_bg_color;
-}
-
-.osd view.cell:selected,
-.osd view.cell:selected:focus {
+    background-color: @theme_selected_bg_color; }
+
+.osd scrollbar trough, scrollbar.osd trough {
+  background-color: transparent; }
+.osd scrollbar slider, scrollbar.osd slider {
+  border-width: 0px;
+  border-radius: 6px;
+  background-color: mix(@osd_base, @osd_fg, 0.21); }
+  .osd scrollbar slider:hover, scrollbar.osd slider:hover {
+    border-color: mix(@osd_base, @osd_fg, 0.31);
+    background-color: mix(@osd_base, @osd_fg, 0.31); }
+  .osd scrollbar slider:active, scrollbar.osd slider:active {
+    border-color: mix(@osd_base, @osd_fg, 0.31);
+    background-color: mix(@osd_base, @osd_fg, 0.1); }
+
+.osd view, view.osd, .osd.view {
+  background-color: @osd_base; }
+  .osd view:selected, .osd view:selected:focus, view.osd:selected, view.osd:selected:focus, .osd.view:selected, .osd.view:selected:focus {
     background-color: transparent;
     border-style: solid;
-    border-radius: 0px;
+    border-radius: 0;
     border-width: 3px;
     border-color: @osd_fg;
-    outline-color: transparent;
-}
-
-/* used by Documents */
-.osd .page-thumbnail {
-    border-style: solid;
-    border-width: 1px;
-    border-color: shade(@osd_bg, 0.9);
-    /* when there's no pixbuf yet */
-    background-color: @osd_bg;
-}
-
-/******************************
- * destructive action buttons *
- ******************************/
-.destructive-action button {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@error_color, 0.8);
-    border-radius: 0px;
-    background-color: @error_color;
-    background-image: none;
-    color: mix(@theme_selected_fg_color, @error_color, 0.1);
-}
-
-.destructive-action button:hover {
-    border-color: shade(@error_color, 0.7);
-    background-color: shade(@error_color, 1.12);
-    background-image: none;
-}
-
-.destructive-action button:active {
-    border-color: shade(@error_color, 0.8);
-    background-color: shade(@error_color, 0.87);
-    background-image: none;
-}
-
-.destructive-action button:hover:active {
-    border-color: shade(@error_color, 0.7);
-}
-
-/******************************
- * suggested action buttons *
- ******************************/
-.suggested-action button {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    border-radius: 0px;
-    background-color: shade(@theme_selected_bg_color, 1.18);
-    background-image: none;
-    color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.1);
-}
-
-.suggested-action button:hover {
-    border-color: shade(@theme_selected_bg_color, 0.8);
-    background-color: shade(@theme_selected_bg_color, 1.20);
-    background-image: none;
-}
-
-.suggested-action button:active {
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: shade(@theme_selected_bg_color, 1.05);
-    background-image: none;
-}
-
-.suggested-action button:hover:active {
-    border-color: shade(@theme_selected_bg_color, 0.8);
-}
-
-/******************
- * selection mode *
- ******************/
-.selection-mode headerbar,
-.selection-mode toolbar {
-    border-style: solid;
-    border-color: @theme_selected_bg_color;
-    background-color: shade(@theme_selected_bg_color, 1.6);
-    background-image: none;
-    color: @theme_selected_bg_color;
-}
-
-.selection-mode headerbar {
-    border-top-color: shade(@theme_selected_bg_color, 1.6);
-    border-bottom-color: @theme_selected_bg_color;
-}
-
-.selection-mode toolbar {
-    padding: 4px;
-}
-
-/* regular button */
-.selection-mode headerbar button,
-.selection-mode toolbar button,
-.selection-mode toolbar toolbutton button {
-    border-width: 1px;
-    border-style: solid;
-    border-color: @theme_selected_bg_color;
-    border-radius: 0px;
-    background-color: shade(@theme_selected_bg_color, 1.68);
-    background-image: none;
-    color: shade(@theme_selected_bg_color, 0.8);
-}
-
-.selection-mode headerbar button:hover,
-.selection-mode toolbar button:hover,
-.selection-mode toolbar toolbutton button:hover {
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: shade(@theme_selected_bg_color, 1.70);
-    background-image: none;
-}
-
-.selection-mode headerbar button:active,
-.selection-mode toolbar button:active,
-.selection-mode toolbar toolbutton button:active {
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: shade(@theme_selected_bg_color, 1.55);
-    background-image: none;
-}
-
-.selection-mode headerbar button:hover:active,
-.selection-mode toolbar button:hover:active,
-.selection-mode toolbar toolbutton button:hover:active {
-    border-color: shade(@theme_selected_bg_color, 0.8);
-}
-
-/* suggested button */
-.selection-mode headerbar .suggested-action button,
-.selection-mode toolbar .suggested-action button,
-.selection-mode toolbar toolbutton.suggested-action button {
+    outline-color: transparent; }
+
+button.destructive-action {
+  /* not implemented in windows 10 */ }
+
+button.suggested-action {
+  box-shadow: inset 0 0 1px 0 shade(@theme_selected_bg_color, 0.6); }
+  button.suggested-action:hover {
+    box-shadow: inset 0 0 1px 0 shade(@theme_selected_bg_color, 0.6); }
+  button.suggested-action:backdrop {
+    box-shadow: none; }
+
+headerbar button.suggested-action {
+  box-shadow: inset 0 0 1px 0 shade(@theme_selected_bg_color, 0.6); }
+  headerbar button.suggested-action:hover {
+    box-shadow: inset 0 0 1px 0 shade(@theme_selected_bg_color, 0.6); }
+  headerbar button.suggested-action:backdrop {
+    box-shadow: none; }
+
+toolbar.selection-mode {
+  padding: 4px; }
+
+headerbar.selection-mode, toolbar.selection-mode {
+  border-color: mix(@theme_selected_bg_color, @theme_selected_fg_color, 0.6);
+  color: @theme_selected_fg_color;
+  background-color: mix(@theme_selected_bg_color, @theme_selected_fg_color, 0.6); }
+  headerbar.selection-mode:backdrop, toolbar.selection-mode:backdrop {
+    border-color: mix(@theme_unfocused_selected_bg_color, @theme_unfocused_selected_fg_color, 0.6);
+    color: @theme_unfocused_selected_fg_color;
+    background-color: mix(@theme_unfocused_selected_bg_color, @theme_unfocused_selected_fg_color, 0.6); }
+  headerbar.selection-mode button, toolbar.selection-mode button {
     border-width: 1px;
     border-style: solid;
-    border-color: shade(@theme_selected_bg_color, 0.9);
+    border-color: mix(@theme_selected_bg_color, @theme_selected_fg_color, 0.7);
     border-radius: 0px;
-    background-color: shade(@theme_selected_bg_color, 1.18);
-    background-image: none;
-    color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.1);
-}
-
-.selection-mode headerbar .suggested-action button:hover,
-.selection-mode toolbar .suggested-action button:hover,
-.selection-mode toolbar toolbutton.suggested-action button:hover {
-    border-color: shade(@theme_selected_bg_color, 0.8);
-    background-color: shade(@theme_selected_bg_color, 1.20);
-    background-image: none;
-}
-
-.selection-mode headerbar .suggested-action button:active,
-.selection-mode toolbar .suggested-action button:active,
-.selection-mode toolbar toolbutton.suggested-action:active {
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: shade(@theme_selected_bg_color, 1.05);
-    background-image: none;
-}
-
-.selection-mode headerbar .suggested-action button:hover:active,
-.selection-mode toolbar .suggested-action button:hover:active,
-.selection-mode toolbar toolbutton.suggested-action button:hover:active {
-    border-color: shade(@theme_selected_bg_color, 0.8);
-}
-
-/* menu button */
-.selection-mode headerbar .selection-menu button,
-.selection-mode toolbar .selection-menu button {
+    color: mix(@theme_selected_bg_color, @theme_fg_color, 0.2);
+    background-color: mix(@theme_selected_bg_color, @theme_selected_fg_color, 0.7); }
+    headerbar.selection-mode button:hover, toolbar.selection-mode button:hover {
+      border-color: mix(@theme_selected_bg_color, @theme_selected_fg_color, 0.75);
+      background-color: mix(@theme_selected_bg_color, @theme_selected_fg_color, 0.75); }
+    headerbar.selection-mode button:active, headerbar.selection-mode button:checked, toolbar.selection-mode button:active, toolbar.selection-mode button:checked {
+      border-color: mix(@theme_selected_bg_color, @theme_selected_fg_color, 0.45);
+      background-color: mix(@theme_selected_bg_color, @theme_selected_fg_color, 0.45); }
+      headerbar.selection-mode button:active:backdrop, headerbar.selection-mode button:checked:backdrop, toolbar.selection-mode button:active:backdrop, toolbar.selection-mode button:checked:backdrop {
+        border-color: mix(@theme_unfocused_selected_bg_color, @theme_unfocused_selected_fg_color, 0.45);
+        background-color: mix(@theme_unfocused_selected_bg_color, @theme_unfocused_selected_fg_color, 0.45); }
+    headerbar.selection-mode button:backdrop, toolbar.selection-mode button:backdrop {
+      border-color: mix(@theme_unfocused_selected_bg_color, @theme_unfocused_selected_fg_color, 0.75);
+      color: mix(@theme_unfocused_selected_bg_color, @theme_unfocused_fg_color, 0.3);
+      background-color: mix(@theme_unfocused_selected_bg_color, @theme_unfocused_selected_fg_color, 0.75); }
+  headerbar.selection-mode button.suggested-action, toolbar.selection-mode button.suggested-action {
+    box-shadow: inset 0 0 1px 0 shade(@theme_selected_bg_color, 0.6); }
+    headerbar.selection-mode button.suggested-action:hover, toolbar.selection-mode button.suggested-action:hover {
+      box-shadow: inset 0 0 1px 0 shade(@theme_selected_bg_color, 0.6); }
+    headerbar.selection-mode button.suggested-action:backdrop, toolbar.selection-mode button.suggested-action:backdrop {
+      box-shadow: none; }
+  headerbar.selection-mode .selection-menu button, toolbar.selection-mode .selection-menu button {
     border-style: none;
     background-color: transparent;
-    background-image: none;
-    color: shade(@theme_selected_bg_color, 0.8);
-}
-
-.selection-mode toolbar .dim-label,
-.selection-mode toolbar .selection-menu button .dim-label {
-    color: shade(@theme_selected_bg_color, 0.7);
-}
-
-.selection-mode headerbar .selection-menu button:hover,
-.selection-mode toolbar .dim-label:hover,
-.selection-mode toolbar .selection-menu button:hover,
-.selection-mode toolbar .selection-menu button .dim-label:hover {
-    color: shade(@theme_selected_bg_color, 0.7);
-}
-
-.selection-mode headerbar .selection-menu button:active,
-.selection-mode toolbar .selection-menu button:active {
-    color: shade(@theme_selected_bg_color, 0.8);
-    box-shadow: none;
-}
-
-/*************************
- * touch text selections *
- *************************/
-GtkBubbleWindow {
-    border-radius: 0px;
-    background-clip: border-box;
-}
-
-GtkBubbleWindow.osd.background {
-    background-color: @osd_bg;
-}
-
-GtkBubbleWindow toolbar {
-    background-color: transparent;
-}
+    color: shade(@theme_selected_bg_color, 0.8); }
+    headerbar.selection-mode .selection-menu button .dim-label, toolbar.selection-mode .selection-menu button .dim-label {
+      color: shade(@theme_selected_bg_color, 0.7); }
 
-/*******
- * CSD *
- *******/
 decoration {
-    border-radius: 0;
-    border-width: 0px;
-    box-shadow: 0 3px 9px 1px rgba(0,0,0,0.3), 0 0 0 1px rgba(0, 0, 0, 0.23);
-    margin: 10px;
-}
-
-decoration:backdrop {
-    box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18);
-    transition: 200ms ease-out;
-}
-
-.maximized headerbar,
-.maximized headerbar:backdrop,
-.tiled .titlebar:not(headerbar),
-.tiled .titlebar:backdrop:not(headerbar),
-.maximized .titlebar:not(headerbar),
-.maximized .titlebar:backdrop:not(headerbar) {
-    border-radius: 0;
-}
-
-.popup decoration {
-    box-shadow: none;
-}
-
-.ssd decoration {
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23);
-}
-
-.csd.popup decoration {
-    border-radius: 0;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13);
-}
-
-/*tooltip.csd decoration {
-border-radius: 0;
-box-shadow: none;
-}
- */
-messagedialog.csd decoration {
-    border-radius: 0;
-    background-color: @theme_bg_color;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13);
-}
-
-.solid-csd decoration {
-    margin: 0;
-    padding: 4px;
-    background-color: @theme_bg_color;
-    border: solid 1px shade(@theme_bg_color, 0.8);
-    border-radius: 0;
-    box-shadow: inset 0 0 0 3px rgba(0,0,0,0.3), inset 0 1px rgba(20, 20, 20, 0.8);
-}
-
-.solid-csd decoration:backdrop {
-    box-shadow: inset 0 0 0 3px rgba(0,0,0,0.3), inset 0 1px rgba(20, 20, 20, 0.8);
-}
-
-/* decoration for windows */
-.titlebar,
-.titlebar:not(headerbar) {
-    border-radius: 0;
+  border-radius: 0px 0px 0 0;
+  border-width: 0px;
+  box-shadow: 0 3px 9px 1px alpha(@dark_shadow, 0.3), 0 0 0 1px alpha(@dark_shadow, 0.23);
+  margin: 10px; }
+  decoration:backdrop {
+    box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px alpha(@dark_shadow, 0.2), 0 0 0 1px alpha(@dark_shadow, 0.18); }
+  .fullscreen decoration, .tiled decoration {
+    border-radius: 0; }
+  .popup decoration {
+    box-shadow: 0 0 0 1px alpha(@dark_shadow, 0.1);
+    border-radius: 0; }
+  .ssd decoration {
+    border-radius: 0px 0px 0 0;
+    box-shadow: 0 0 0 1px alpha(@dark_shadow, 0.1); }
+    .ssd decoration.maximized {
+      border-radius: 0; }
+  tooltip.csd decoration {
+    border-radius: 0px;
+    box-shadow: none; }
+  .solid-csd decoration {
+    margin: 1px;
+    border-radius: 0px;
+    background-color: alpha(@light_shadow, 0.95);
+    box-shadow: none; }
+
+messagedialog .background.csd {
+  border-radius: 0 0 0px 0px;
+  color: @theme_fg_color;
+  background-color: @theme_bg_color; }
+  messagedialog .background.csd decoration {
+    border-radius: 0px;
+    box-shadow: 0 1px 2px alpha(@dark_shadow, 0.2); }
+messagedialog .titlebar.horizontal {
+  background-color: @theme_bg_color; }
+messagedialog.csd .dialog-action-area button {
+  padding: 10px;
+  border-radius: 0;
+  border-bottom-style: none; }
+  messagedialog.csd .dialog-action-area button:last-child {
+    border-right-width: 0;
+    border-radius: 0px; }
+  messagedialog.csd .dialog-action-area button:first-child {
+    border-left-width: 0;
+    border-radius: 0px; }
+  messagedialog.csd .dialog-action-area button:only-child {
+    border-radius: 0px; }
+
+.titlebar {
+  border-bottom: none;
+  border-radius: 0px 0px 0px 0px; }
+  .titlebar .title {
+    padding-left: 12px;
+    padding-right: 12px;
+    font-weight: bold; }
+  .titlebar .subtitle {
+    font-size: smaller;
+    padding-left: 12px;
+    padding-right: 12px;
+    color: alpha(currentColor, 0.7); }
+  .titlebar .titlebutton.close, .titlebar .titlebutton.maximize, .titlebar .titlebutton.minimize, .titlebar .titlebutton:not(separator) {
+    padding: 7px 12px;
+    border: none;
+    color: transparent;
     background-color: transparent;
-    background-image: image(@titlebar_bg_color);
-    color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
-    text-shadow: none;
-}
-
-.titlebar:backdrop,
-.titlebar:not(headerbar):backdrop {
-    background-image: none;
-    background-color: @titlebar_bg_color;
-    color: @titlebar_bg_color;
-    text-shadow: none;
-}
-
-.titlebar .titlebutton {
-    padding: 6px 12px;
-    border-style: none;
-    background: none;
-    color: @theme_selected_bg_color;
     -gtk-icon-shadow: none;
-}
-
-/* CSD */
-headerbar.default-decoration,
-.csd headerbar.default-decoration, 
-.default-decoration.titlebar:not(headerbar),
-.csd .default-decoration.titlebar:not(headerbar) {
-    min-height: 28px;
-    padding: 0 3px;
-    background-color: @titlebar_bg_color;
-    background-image: image(@titlebar_bg_color);
-    border-bottom-width: 0;
-}
-
-headerbar.default-decoration:backdrop,
-.csd headerbar.default-decoration:backdrop,
-.default-decoration.titlebar:backdrop:not(headerbar),
-.csd .default-decoration.titlebar:backdrop:not(headerbar) {
-    background-color: @titlebar_bg_color;
-    background-image: image(@titlebar_bg_color);
-}
-
-/**************
- * over under *
- **************/
-
-/* these elements MUST be hidden, otherwise scrolling pages will have
- * missing chunks */
-
-overshoot.top {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(64, 128, 251, 0.2)), to(rgba(64, 128, 251, 0)));
-    background-size: 100% 60%;
-    background-repeat: no-repeat;
-    background-position: center top;
-    background-color: transparent;
+    background-position: center;
+    background-repeat: no-repeat; }
+  .titlebar .titlebutton.close {
+    background: url("assets/close-normal.png") 100% 100%; }
+    .titlebar .titlebutton.close:hover {
+      background: url("assets/close-hover.png") 100% 100%; }
+    .titlebar .titlebutton.close:active {
+      background: url("assets/close-active.png") 100% 100%; }
+    .titlebar .titlebutton.close:backdrop {
+      background: url("assets/close-backdrop.png") 100% 100%; }
+      .titlebar .titlebutton.close:backdrop:hover {
+        background: url("assets/close-hover.png") 100% 100%; }
+      .titlebar .titlebutton.close:backdrop:active {
+        background: url("assets/close-active.png") 100% 100%; }
+  .titlebar .titlebutton.minimize {
+    background: url("assets/minimize-normal.png") 100% 100%; }
+    .titlebar .titlebutton.minimize:hover {
+      background: url("assets/minimize-hover.png") 100% 100%; }
+    .titlebar .titlebutton.minimize:active {
+      background: url("assets/minimize-active.png") 100% 100%; }
+    .titlebar .titlebutton.minimize:backdrop {
+      background: url("assets/minimize-backdrop.png") 100% 100%; }
+      .titlebar .titlebutton.minimize:backdrop:hover {
+        background: url("assets/minimize-hover.png") 100% 100%; }
+      .titlebar .titlebutton.minimize:backdrop:active {
+        background: url("assets/minimize-active.png") 100% 100%; }
+  .titlebar .titlebutton.maximize {
+    background: url("assets/maximize-normal.png") 100% 100%; }
+    .titlebar .titlebutton.maximize:hover {
+      background: url("assets/maximize-hover.png") 100% 100%; }
+    .titlebar .titlebutton.maximize:active {
+      background: url("assets/maximize-active.png") 100% 100%; }
+    .titlebar .titlebutton.maximize:backdrop {
+      background: url("assets/maximize-backdrop.png") 100% 100%; }
+      .titlebar .titlebutton.maximize:backdrop:hover {
+        background: url("assets/maximize-hover.png") 100% 100%; }
+      .titlebar .titlebutton.maximize:backdrop:active {
+        background: url("assets/maximize-active.png") 100% 100%; }
+  .maximized .titlebar .titlebutton.maximize {
+    background: url("assets/restore-normal.png") 100% 100%; }
+    .maximized .titlebar .titlebutton.maximize:hover {
+      background: url("assets/restore-hover.png") 100% 100%; }
+    .maximized .titlebar .titlebutton.maximize:active {
+      background: url("assets/restore-active.png") 100% 100%; }
+    .maximized .titlebar .titlebutton.maximize:backdrop {
+      background: url("assets/restore-backdrop.png") 100% 100%; }
+      .maximized .titlebar .titlebutton.maximize:backdrop:hover {
+        background: url("assets/restore-hover.png") 100% 100%; }
+      .maximized .titlebar .titlebutton.maximize:backdrop:active {
+        background: url("assets/restore-active.png") 100% 100%; }
+  .tiled .titlebar:not(headerbar), .tiled .titlebar:backdrop:not(headerbar), .maximized .titlebar:not(headerbar), .maximized .titlebar:backdrop:not(headerbar) {
+    border-radius: 0; }
+
+.titlebar, .titlebar:not(headerbar), headerbar.default-decoration, .csd headerbar.default-decoration, .default-decoration.titlebar:not(headerbar), .csd .default-decoration.titlebar:not(headerbar) {
+  min-height: 28px;
+  color: @titlebar_fg_color;
+  background-color: @titlebar_bg_color; }
+  .titlebar:backdrop, .titlebar:not(headerbar):backdrop, headerbar.default-decoration:backdrop, .csd headerbar.default-decoration:backdrop, .default-decoration.titlebar:not(headerbar):backdrop, .csd .default-decoration.titlebar:not(headerbar):backdrop {
+    background-color: @theme_unfocused_bg_color;
+    color: @theme_unfocused_fg_color; }
+
+.caja-desktop, .nemo-desktop.nemo-canvas-item, .nautilus-desktop.nautilus-canvas-item {
+  color: @desktop_item_fg;
+  text-shadow: 1px 1px @desktop_item_text_shadow; }
+  .caja-desktop:active, .nemo-desktop.nemo-canvas-item:active, .nautilus-desktop.nautilus-canvas-item:active {
+    color: @desktop_item_fg; }
+  .caja-desktop:selected, .nemo-desktop.nemo-canvas-item:selected, .nautilus-desktop.nautilus-canvas-item:selected {
+    color: @desktop_item_selected_fg;
+    text-shadow: none; }
+
+panel-toplevel.background, panel-toplevel.background menubar {
+  background-color: @taskbar_bg_color;
+  color: @taskbar_fg_color; }
+panel-toplevel.background menubar, panel-toplevel.background #PanelApplet label, panel-toplevel.background #PanelApplet image {
+  color: @taskbar_fg_color; }
+panel-toplevel.background menubar > menuitem, panel-toplevel.background menubar > menuitem label:backdrop {
+  color: @taskbar_fg_color; }
+panel-toplevel.background menubar > menuitem:hover, panel-toplevel.background menubar > menuitem:hover label:backdrop {
+  color: @theme_selected_fg_color; }
+panel-toplevel.background button {
+  background-color: @taskbar_bg_color;
+  border: none;
+  border-radius: 0;
+  box-shadow: none;
+  color: @taskbar_fg_color; }
+  panel-toplevel.background button:active, panel-toplevel.background button:checked {
+    background-color: shade(@taskbar_bg_color, 0.8);
     border: none;
     box-shadow: none;
-}
-
-overshoot.bottom {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(64, 128, 251, 0.2)), to(rgba(64, 128, 251, 0)));
-    background-size: 100% 60%;
-    background-repeat: no-repeat;
-    background-position: center bottom;
-    background-color: transparent;
+    color: @taskbar_fg_color; }
+
+#tasklist-button, #tasklist-button label {
+  color: alpha(@taskbar_fg_color, 0.7);
+  border-radius: 0;
+  border: none;
+  box-shadow: none;
+  background-color: transparent; }
+  #tasklist-button:hover, #tasklist-button label:hover {
+    color: alpha(@taskbar_fg_color, 0.7);
+    background-color: transparent; }
+  #tasklist-button:checked, #tasklist-button label:checked {
+    color: @taskbar_fg_color; }
+
+panel-toplevel.background na-tray-applet {
+  -NaTrayApplet-icon-padding: 0;
+  -NaTrayApplet-icon-size: 16px; }
+
+.xfce4-panel.panel {
+  background-color: @taskbar_bg_color; }
+  .xfce4-panel.panel button.flat, .xfce4-panel.panel button.sidebar-button {
+    color: @taskbar_fg_color;
+    background-color: @taskbar_bg_color;
+    border-radius: 0;
+    border: none; }
+    .xfce4-panel.panel button.flat:hover, .xfce4-panel.panel button.sidebar-button:hover {
+      border: none;
+      background-color: shade(@taskbar_bg_color, 1.1); }
+    .xfce4-panel.panel button.flat:active, .xfce4-panel.panel button.flat:checked, .xfce4-panel.panel button.sidebar-button:active, .xfce4-panel.panel button.sidebar-button:checked {
+      color: @theme_selected_bg_color;
+      border: none;
+      background-color: shade(@taskbar_bg_color, 0.93); }
+
+.mate-panel-menu-bar {
+  color: @taskbar_fg_color;
+  background-color: @taskbar_bg_color; }
+  .mate-panel-menu-bar button, .mate-panel-menu-bar button.flat {
+    background-color: transparent; }
+  .mate-panel-menu-bar, .mate-panel-menu-bar .menubar {
+    background-color: @taskbar_bg_color; }
+  .mate-panel-menu-bar .menubar > .menuitem {
+    padding-top: 0;
+    padding-bottom: 0; }
+  .mate-panel-menu-bar GtkMenu .label {
+    color: @theme_fg_color;
+    font-style: normal; }
+    .mate-panel-menu-bar GtkMenu .label:disabled {
+      color: @theme_disabled_fg_color; }
+  .mate-panel-menu-bar .button:not(#tasklist-button) {
+    color: @taskbar_fg_color;
+    border-radius: 0;
     border: none;
-    box-shadow: none;
-}
-
-overshoot.left {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(64, 128, 251, 0.2)), to(rgba(64, 128, 251, 0)));
-    background-size: 60% 100%;
-    background-repeat: no-repeat;
-    background-position: left center;
-    background-color: transparent;
+    background-color: @taskbar_bg_color; }
+    .mate-panel-menu-bar .button:not(#tasklist-button):hover {
+      border: none;
+      background-color: shade(@taskbar_bg_color, 1.1); }
+    .mate-panel-menu-bar .button:not(#tasklist-button):active, .mate-panel-menu-bar .button:not(#tasklist-button):checked {
+      color: @theme_selected_fg_color;
+      border: none;
+      background-color: @theme_selected_bg_color; }
+  .mate-panel-menu-bar #tasklist-button {
+    color: @taskbar_fg_color;
+    border-radius: 0;
     border: none;
-    box-shadow: none;
-}
+    padding-bottom: 0;
+    padding-top: 0; }
+    .mate-panel-menu-bar #tasklist-button:hover {
+      background-color: shade(@taskbar_bg_color, 1.1); }
+    .mate-panel-menu-bar #tasklist-button:checked, .mate-panel-menu-bar #tasklist-button:active {
+      color: @theme_selected_fg_color;
+      background-color: @theme_selected_bg_color; }
+  .mate-panel-menu-bar PanelSeparator {
+    color: shade(@taskbar_bg_color, 0.7);
+    padding-top: 4px;
+    padding-bottom: 4px; }
+  .mate-panel-menu-bar NaTrayApplet {
+    -NaTrayApplet-icon-padding: 2; }
+
+.mintmenu:hover {
+  background-color: shade(@taskbar_bg_color, 1.1); }
+
+.mintmenu:selected {
+  color: @theme_selected_fg_color;
+  background-color: @theme_selected_bg_color; }
+
+.wnck-pager {
+  background-color: alpha(black, 0.04); }
+  .wnck-pager:selected {
+    background-color: alpha(@selected_bg_color, 0.3); }
+  .wnck-pager:hover {
+    background-color: alpha(@selected_bg_color, 0.2); }
 
-overshoot.right {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(64, 128, 251, 0.2)), to(rgba(64, 128, 251, 0)));
-    background-size: 60% 100%;
-    background-repeat: no-repeat;
-    background-position: right center;
-    background-color: transparent;
+.nemo-window .nemo-window-pane widget.entry {
+  border: 1px solid;
+  border-radius: 3px;
+  border-color: @theme_selected_bg_color;
+  color: @theme_fg_color;
+  background-color: @theme_base_color; }
+  .nemo-window .nemo-window-pane widget.entry:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus {
+    color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color; }
+.nemo-window .sidebar {
+  background-color: @theme_bg_color; }
+  .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar row {
+    background-color: transparent; }
+    .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected {
+      border-color: @theme_selected_bg_color;
+      color: @theme_selected_fg_color;
+      background-color: @theme_selected_bg_color; }
+    .nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, .nemo-window .sidebar row.expander {
+      color: @theme_fg_color; }
+      .nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, .nemo-window .sidebar row.expander:hover {
+        color: @theme_selected_bg_color; }
+  .nemo-window .sidebar separator, .nemo-window .sidebar separator:backdrop {
+    background-color: transparent; }
+
+UnityDecoration {
+  -UnityDecoration-extents: 28px 0 0 0;
+  -UnityDecoration-input-extents: 10px;
+  -UnityDecoration-shadow-offset-x: 1px;
+  -UnityDecoration-shadow-offset-y: 1px;
+  -UnityDecoration-active-shadow-color: rgba(0, 0, 0, 0.7);
+  -UnityDecoration-active-shadow-radius: 8px;
+  -UnityDecoration-inactive-shadow-color: rgba(0, 0, 0, 0.5);
+  -UnityDecoration-inactive-shadow-radius: 5px;
+  -UnityDecoration-glow-size: 10px;
+  -UnityDecoration-glow-color: @theme_selected_bg_color;
+  -UnityDecoration-title-indent: 10px;
+  -UnityDecoration-title-fade: 35px;
+  -UnityDecoration-title-alignment: 0.0; }
+  UnityDecoration .top {
     border: none;
-    box-shadow: none;
-}
-
-
-undershoot.top {
-    background-color: transparent;
-    background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%);
-    padding-top: 1px;
-    background-size: 10px 1px;
-    background-repeat: repeat-x;
-    background-origin: content-box;
-    background-position: center top;
-}
-
-undershoot.bottom {
-    background-color: transparent;
-    background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%);
-    padding-bottom: 1px;
-    background-size: 10px 1px;
-    background-repeat: repeat-x;
-    background-origin: content-box;
-    background-position: center bottom;
-}
-
-undershoot.left {
-    background-color: transparent;
-    background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%);
-    padding-left: 1px;
-    background-size: 1px 10px;
-    background-repeat: repeat-y;
-    background-origin: content-box;
-    background-position: left center;
-}
-
-undershoot.right {
-    background-color: transparent;
-    background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%);
-    padding-right: 1px;
-    background-size: 1px 10px;
-    background-repeat: repeat-y;
-    background-origin: content-box;
-    background-position: right center;
-}
-
-.overlay-bar {
-    background-color: rgba(0, 0, 0, 0.8);
-    border-radius: 4px;
-    padding: 3px 6px;
-    margin: 3px;
-}
-
-.overlay-bar label {
-    color: @tooltip_fg_color;
-}
+    border-radius: 0px 0px 0 0;
+    padding: 1px 8px 0 8px;
+    background-color: @titlebar_bg_color;
+    color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
+    text-shadow: none; }
+    UnityDecoration .top:backdrop {
+      background-color: @theme_unfocused_bg_color;
+      color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); }
+  UnityDecoration .left, UnityDecoration .right, UnityDecoration.bottom {
+    background-color: @titlebar_bg_color; }
+    UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration.bottom:backdrop {
+      background-color: @titlebar_bg_color; }
+  UnityDecoration.menuitem, UnityDecoration .menuitem {
+    border-radius: 0; }
+    UnityDecoration.menuitem:hover, UnityDecoration.menuitem *:hover, UnityDecoration .menuitem:hover, UnityDecoration .menuitem *:hover {
+      background-color: @theme_selected_bg_color;
+      color: @theme_selected_fg_color; }
+
+UnityPanelWidget, .unity-panel {
+  border-width: 0 0 1px 0;
+  border-style: solid;
+  border-color: @taskbar_bg_color;
+  background-color: @taskbar_bg_color;
+  color: @taskbar_fg_color; }
+  UnityPanelWidget.menuitem, UnityPanelWidget .menuitem, .unity-panel.menuitem, .unity-panel .menuitem {
+    border-width: 0 1px;
+    color: @taskbar_fg_color; }
+
+@keyframes playbackmenuitem_spinner {
+  to {
+    -gtk-icon-transform: rotate(1turn); } }
+.menu IdoPlaybackMenuItem.menuitem:active {
+  -gtk-icon-source: -gtk-icontheme("process-working-symbolic");
+  animation: playbackmenuitem_spinner 1s infinite linear;
+  color: @theme_selected_bg_color; }
diff --git a/gtk-3.20/gtk.css b/gtk-3.20/gtk.css
old mode 100755
new mode 100644
index 131cde1..94f2f51
--- a/gtk-3.20/gtk.css
+++ b/gtk-3.20/gtk.css
@@ -1,96 +1,118 @@
-/*# name: Windows 10 Light
-  # author: Christian Medel (Elbullazul)
-  # date: April 7th, 2016
-  # description: Windows 10 Default White color*/
-
-/* default color scheme */
+/* Normal colors */
+@import url("gtk-widgets.css");
 @define-color bg_color #ffffff;
-@define-color fg_color #4c4c4c;
-@define-color base_color #ffffff;
-@define-color text_color #4c4c4c;
+@define-color fg_color #000000;
+@define-color base_color #FFFFFF;
+@define-color text_color #000000;
 @define-color selected_bg_color #cce8ff;
-@define-color selected_fg_color #262626;
-@define-color tooltip_bg_color #ffffff;
-@define-color tooltip_fg_color #4c4c4c;
-
-/* dark color scheme */
+@define-color selected_fg_color #000000;
+@define-color disabled_bg_color mix(@fg_color, @bg_color, 0.95);
+@define-color disabled_fg_color mix(@fg_color, @bg_color, 0.5);
+@define-color disabled_base_color @disabled_bg_color;
+@define-color disabled_text_color @disabled_fg_color;
+/* Backdrop state colors */
+@define-color unfocused_bg_color @bg_color;
+@define-color unfocused_fg_color @fg_color;
+@define-color unfocused_base_color @base_color;
+@define-color unfocused_text_color @text_color;
+@define-color unfocused_selected_bg_color @selected_bg_color;
+@define-color unfocused_selected_fg_color @selected_fg_color;
+@define-color unfocused_disabled_bg_color mix(@fg_color, @bg_color, 0.98);
+@define-color unfocused_disabled_fg_color mix(@fg_color, @bg_color, 0.75);
+@define-color unfocused_disabled_base_color @unfocused_disabled_bg_color;
+@define-color unfocused_disabled_text_color @unfocused_disabled_fg_color;
+/* Darker color scheme */
 @define-color dark_bg_color #ffffff;
-@define-color dark_fg_color #4c4c4c;
-
-/* colormap actually used by the theme, to be overridden in other css files */
+@define-color dark_fg_color #000000;
+/* Theme colors */
 @define-color theme_bg_color @bg_color;
 @define-color theme_fg_color @fg_color;
 @define-color theme_base_color @base_color;
 @define-color theme_text_color @text_color;
 @define-color theme_selected_bg_color @selected_bg_color;
 @define-color theme_selected_fg_color @selected_fg_color;
-@define-color theme_tooltip_bg_color @tooltip_bg_color;
-@define-color theme_tooltip_fg_color @tooltip_fg_color;
-
-/* Desktop Icons */
-@define-color desktop_item_fg #fff;
-@define-color desktop_item_selected_fg @theme_selected_fg_color;
-@define-color desktop_item_text_shadow alpha(black, 0.8);
-
-/* shadow effects */
-@define-color light_shadow #fff;
-@define-color dark_shadow #000;
-
-/* misc colors used by gtk+ */
-@define-color info_fg_color rgb (40, 40, 40);
-@define-color info_bg_color rgb (217, 237, 247);
-@define-color warning_fg_color rgb (77, 77, 77);
-@define-color warning_bg_color rgb (222, 109, 38);
-@define-color question_fg_color rgb (255, 255, 255);
-@define-color question_bg_color rgb (255, 156, 25);
-@define-color error_fg_color rgb (255, 255, 255);
-@define-color error_bg_color rgb (255, 25, 25);
+@define-color theme_disabled_bg_color @disabled_bg_color;
+@define-color theme_disabled_fg_color @disabled_fg_color;
+@define-color theme_disabled_text_color @disabled_text_color;
+@define-color theme_disabled_base_color @disabled_base_color;
+/* Unfocused color scheme */
+@define-color theme_unfocused_bg_color @unfocused_bg_color;
+@define-color theme_unfocused_fg_color @unfocused_fg_color;
+@define-color theme_unfocused_base_color @unfocused_base_color;
+@define-color theme_unfocused_text_color @unfocused_text_color;
+@define-color theme_unfocused_selected_bg_color @unfocused_selected_bg_color;
+@define-color theme_unfocused_selected_fg_color @unfocused_selected_fg_color;
+@define-color theme_unfocused_disabled_bg_color @unfocused_disabled_bg_color;
+@define-color theme_unfocused_disabled_fg_color @unfocused_disabled_fg_color;
+@define-color theme_unfocused_disabled_text_color @unfocused_disabled_text_color;
+@define-color theme_unfocused_disabled_base_color @unfocused_disabled_base_color;
+/* Shadows */
+@define-color dark_shadow rgb(0, 0, 0);
+@define-color color_shadow @selected_bg_color;
+@define-color light_shadow rgb(255, 255, 255);
+/* Borders */
+@define-color borders shade(@bg_color, 0.9);
+@define-color outline_color shade(@bg_color, 0.75);
+@define-color unfocused_borders shade(@unfocused_bg_color, 0.9);
+/* Notification header backgrounds */
+@define-color info_fg_color #FFFFFF;
+@define-color info_bg_color #0055FF;
+@define-color warning_fg_color #FFFFFF;
+@define-color warning_bg_color #FF8300;
+@define-color question_fg_color #FFFFFF;
+@define-color question_bg_color #2C2C2C;
+@define-color error_fg_color #FFFFFF;
+@define-color error_bg_color #FF0000;
 @define-color link_color #224ba0;
-@define-color success_color #53d013;
-@define-color warning_color #f57600;
-@define-color error_color #cc0000;
-
-/* widget colors */
-@define-color titlebar_bg_color @dark_bg_color;
-@define-color titlebar_fg_color @dark_fg_color;
-@define-color menubar_bg_color @dark_bg_color;
-@define-color menubar_fg_color @dark_fg_color;
-@define-color toolbar_bg_color @dark_bg_color; /*@theme_bg_color;*/
-@define-color toolbar_fg_color @dark_fg_color; /*@theme_fg_color;*/
+@define-color error_color #CC0000;
+@define-color success_color #39e4a3;
+@define-color warning_color #FF9900;
+/* Widget colors */
+@define-color tooltip_bg_color @dark_bg_color;
+@define-color tooltip_fg_color @dark_fg_color;
 @define-color menu_bg_color @bg_color;
 @define-color menu_fg_color @fg_color;
-@define-color panel_bg_color #1a1a1a;
-@define-color panel_fg_color @dark_fg_color;
-
-/* osd */
-@define-color osd_base @dark_bg_color;
-@define-color osd_fg @dark_fg_color;
-@define-color osd_bg alpha(@osd_base, 0.8);
-
-/* lightdm greeter colors */
+@define-color menubar_bg_color @bg_color;
+@define-color menubar_fg_color @fg_color;
+@define-color toolbar_bg_color @bg_color;
+@define-color toolbar_fg_color @fg_color;
+@define-color sidebar_bg_color @dark_bg_color;
+@define-color sidebar_fg_color @dark_fg_color;
+@define-color taskbar_bg_color #0c0c0c;
+@define-color taskbar_fg_color #ffffff;
+@define-color titlebar_bg_color @bg_color;
+@define-color titlebar_fg_color @fg_color;
+@define-color headerbar_bg_color @bg_color;
+@define-color headerbar_fg_color @fg_color;
+@define-color terminal_bg_color @fg_color;
+@define-color terminal_fg_color @bg_color;
+@define-color progressbar_bg_color #06B025;
+@define-color progressbar_fg_color @selected_fg_color;
+/* OSD */
+@define-color osd_fg @dark_bg_color;
+@define-color osd_bg mix(@dark_fg_color, @dark_bg_color, 0.2);
+@define-color osd_base @dark_fg_color;
+/* Budgie colors */
+@define-color raven_fg_color @dark_fg_color;
+@define-color raven_bg_color alpha(@dark_bg_color, 0.9);
+/* Desktop Icons */
+@define-color desktop_item_fg #FFFFFF;
+@define-color desktop_item_selected_fg @selected_fg_color;
+@define-color desktop_item_text_shadow alpha(@dark_shadow, 0.8);
+/* LightDM greeter colors */
 @define-color lightdm_bg_color @dark_bg_color;
 @define-color lightdm_fg_color @dark_fg_color;
-
-/* window manager colors */
-@define-color wm_bg @titlebar_bg_color;
-@define-color wm_border_focused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21);
-@define-color wm_border_unfocused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12);
-@define-color wm_title_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
-@define-color wm_title_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
-@define-color wm_icons_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
-@define-color wm_icons_focused_prelight @selected_bg_color;
-@define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8);
-@define-color wm_icons_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
-@define-color wm_icons_unfocused_prelight @selected_bg_color;
-@define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8);
-
-/*Terminal Text color*/
-@define-color terminal_text_color @bg_color;
-
-/*Progressbar bg color*/
-@define-color progressbar_color #06B025;
-
-@import url("gtk-widgets.css");
-@import url("gtk-widgets-assets.css");
-@import url("apps/gnome-terminal.css");
-@import url("apps/desktop.css");
+@define-color wm_title @titlebar_fg_color;
+@define-color wm_unfocused_title @unfocused_fg_color;
+@define-color wm_highlight alpha(@light_shadow, 0.8);
+@define-color wm_borders_edge alpha(@light_shadow, 0.8);
+@define-color wm_bg_a alpha(@selected_bg_color, 1.2);
+@define-color wm_bg_b alpha(@selected_bg_color, 1.2);
+@define-color wm_shadow alpha(@dark_shadow, 0.35);
+@define-color wm_border alpha(@dark_shadow, 0.35);
+@define-color wm_button_hover_color_a alpha(@selected_bg_color, 1.3);
+@define-color wm_button_hover_color_b alpha(@selected_bg_color, 1.3);
+@define-color wm_button_active_color_a alpha(@selected_bg_color, 0.85);
+@define-color wm_button_active_color_b alpha(@selected_bg_color, 0.85);
+@define-color wm_button_active_color_c alpha(@selected_bg_color, 0.85);
+@define-color content_view_bg @base_color;
diff --git a/index.theme b/index.theme
index 503a9a5..08e3182 100755
--- a/index.theme
+++ b/index.theme
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=X-GNOME-Metatheme
-Name=Windows 10 Default
+Name=Windows 10 Light
 Comment=Windows 10 UI for Linux OSes
 Comment=Author : Christian Medel (Elbullazul)
-Version=v0.9.8
+Version=v2.0
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-GtkTheme=Windows 10 Default
-MetacityTheme=Windows 10 Default
+GtkTheme=Windows 10 Light
+MetacityTheme=Windows 10 Light
 ButtonLayout=:minimize,maximize,close
diff --git a/panel-assets/DND-bottom-center.svg b/panel-assets/DND-bottom-center.svg
deleted file mode 100755
index 4f8ff9a..0000000
--- a/panel-assets/DND-bottom-center.svg
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="24"
-   height="24"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="hover.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#8c8c8c"
-     bordercolor="#ff5e00"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="20.005229"
-     inkscape:cx="4.7269017"
-     inkscape:cy="11.599277"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="716"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="false"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient3955">
-      <stop
-         id="stop3957"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         id="stop3959"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3773">
-      <stop
-         style="stop-color:#7ec83c;stop-opacity:1;"
-         offset="0"
-         id="stop3775" />
-      <stop
-         style="stop-color:#93d15b;stop-opacity:1;"
-         offset="1"
-         id="stop3777" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3773"
-       id="linearGradient3948"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91304348,0,0,0.91304348,-22.956522,277)"
-       x1="25"
-       y1="23"
-       x2="25"
-       y2="0" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3773"
-       id="linearGradient3950"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,24,0)"
-       x1="25"
-       y1="23"
-       x2="25"
-       y2="0" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3955"
-       id="linearGradient3953"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1.0434783,24,276.0435)"
-       x1="25"
-       y1="23"
-       x2="25"
-       y2="0" />
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title></dc:title>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <rect
-       style="opacity:0.90000000000000002;fill:#2a7fff;fill-opacity:1;stroke:none"
-       id="rect2995"
-       width="24"
-       height="24"
-       x="-24"
-       y="276"
-       transform="scale(-1,1)" />
-    <path
-       style="opacity:0.3;fill:url(#linearGradient3953);fill-opacity:1;stroke:none"
-       d="m 0,276.0435 0,24 L 24,300 24,276 z m 1.03125,1.04348 21.9375,-0.0435 0,21.91304 -21.9375,0.0435 z"
-       id="rect3944"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc" />
-  </g>
-</svg>
diff --git a/panel-assets/DND-bottom-left.svg b/panel-assets/DND-bottom-left.svg
deleted file mode 100755
index b2e43d8..0000000
--- a/panel-assets/DND-bottom-left.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3065"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="DND-bottom-left.png">
-  <metadata
-     id="metadata3071">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3069" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview3067"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3065" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAC1JREFU
-SIljZJc1PcNAO2DMREPDGRgYGBhGLRi1YNSCUQtGLRi1YNSCUQuoAwAFKwGIbnsI4wAAAABJRU5E
-rkJggg==
-"
-     id="image3073"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/DND-bottom-right.svg b/panel-assets/DND-bottom-right.svg
deleted file mode 100755
index b79c1ba..0000000
--- a/panel-assets/DND-bottom-right.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="24"
-   height="24"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="DND-bottom-center.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#8c8c8c"
-     bordercolor="#ff5e00"
-     borderopacity="1"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="24.582394"
-     inkscape:cx="3.0898092"
-     inkscape:cy="11.754018"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1600"
-     inkscape:window-height="821"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title></dc:title>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <rect
-       style="opacity:0.77999998000000004;fill:#3b82c8;fill-opacity:1;stroke:none"
-       id="rect5315"
-       width="24"
-       height="24"
-       x="2.4424907e-15"
-       y="276" />
-    <rect
-       style="opacity:0.25;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="rect3230"
-       width="24"
-       height="1"
-       x="-300"
-       y="0"
-       transform="matrix(0,-1,1,0,0,0)" />
-  </g>
-</svg>
diff --git a/panel-assets/DND-top-center.svg b/panel-assets/DND-top-center.svg
deleted file mode 100755
index 4f8ff9a..0000000
--- a/panel-assets/DND-top-center.svg
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="24"
-   height="24"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="hover.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#8c8c8c"
-     bordercolor="#ff5e00"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="20.005229"
-     inkscape:cx="4.7269017"
-     inkscape:cy="11.599277"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="716"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="false"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient3955">
-      <stop
-         id="stop3957"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         id="stop3959"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3773">
-      <stop
-         style="stop-color:#7ec83c;stop-opacity:1;"
-         offset="0"
-         id="stop3775" />
-      <stop
-         style="stop-color:#93d15b;stop-opacity:1;"
-         offset="1"
-         id="stop3777" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3773"
-       id="linearGradient3948"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91304348,0,0,0.91304348,-22.956522,277)"
-       x1="25"
-       y1="23"
-       x2="25"
-       y2="0" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3773"
-       id="linearGradient3950"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,24,0)"
-       x1="25"
-       y1="23"
-       x2="25"
-       y2="0" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3955"
-       id="linearGradient3953"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1.0434783,24,276.0435)"
-       x1="25"
-       y1="23"
-       x2="25"
-       y2="0" />
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title></dc:title>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <rect
-       style="opacity:0.90000000000000002;fill:#2a7fff;fill-opacity:1;stroke:none"
-       id="rect2995"
-       width="24"
-       height="24"
-       x="-24"
-       y="276"
-       transform="scale(-1,1)" />
-    <path
-       style="opacity:0.3;fill:url(#linearGradient3953);fill-opacity:1;stroke:none"
-       d="m 0,276.0435 0,24 L 24,300 24,276 z m 1.03125,1.04348 21.9375,-0.0435 0,21.91304 -21.9375,0.0435 z"
-       id="rect3944"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc" />
-  </g>
-</svg>
diff --git a/panel-assets/DND-top-left.svg b/panel-assets/DND-top-left.svg
deleted file mode 100755
index 49975c6..0000000
--- a/panel-assets/DND-top-left.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3036"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="hover.png">
-  <metadata
-     id="metadata3042">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3040" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview3038"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3036" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAADFJREFU
-SIljtJ9zxJiBhoCJloaPWjBqwagFoxaMWjBqwagFg8cCFgYGhjO0tIDmPgAABnMC0AAcqBcAAAAA
-SUVORK5CYII=
-"
-     id="image3044"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/DND-top-right.svg b/panel-assets/DND-top-right.svg
deleted file mode 100755
index a97d024..0000000
--- a/panel-assets/DND-top-right.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="24"
-   height="24"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="DND-bottom-right.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#8c8c8c"
-     bordercolor="#ff5e00"
-     borderopacity="1"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="24.582394"
-     inkscape:cx="3.0898092"
-     inkscape:cy="11.754018"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1600"
-     inkscape:window-height="821"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title></dc:title>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <rect
-       style="opacity:0.77999998000000004;fill:#3b82c8;fill-opacity:1;stroke:none"
-       id="rect5315"
-       width="24"
-       height="24"
-       x="2.4424907e-15"
-       y="276" />
-    <rect
-       style="opacity:0.25;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="rect3230"
-       width="24"
-       height="1"
-       x="-300"
-       y="0"
-       transform="matrix(0,-1,1,0,0,0)" />
-  </g>
-</svg>
diff --git a/panel-assets/bottom-item-active-hover.svg b/panel-assets/bottom-item-active-hover.svg
deleted file mode 100755
index 49975c6..0000000
--- a/panel-assets/bottom-item-active-hover.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3036"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="hover.png">
-  <metadata
-     id="metadata3042">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3040" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview3038"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3036" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAADFJREFU
-SIljtJ9zxJiBhoCJloaPWjBqwagFoxaMWjBqwagFg8cCFgYGhjO0tIDmPgAABnMC0AAcqBcAAAAA
-SUVORK5CYII=
-"
-     id="image3044"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/bottom-item-active.svg b/panel-assets/bottom-item-active.svg
deleted file mode 100755
index 49975c6..0000000
--- a/panel-assets/bottom-item-active.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3036"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="hover.png">
-  <metadata
-     id="metadata3042">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3040" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview3038"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3036" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAADFJREFU
-SIljtJ9zxJiBhoCJloaPWjBqwagFoxaMWjBqwagFg8cCFgYGhjO0tIDmPgAABnMC0AAcqBcAAAAA
-SUVORK5CYII=
-"
-     id="image3044"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/bottom-item-attention-hover.svg b/panel-assets/bottom-item-attention-hover.svg
deleted file mode 100755
index fc1a1af..0000000
--- a/panel-assets/bottom-item-attention-hover.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="top-item-attention (copie).png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAADFJREFU
-SIlj3OOulsZAQ8BES8NHLRi1YNSCUQtGLRi1YNSCwWMBCwMDw0xaWkBzHwAAgF8CWuPJLIIAAAAA
-SUVORK5CYII=
-"
-     id="image10"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/bottom-item-attention.svg b/panel-assets/bottom-item-attention.svg
deleted file mode 100755
index d87d2d5..0000000
--- a/panel-assets/bottom-item-attention.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="bottom-item-attention.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAADFJREFU
-SIljnGwhW89AQ8BES8NHLRi1YNSCUQtGLRi1YNSCwWMB4x53tf+0tIDmPgAAPWEDvrUbXTwAAAAA
-SUVORK5CYII=
-"
-     id="image10"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/bottom-item-hover.svg b/panel-assets/bottom-item-hover.svg
deleted file mode 100755
index ae91d78..0000000
--- a/panel-assets/bottom-item-hover.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="bottom-item-attention.png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAACdJREFU
-SIljbG1trWegIWCipeGjFoxaMGrBqAWjFoxaMGrBqAXUAwCOqwI+xps+7gAAAABJRU5ErkJggg==
-"
-     id="image10"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/panel-separator.svg b/panel-assets/panel-separator.svg
deleted file mode 100755
index 2be5d2b..0000000
--- a/panel-assets/panel-separator.svg
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="9"
-   height="20"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="panel-separator.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#8c8c8c"
-     bordercolor="#ff5e00"
-     borderopacity="1"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.802282"
-     inkscape:cx="-20.791849"
-     inkscape:cy="11.747862"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1600"
-     inkscape:window-height="846"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="false"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-280)">
-    <rect
-       style="opacity:0.3;fill:#ffffff;fill-opacity:1"
-       id="rect3834"
-       width="1"
-       height="20"
-       x="4"
-       y="0"
-       transform="translate(0,280)" />
-  </g>
-</svg>
diff --git a/panel-assets/top-item-active-hover.svg b/panel-assets/top-item-active-hover.svg
deleted file mode 100755
index 49975c6..0000000
--- a/panel-assets/top-item-active-hover.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3036"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="hover.png">
-  <metadata
-     id="metadata3042">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3040" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview3038"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3036" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAADFJREFU
-SIljtJ9zxJiBhoCJloaPWjBqwagFoxaMWjBqwagFg8cCFgYGhjO0tIDmPgAABnMC0AAcqBcAAAAA
-SUVORK5CYII=
-"
-     id="image3044"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/top-item-active.svg b/panel-assets/top-item-active.svg
deleted file mode 100755
index 49975c6..0000000
--- a/panel-assets/top-item-active.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3036"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="hover.png">
-  <metadata
-     id="metadata3042">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3040" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview3038"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3036" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAADFJREFU
-SIljtJ9zxJiBhoCJloaPWjBqwagFoxaMWjBqwagFg8cCFgYGhjO0tIDmPgAABnMC0AAcqBcAAAAA
-SUVORK5CYII=
-"
-     id="image3044"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/top-item-attention-hover.svg b/panel-assets/top-item-attention-hover.svg
deleted file mode 100755
index fc1a1af..0000000
--- a/panel-assets/top-item-attention-hover.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="top-item-attention (copie).png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAADFJREFU
-SIlj3OOulsZAQ8BES8NHLRi1YNSCUQtGLRi1YNSCwWMBCwMDw0xaWkBzHwAAgF8CWuPJLIIAAAAA
-SUVORK5CYII=
-"
-     id="image10"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/top-item-attention.svg b/panel-assets/top-item-attention.svg
deleted file mode 100755
index d87d2d5..0000000
--- a/panel-assets/top-item-attention.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="bottom-item-attention.svg">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAADFJREFU
-SIljnGwhW89AQ8BES8NHLRi1YNSCUQtGLRi1YNSCwWMB4x53tf+0tIDmPgAAPWEDvrUbXTwAAAAA
-SUVORK5CYII=
-"
-     id="image10"
-     x="0"
-     y="0" />
-</svg>
diff --git a/panel-assets/top-item-hover.svg b/panel-assets/top-item-hover.svg
deleted file mode 100755
index ae91d78..0000000
--- a/panel-assets/top-item-hover.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="24"
-   height="24"
-   sodipodi:docname="bottom-item-attention.png">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <image
-     width="24"
-     height="24"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAACdJREFU
-SIljbG1trWegIWCipeGjFoxaMGrBqAWjFoxaMGrBqAXUAwCOqwI+xps+7gAAAABJRU5ErkJggg==
-"
-     id="image10"
-     x="0"
-     y="0" />
-</svg>
diff --git a/tint2/tint2rc b/tint2/tint2rc
deleted file mode 100755
index a96bccb..0000000
--- a/tint2/tint2rc
+++ /dev/null
@@ -1,119 +0,0 @@
-# Tint2 config file
-# Generated by tintwizard (http://code.google.com/p/tintwizard/)
-# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
-# Customized to fit the Windows 10 Transformation pack by Christian Medel (Elbullazul)
-
-# Background definitions
-# ID 1
-rounded = 0
-border_width = 2
-background_color = #000000 60
-border_color = #000000 60
-
-# ID 2
-rounded = 0
-border_width = 0
-background_color = #004D8C 40
-border_color = #ffffff 48
-
-# ID 3
-rounded = 0
-border_width = 0
-background_color = #f1f1f1 40
-border_color = #ffffff 68
-
-# Panel
-panel_monitor = all
-panel_position = bottom center horizontal
-panel_size = 100% 40
-panel_margin = 0 0
-panel_padding = 7 0 7
-panel_dock = 0
-wm_menu = 0
-panel_layer = top
-panel_background_id = 1
-
-# Panel Autohide
-autohide = 0
-autohide_show_timeout = 0.3
-autohide_hide_timeout = 2
-autohide_height = 2
-strut_policy = follow_size
-
-# Taskbar
-taskbar_mode = single_desktop
-taskbar_padding = 2 3 2
-taskbar_background_id = 0
-taskbar_active_background_id = 0
-
-# Tasks
-urgent_nb_of_blink = 8
-task_icon = 1
-task_text = 0
-task_centered = 1
-task_maximum_size = 40 20
-task_padding = 6 2
-task_background_id = 3
-task_active_background_id = 2
-task_urgent_background_id = 2
-task_iconified_background_id = 3
-task_tooltip = 0
-
-# Task Icons
-task_icon_asb = 70 0 0
-task_active_icon_asb = 100 0 0
-task_urgent_icon_asb = 100 0 0
-task_iconified_icon_asb = 70 0 0
-
-# Fonts
-task_font = sans 7
-task_font_color = #00eafc 68
-task_active_font_color = #ffffff 83
-task_urgent_font_color = #ffffff 83
-task_iconified_font_color = #ffffff 68
-font_shadow = 0
-
-# System Tray
-systray = 1
-systray_padding = 0 4 5
-systray_sort = ascending
-systray_background_id = 0
-systray_icon_size = 16
-systray_icon_asb = 70 0 0
-
-# Battery
-battery = 1
-battery_low_status = 10
-battery_low_cmd = notify-send "battery low"
-battery_hide = never
-bat1_font = sans 8
-bat2_font = sans 6
-battery_font_color = #ffffff 74
-battery_padding = 1 0
-battery_background_id = 0
-
-# Clock
-time1_format = %H:%M
-time1_font = sans 8
-time2_format = %A %d %B
-time2_font = sans 6
-clock_font_color = #ffffff 74
-clock_padding = 1 0
-clock_background_id = 0
-clock_rclick_command = orage
-
-# Tooltips
-tooltip_padding = 2 2
-tooltip_show_timeout = 0.7
-tooltip_hide_timeout = 0.3
-tooltip_background_id = 1
-tooltip_font = sans 10
-tooltip_font_color = #ffffff 80
-
-# Mouse
-mouse_middle = none
-mouse_right = close
-mouse_scroll_up = toggle
-mouse_scroll_down = iconify
-
-# End of config
diff --git a/wallpaper.jpg b/wallpaper.jpg
deleted file mode 100755
index 0800831..0000000
Binary files a/wallpaper.jpg and /dev/null differ