Drop TraditionalTest for GTK+-3.20 branch

70 files changed, 1 insertions, 8268 deletions

diff --git a/desktop-themes/Makefile.am b/desktop-themes/Makefile.am
index e0485b80..b6f30f48 100644
--- a/desktop-themes/Makefile.am
+++ b/desktop-themes/Makefile.am
@@ -8,8 +8,7 @@ SUBDIRS = \
 	Green-Submarine \
 	Menta \
 	TraditionalGreen \
-	TraditionalOk \
-	TraditionalOkTest
+	TraditionalOk
 
 
 
diff --git a/desktop-themes/TraditionalOkTest/COPYING b/desktop-themes/TraditionalOkTest/COPYING
deleted file mode 100644
index 94a9ed02..00000000
--- a/desktop-themes/TraditionalOkTest/COPYING
+++ /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/desktop-themes/TraditionalOkTest/Makefile.am b/desktop-themes/TraditionalOkTest/Makefile.am
deleted file mode 100644
index dfb0b81f..00000000
--- a/desktop-themes/TraditionalOkTest/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-THEME_NAME=TraditionalOkTest
- 
-themedir = $(datadir)/themes/$(THEME_NAME)
-
-theme_DATA = index.theme
-
-EXTRA_DIST = $(theme_DATA) index.theme.in COPYING
-
-SUBDIRS =		\
-	gtk-2.0		\
-	gtk-3.0		\
-	metacity-1
-
-CLEANFILES = index.theme
-
-index.theme: index.theme.in
-	$(AM_V_GEN)sed \
-		-e s!\@BACKGROUND_DIR\@!$(datadir)/backgrounds/mate/desktop! \
-		< $< > $@
diff --git a/desktop-themes/TraditionalOkTest/gtk-2.0/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-2.0/Makefile.am
deleted file mode 100644
index c9db774b..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-2.0/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-THEME_NAME=TraditionalOkTest
-
-themedir = $(datadir)/themes/$(THEME_NAME)/gtk-2.0
-
-theme_DATA = \
-	applications.rc \
-	gtkrc
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc b/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc
deleted file mode 100755
index 618c4408..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-2.0/applications.rc
+++ /dev/null
@@ -1,72 +0,0 @@
-style "workspace-switcher"
-{
-	bg[SELECTED] = shade (1.0, @selected_bg_color)
-	bg[PRELIGHT] = shade (1.0, @selected_bg_color)
-}
-
-widget "*WnckPager*"	    	    style "workspace-switcher"
-
-# Workaround for the evolution ETable (bug #527532)
-widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
-# Workaround for the evolution ETree
-widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
-
-# Special case the caja-extra-view-widget
-# ToDo: A more generic approach for all applications that have a widget like this.
-widget "*.caja-extra-view-widget" style : highest "caja-location"
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the base color.
-widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
-# GtkCList also uses the fg color to draw text on top of the base colors.
-widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Caja when renaming files, and maybe other places.
-widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
-
-# See the documentation of the style.
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
-
-##########################################################################
-# Chromium.
-##########################################################################
-
-style "chromium_toolbar_button" {
-	engine "clearlooks" {
-		colorize_scrollbar = TRUE
-		reliefstyle = 1
-		menubarstyle = 2
-		toolbarstyle = 1
-		animation = FALSE
-		radius = 3.0
-		style = GUMMY
-
-		# Set a hint to disable backward compatibility fallbacks.
-		hint = "use-hints"
-	}
-}
-
-style "chrome-hacks"
-{
-	ChromeGtkFrame::frame-color = "#f57900"
-	ChromeGtkFrame::frame-gradient-color = "#F77A00"
-	ChromeGtkFrame::frame-gradient-size = 16
-	ChromeGtkFrame::inactive-frame-color = "#dedcda"
-	ChromeGtkFrame::inactive-frame-gradient-color = "#e3e2e0"
-	ChromeGtkFrame::incognito-frame-color = "#AD8156"
-	ChromeGtkFrame::incognito-frame-gradient-color = shade (1.02, "#AD8156")
-	ChromeGtkFrame::incognito-inactive-frame-color = "#d5d3d1"
-	ChromeGtkFrame::incognito-inactive-frame-gradient-color = shade (1.02, "#d5d3d1")
-	ChromeGtkFrame::scrollbar-trough-color = shade (0.9, "#edeceb")
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.05, "#f57900")
-	ChromeGtkFrame::scrollbar-slider-normal-color = "#f57900"
-}
-
-class "ChromeGtkFrame" style "chrome-hacks"
-widget_class "*Chrom*Button*" style "chromium_toolbar_button"
-
diff --git a/desktop-themes/TraditionalOkTest/gtk-2.0/gtkrc b/desktop-themes/TraditionalOkTest/gtk-2.0/gtkrc
deleted file mode 100755
index 76ee5a65..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,408 +0,0 @@
-
-# Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
-
-gtk-color-scheme = "base_color:#babdb6\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#f57900\nselected_fg_color:#ffffff\ntext_color:#000000\nbg_color:#888a85\ntooltip_bg_color:#F5F5B5\nlink_color:#0000ee\nvisited_link_color:#551a8b"
-
-style "default" {
-	xthickness = 1
-	ythickness = 1
-
-	#######################
-	# Style Properties
-	#######################
-	GtkButton::child-displacement-x = 1
-	GtkButton::child-displacement-y = 1
-	GtkButton::default-border = { 0, 0, 0, 0 }
-	GtkButton::image-spacing = 4
-	GtkToolButton::icon-spacing = 4
-
-	GtkCheckButton::indicator-size = 14
-
-	GtkPaned::handle-size = 6
-
-	GtkRange::trough-border = 0
-	GtkRange::slider-width = 15
-	GtkRange::stepper-size = 15
-
-	GtkScale::slider-length = 23
-	GtkScale::trough-side-details = 1
-
-	GtkScrollbar::min-slider-length = 30
-	GtkMenuBar::internal-padding = 0
-	GtkExpander::expander-size = 16
-	GtkToolbar::internal-padding = 1
-	GtkTreeView::expander-size = 14
-	GtkTreeView::vertical-separator = 0
-
-	GtkMenu::horizontal-padding = 0
-	GtkMenu::vertical-padding = 0
-
-	WnckTasklist::fade-overlay-rect = 0
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry::honors-transparent-bg-hint = 1
-
-	GtkEntry::progress-border = { 2, 2, 2, 2 }
-
-	GtkWidget::link-color = @link_color
-	GtkWidget::visited-link-color = @visited_link_color
-
-	####################
-	# Color Definitions
-	####################
-	bg[NORMAL]        = @bg_color
-	bg[PRELIGHT]      = shade (1.02, @bg_color)
-	bg[SELECTED]      = @selected_bg_color
-	bg[INSENSITIVE]   = @bg_color
-	bg[ACTIVE]        = shade (0.9, @bg_color)
-
-	fg[NORMAL]        = @fg_color
-	fg[PRELIGHT]      = @fg_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-	fg[ACTIVE]        = @fg_color
-
-	text[NORMAL]      = @text_color
-	text[PRELIGHT]    = @text_color
-	text[SELECTED]    = @selected_fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-	text[ACTIVE]      = @selected_fg_color
-
-	base[NORMAL]      = @base_color
-	base[PRELIGHT]    = shade (0.95, @bg_color)
-	base[SELECTED]    = @selected_bg_color
-	base[INSENSITIVE] = @bg_color
-	base[ACTIVE]      = shade (0.9, @selected_bg_color)
-
-	engine "clearlooks" {
-		colorize_scrollbar = TRUE
-		reliefstyle = 1
-		menubarstyle = 2
-		toolbarstyle = 1
-		animation = FALSE
-		radius = 3.0
-		style = GUMMY
-
-		# Set a hint to disable backward compatibility fallbacks.
-		hint = "use-hints"
-	}
-}
-
-style "wide" {
-	xthickness = 2
-	ythickness = 2
-}
-
-style "wider" {
-	xthickness = 3
-	ythickness = 3
-}
-
-style "entry" {
-	xthickness = 3
-	ythickness = 3
-
-	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
-	fg[SELECTED] = @text_color
-
-	engine "clearlooks" {
-		focus_color = shade (0.65, @selected_bg_color)
-	}
-}
-
-style "spinbutton" {
-
-	engine "clearlooks" {
-		hint = "spinbutton"
-	}
-}
-
-style "scale" {
-	xthickness = 2
-	ythickness = 2
-
-	engine "clearlooks" {
-		hint = "scale"
-	}
-}
-
-style "vscale" {
-
-	engine "clearlooks" {
-		hint = "vscale"
-	}
-}
-
-style "hscale" {
-
-	engine "clearlooks" {
-		hint = "hscale"
-	}
-}
-
-style "scrollbar" {
-	xthickness = 2
-	ythickness = 2
-
-	engine "clearlooks" {
-		hint = "scrollbar"
-	}
-}
-
-style "hscrollbar" {
-
-	engine "clearlooks" {
-		hint = "hscrollbar"
-	}
-}
-
-style "vscrollbar" {
-
-	engine "clearlooks" {
-		hint = "vscrollbar"
-	}
-}
-
-style "notebook_bg" {
-
-	bg[NORMAL]        = shade (1.02, @bg_color)
-}
-
-style "button" {
-	xthickness = 3
-	ythickness = 3
-
-	bg[NORMAL]        = shade (1.04, @bg_color)
-	bg[PRELIGHT]      = shade (1.06, @bg_color)
-	bg[ACTIVE]        = shade (0.85, @bg_color)
-}
-
-# The color is changed by the notebook_bg style, this style
-# changes the x/ythickness
-style "notebook" {
-	xthickness = 3
-	ythickness = 3
-}
-
-style "statusbar" {
-
-	engine "clearlooks" {
-		hint = "statusbar"
-	}
-}
-
-style "comboboxentry" {
-
-	engine "clearlooks" {
-		# Note:
-		# If you set the appears-as-list option on comboboxes in the theme,
-		# then you should set this hint on the combobox instead.
-		hint = "comboboxentry"
-	}
-}
-
-style "menubar" {
-
-	engine "clearlooks" {
-		hint = "menubar"
-	}
-}
-
-style "menu" {
-	xthickness = 1
-	ythickness = 1
-
-	bg[NORMAL]        = shade (1.08, @bg_color)
-
-	engine "clearlooks" {
-		radius = 0.0
-	}
-}
-
-style "menu_item" {
-	xthickness = 2
-	ythickness = 3
-
-	fg[PRELIGHT]      = @selected_fg_color
-}
-
-# This style is there to modify the separator menu items. The goals are:
-# 1. Get a specific height.
-# 2. The line should go to the edges (ie. no border at the left/right)
-style "separator_menu_item" {
-	xthickness = 1
-	ythickness = 0
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-}
-
-style "frame_title" {
-
-	fg[NORMAL]        = lighter (@fg_color)
-}
-
-style "treeview" {
-
-	engine "clearlooks" {
-		hint = "treeview"
-	}
-}
-
-# The almost useless progress bar style
-style "progressbar" {
-	xthickness = 1
-	ythickness = 1
-
-	fg[PRELIGHT]      = @selected_fg_color
-
-	engine "clearlooks" {
-		# Explicitly set the radius for the progress bars inside menu items.
-		radius = 3.0
-
-		hint = "progressbar"
-	}
-}
-
-# This style is based on the default style, so that the colors from the button
-# style are overriden again.
-style "treeview_header" = "default" {
-	xthickness = 2
-	ythickness = 1
-
-	engine "clearlooks" {
-		hint = "treeview-header"
-	}
-}
-
-style "tooltips" {
-	xthickness = 4
-	ythickness = 4
-
-	bg[NORMAL]        = @tooltip_bg_color
-	fg[NORMAL]        = @tooltip_fg_color
-}
-
-# fix for caja
-
-style "caja-location" {
-
-	bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @bg_color)
-}
-widget "*.caja-extra-view-widget" style : highest "caja-location"
-
-# Wrokaroudn style for places where the text color is used instead of the fg color.
-style "text_is_fg_color_workaround" {
-
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-style "menuitem_text_is_fg_color_workaround" {
-
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @selected_fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-
-	fg[NORMAL]        = @text_color
-	fg[PRELIGHT]      = @text_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[ACTIVE]        = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-}
-
-# Style to set the toolbar to use a flat style. This is because the "New" button in
-# Evolution is not drawn transparent. So if there is a gradient in the background it will
-# look really wrong.
-# See http://bugzilla.gnome.org/show_bug.cgi?id=446953.
-style "evo_new_button_workaround" {
-
-	engine "clearlooks" {
-		toolbarstyle = 0
-	}
-}
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# The default style is applied to every widget
-class "GtkWidget" style "default"
-
-class "GtkSeparator" style "wide"
-class "GtkFrame" style "wide"
-class "GtkCalendar" style "wide"
-class "GtkEntry" style "entry"
-
-class "GtkSpinButton" style "spinbutton"
-class "GtkScale" style "scale"
-class "GtkVScale" style "vscale"
-class "GtkHScale" style "hscale"
-class "GtkScrollbar" style "scrollbar"
-class "GtkHScrollbar" style "hscrollbar"
-class "GtkVScrollbar" style "vscrollbar"
-
-# General matching follows. The order is choosen so that the right styles override
-# each other. EG. progressbar needs to be more important than the menu match.
-widget_class "*<GtkNotebook>" style "notebook_bg"
-# This is not perfect, it could be done better.
-# (That is modify *every* widget in the notebook, and change those back that
-# we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "notebook_bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "notebook_bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg"
-widget_class "*<GtkNotebook>*<GtkViewport>" style "notebook_bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "notebook_bg"
-
-widget_class "*<GtkButton>" style "button"
-widget_class "*<GtkNotebook>" style "notebook"
-widget_class "*<GtkStatusbar>*" style "statusbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "comboboxentry"
-widget_class "*<GtkCombo>*" style "comboboxentry"
-
-widget_class "*<GtkMenuBar>*" style "menubar"
-widget_class "*<GtkMenu>*" style "menu"
-widget_class "*<GtkMenuItem>*" style "menu_item"
-widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "frame_title"
-widget_class "*.<GtkTreeView>*" style "treeview"
-
-widget_class "*<GtkProgress>" style "progressbar"
-
-# Treeview headers (and similar stock GTK+ widgets)
-widget_class "*.<GtkTreeView>.<GtkButton>" style "treeview_header"
-widget_class "*.<GtkCTree>.<GtkButton>" style "treeview_header"
-widget_class "*.<GtkList>.<GtkButton>" style "treeview_header"
-widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header"
-
-# The window of the tooltip is called "gtk-tooltip"
-##################################################################
-# FIXME:
-# This will not work if one embeds eg. a button into the tooltip.
-# As far as I can tell right now we will need to rework the theme
-# quite a bit to get this working correctly.
-# (It will involve setting different priorities, etc.)
-##################################################################
-widget "gtk-tooltip*" style "tooltips"
-
-##########################################################################
-# Following are special cases and workarounds for issues in applications.
-##########################################################################
-
-include "applications.rc"
-
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
deleted file mode 100644
index 34fd0534..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-THEME_NAME=TraditionalOkTest
-
-themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0
-
-theme_DATA = \
-	applications.css \
-	gtk.css \
-	gtk-widgets.css \
-	gtk-widgets-img.css \
-	mate-applications.css \
-	other-applications.css \
-	settings.ini
-
-EXTRA_DIST = $(theme_DATA)
-
-SUBDIRS = img
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
deleted file mode 100755
index ae69728b..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/applications.css
+++ /dev/null
@@ -1,193 +0,0 @@
-/************
- * Nautilus *
- ************/
-
-/*
-.nautilus-desktop.nautilus-canvas-item {
-	color: @theme_base_color;
-	text-shadow: 1 1 alpha (@theme_fg_color, 0.8);
-}
-
-.nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:prelight,
-.nautilus-desktop.nautilus-canvas-item:selected {
-	text-shadow: none;
-}
-*/
-
-.nautilus-desktop .entry {
-	background-image: none;
-	border-image: none;
-}
-
-NautilusToolbar .linked.raised GtkToggleButton.button:first-child,
-NautilusToolbar .linked.raised GtkToggleButton.button:first-child:active:hover {
-	border-right-width: 1px;
-}
-
-
-/************
- * Nemo *
- ************/
-
-/*
-.nemo-desktop.nemo-canvas-item {
-	color: @theme_base_color;
-	text-shadow: 1 1 alpha (@theme_fg_color, 0.8);
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-*/
-
-.nemo-desktop .entry {
-	background-image: none;
-	border-image: none;
-}
-
-NemoToolbar .linked.raised GtkToggleButton.button:first-child,
-NemoToolbar .linked.raised GtkToggleButton.button:first-child:active:hover {
-	border-right-width: 1px;
-}
-
-
-/*********
- * gedit *
- *********/
-
-GeditMenuStackSwitcher.button.flat {
-	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.gedit-side-panel-paned,
-.gedit-bottom-panel-paned,
-.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical {
-	border-style: solid;
-	border-color: @toolbar_border_top_color;
-}
-
-.gedit-side-panel-paned {
-	border-width: 0px 1px 0px 0px;
-}
-
-.gedit-bottom-panel-paned {
-	border-width: 1px 0px 0px 0px;
-}
-
-.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical {
-	border-width: 1px;
-}
-
-.gedit-menu-stack-switcher {
-	padding: 15px 15px 2px 15px;
-}
-
-GeditMultiNotebook .notebook {
-	border-width: 0px 0px 1px 1px;
-}
-
-GeditViewFrame .gedit-search-slider {
-	padding: 4px;
-	border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-}
-
-.gedit-search-entry-occurrences-tag {
-	color: @theme_text_color;
-	background-color: @theme_bg_color;
-	margin: 2px 0px 2px 2px;
-	padding: 2px;
-}
-
-GeditStatusbar .frame.flat {
-	border: none;
-}
-
-/**********
- * evince *
- **********/
-
-EvPageActionWidget .linked .entry:first-child {
-	border-right-width: 0px;
-}
-
-/*******************
- * gnome-documents *
- *******************/
-
-.documents-scrolledwin.frame {
-	border-width: 1px 0 0 0;
-	border-radius: 0;
-}
-
-.documents-main-view.view {
-	background-color: @theme_base_color;
-}
-
-GtkIconView.documents-main-view.check {
-	background-repeat: no-repeat;
-	background-position: center;
-	background-color: @theme_base_color;
-}
-
-.documents-selection-mode.toolbar {
-	border-width: 0;
-}
-
-.documents-selection-mode.toolbar .dim-label {
-	color: @theme_fg_color;
-}
-
-.documents-icon-bg {
-	background-color: @switch_trough_active_gradient_a;
-	border-radius: 3px;
-	color: @theme_base_color;
-}
-
-.documents-collection-icon {
-	background-color: @theme_bg_color;
-	border-radius: 3px;
-}
-
-/******************
- * gnome-terminal *
- ******************/
-
-TerminalScreen {
-	background-color: @theme_base_color;
-	color: @theme_fg_color;
-}
-
-/*********
- * Unity *
- *********/
-
-UnityPanelWidget,
-.unity-panel {
-	background-image: none;
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-	border-width: 0;
-}
-
-.unity-panel.menubar.menuitem:hover {
-	background-color: @menu_bg_color;
-	border-style: solid;
-	border-width: 1px 1px 0px;
-	border-color: @menubar_menuitem_hover_border_color;
-	border-radius: 3px 3px 0 0;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_menuitem_hover_gradient_a),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
-	                  to (@menubar_menuitem_hover_gradient_d));
-}
-
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css
deleted file mode 100644
index 5ad30827..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets-img.css
+++ /dev/null
@@ -1,915 +0,0 @@
-/**********
- * Assets *
- **********/
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch.slider {
-	background-image: linear-gradient(to bottom,
-	                      alpha (@switch_slider_gradient_a, 0.5),
-	                      alpha (@switch_slider_gradient_b, 0.5) 50%,
-	                      alpha (@switch_slider_gradient_c, 0.5) 50%,
-	                      alpha (@switch_slider_gradient_d, 0.5)),
-	                  url("img/slider-horz-grip.png");
-	background-repeat: no-repeat;
-	background-position: center center;
-}
-
-GtkSwitch.slider:insensitive {
-	background-image: linear-gradient(to bottom,
-	                      alpha (@switch_slider_insensitive_gradient_a, 0.8),
-	                      alpha (@switch_slider_insensitive_gradient_b, 0.8) 50%,
-	                      alpha (@switch_slider_insensitive_gradient_c, 0.8) 50%,
-	                      alpha (@switch_slider_insensitive_gradient_d, 0.8)),
-	                  url("img/slider-horz-grip.png");
-}
-
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-image: url("img/resize-grip.png");
-}
-
-/*************
- * Scrollbar *
- *************/
-
-.scrollbar.slider {
-	background-repeat: no-repeat;
-	background-position: center center;
-}
-
-.scrollbar.slider.vertical {
-	background-image: linear-gradient(to right,
-	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
-	                      alpha (@scrollbar_slider_gradient_a, 0.5) 1px,
-	                      alpha (@scrollbar_slider_gradient_b, 0.5) 50%,
-	                      alpha (@scrollbar_slider_gradient_c, 0.5) 50%,
-	                      alpha (@scrollbar_slider_gradient_d, 0.5) 95%,
-	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
-	                  url("img/slider-vert-grip.png");
-}
-
-.scrollbar.slider.horizontal {
-	background-image: linear-gradient(to bottom,
-	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
-	                      alpha (@scrollbar_slider_gradient_a, 0.5) 1px,
-	                      alpha (@scrollbar_slider_gradient_b, 0.5) 50%,
-	                      alpha (@scrollbar_slider_gradient_c, 0.5) 50%,
-	                      alpha (@scrollbar_slider_gradient_d, 0.5) 95%,
-	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
-	                  url("img/slider-horz-grip.png");
-}
-
-.scrollbar.slider.vertical:hover {
-	background-image: linear-gradient(to right,
-	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
-	                      alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px,
-	                      alpha (@scrollbar_slider_hover_gradient_b, 0.5) 50%,
-	                      alpha (@scrollbar_slider_hover_gradient_c, 0.5) 50%,
-	                      alpha (@scrollbar_slider_hover_gradient_d, 0.5) 95%,
-	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
-	                  url("img/slider-vert-grip.png");
-}
-
-.scrollbar.slider.horizontal:hover {
-	background-image: linear-gradient(to bottom,
-	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
-	                      alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px,
-	                      alpha (@scrollbar_slider_hover_gradient_b, 0.5) 50%,
-	                      alpha (@scrollbar_slider_hover_gradient_c, 0.5) 50%,
-	                      alpha (@scrollbar_slider_hover_gradient_d, 0.5) 95%,
-	                      alpha (@scrollbar_slider_inner_border_color, 0.5)),
-	                  url("img/slider-horz-grip.png");
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-.check,
-.check row:selected,
-.check row:selected:focus {
-	-gtk-icon-source: url("img/checkbox-unchecked.png");
-}
-
-.check:hover,
-.check row:selected:hover,
-.check row:selected:focus:hover {
-	-gtk-icon-source: url("img/checkbox-unchecked-hover.png");
-}
-
-.check:insensitive,
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
-	-gtk-icon-source: url("img/checkbox-unchecked-insensitive.png");
-}
-
-.check:checked,
-.check row:selected:checked,
-.check row:selected:focus:checked,
-.check:active,
-.check row:selected:active,
-.check row:selected:focus:active {
-	-gtk-icon-source: url("img/checkbox-checked.png");
-}
-
-.check:checked:hover,
-.check row:selected:checked:hover,
-.check row:selected:focus:checked:hover,
-.check:active:hover,
-.check row:selected:active:hover,
-.check row:selected:focus:active:hover {
-	-gtk-icon-source: url("img/checkbox-checked-hover.png");
-}
-
-.check:checked:insensitive,
-.check row:selected:checked:insensitive,
-.check row:selected:focus:checked:insensitive,
-.check:active:insensitive,
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
-	-gtk-icon-source: url("img/checkbox-checked-insensitive.png");
-}
-
-.check:inconsistent,
-.check row:selected:inconsistent,
-.check row:selected:focus:inconsistent {
-	-gtk-icon-source: url("img/checkbox-mixed.png");
-}
-
-.check:inconsistent:hover,
-.check row:selected:inconsistent:hover,
-.check row:selected:focus:inconsistent:hover {
-	-gtk-icon-source: url("img/checkbox-mixed-hover.png");
-}
-
-.check:inconsistent:insensitive,
-.check row:selected:inconsistent:insensitive,
-.check row:selected:focus:inconsistent:insensitive {
-	-gtk-icon-source: url("img/checkbox-mixed-insensitive.png");
-}
-
-.radio,
-.radio row:selected,
-.radio row:selected:focus {
-	-gtk-icon-source: url("img/radio-unchecked.png");
-}
-
-.radio:hover,
-.radio row:selected:hover,
-.radio row:selected:focus:hover {
-	-gtk-icon-source: url("img/radio-unchecked-hover.png");
-}
-
-.radio:insensitive,
-.radio row:selected:insensitive,
-.radio row:selected:focus:insensitive {
-	-gtk-icon-source: url("img/radio-unchecked-insensitive.png");
-}
-
-.radio:checked,
-.radio row:selected:checked,
-.radio row:selected:focus:checked,
-.radio:active,
-.radio row:selected:active,
-.radio row:selected:focus:active {
-	-gtk-icon-source: url("img/radio-checked.png");
-}
-
-.radio:checked:hover,
-.radio row:selected:checked:hover,
-.radio row:selected:focus:checked:hover,
-.radio:active:hover,
-.radio row:selected:active:hover,
-.radio row:selected:focus:active:hover {
-	-gtk-icon-source: url("img/radio-checked-hover.png");
-}
-
-.radio:checked:insensitive,
-.radio row:selected:checked:insensitive,
-.radio row:selected:focus:checked:insensitive,
-.radio:active:insensitive,
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
-	-gtk-icon-source: url("img/radio-checked-insensitive.png");
-}
-
-.radio:inconsistent,
-.radio row:selected:inconsistent,
-.radio row:selected:focus:inconsistent {
-	-gtk-icon-source: url("img/radio-mixed.png");
-}
-
-.radio:inconsistent:hover,
-.radio row:selected:inconsistent:hover,
-.radio row:selected:focus:inconsistent:hover {
-	-gtk-icon-source: url("img/radio-mixed-hover.png");
-}
-
-.radio:inconsistent:insensitive,
-.radio row:selected:inconsistent:insensitive,
-.radio row:selected:focus:inconsistent:insensitive {
-	-gtk-icon-source: url("img/radio-mixed-insensitive.png");
-}
-
-/*********************
- * GtkScale's slider *
- *********************/
- 
-GtkScale.slider,
-GtkScale.slider.horizontal {
-	background-image: url("img/scale-slider-horz.png");
-}
-
-GtkScale.slider:hover,
-GtkScale.slider.horizontal:hover {
-	background-image: url("img/scale-slider-horz-hover.png");
-}
-
-GtkScale.slider:insensitive,
-GtkScale.slider.horizontal:insensitive {
-	background-image: url("img/scale-slider-horz-insensitive.png");
-}
-
-GtkScale.slider.vertical {
-	background-image: url("img/scale-slider-vert.png");
-}
-
-GtkScale.slider.vertical:hover {
-	background-image: url("img/scale-slider-vert-hover.png");
-}
-
-GtkScale.slider.vertical:insensitive {
-	background-image: url("img/scale-slider-vert-insensitive.png");
-}
-
-GtkScale.scale-has-marks-above.slider.horizontal {
-	background-image: url("img/scale-slider-horz.png");
-}
-
-GtkScale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("img/scale-slider-horz-hover.png");
-}
-
-GtkScale.scale-has-marks-above.slider.horizontal:insensitive {
-	background-image: url("img/scale-slider-horz-insensitive.png");
-}
-
-GtkScale.scale-has-marks-above.slider.vertical {
-	background-image: url("img/scale-slider-vert.png");
-}
-
-GtkScale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("img/scale-slider-vert-hover.png");
-}
-
-GtkScale.scale-has-marks-above.slider.vertical:insensitive {
-	background-image: url("img/scale-slider-vert-insensitive.png");
-}
-
-GtkScale.scale-has-marks-below.slider.horizontal {
-	background-image: url("img/scale-slider-horz.png");
-}
-
-GtkScale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("img/scale-slider-horz-hover.png");
-}
-
-GtkScale.scale-has-marks-below.slider.horizontal:insensitive {
-	background-image: url("img/scale-slider-horz-insensitive.png");
-}
-
-GtkScale.scale-has-marks-below.slider.vertical {
-	background-image: url("img/scale-slider-vert.png");
-}
-
-GtkScale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("img/scale-slider-vert-hover.png");
-}
-
-GtkScale.scale-has-marks-below.slider.vertical:insensitive {
-	background-image: url("img/scale-slider-vert-insensitive.png");
-}
-
-/*********
- * Menus *
- *********/
-
-.menu .menuitem.check {
-	-gtk-icon-source: url("img/menuitem-checkbox.png");
-}
-
-.menu .menuitem.check:hover {
-	-gtk-icon-source: url("img/menuitem-checkbox-hover.png");
-}
-
-.menu .menuitem.check:insensitive {
-	-gtk-icon-source: url("img/menuitem-checkbox-insensitive.png");
-}
-
-.menu .menuitem.check:checked,
-.menu .menuitem.check:active {
-	-gtk-icon-source: url("img/menuitem-checkbox-checked.png");
-}
-
-.menu .menuitem.check:checked:hover,
-.menu .menuitem.check:active:hover {
-	-gtk-icon-source: url("img/menuitem-checkbox-checked-hover.png");
-}
-
-.menu .menuitem.check:checked:insensitive,
-.menu .menuitem.check:active:insensitive {
-	-gtk-icon-source: url("img/menuitem-checkbox-checked-insensitive.png");
-}
-
-.menu .menuitem.check:inconsistent,
-.menu .menuitem.radio:inconsistent {
-	-gtk-icon-source: url("img/menuitem-checkbox-mixed.png");
-}
-
-.menu .menuitem.check:inconsistent:hover,
-.menu .menuitem.radio:inconsistent:hover {
-	-gtk-icon-source: url("img/menuitem-checkbox-mixed-hover.png");
-}
-
-.menu .menuitem.check:inconsistent:insensitive,
-.menu .menuitem.radio:inconsistent:insensitive {
-	-gtk-icon-source: url("img/menuitem-checkbox-mixed-insensitive.png");
-}
-
-.menu .menuitem.radio {
-	-gtk-icon-source: url("img/menuitem-radio.png");
-}
-
-.menu .menuitem.radio:hover {
-	-gtk-icon-source: url("img/menuitem-radio-hover.png");
-}
-
-.menu .menuitem.radio:insensitive {
-	-gtk-icon-source: url("img/menuitem-radio-insensitive.png");
-}
-
-.menu .menuitem.radio:checked,
-.menu .menuitem.radio:active {
-	-gtk-icon-source: url("img/menuitem-radio-checked.png");
-}
-
-.menu .menuitem.radio:checked:hover,
-.menu .menuitem.radio:active:hover {
-	-gtk-icon-source: url("img/menuitem-radio-checked-hover.png");
-}
-
-.menu .menuitem.radio:checked:insensitive,
-.menu .menuitem.radio:active:insensitive {
-	-gtk-icon-source: url("img/menuitem-radio-checked-insensitive.png");
-}
-
-/*********
- * Panes *
- *********/
-
-.pane-separator {
-	background-image: url("img/pane-separator-grip-horz.png");
-}
-
-.pane-separator.vertical {
-	background-image: url("img/pane-separator-grip-vert.png");
-}
-
-/***********
- * Borders *
- ***********/
-
-/* generic element borders */
-.entry,
-.combobox-entry .entry,
-.combobox-entry .button,
-.button:active,
-.trough,
-.trough.highlight,
-GtkSwitch.trough,
-/* generic button borders */
-.button,
-.button.flat:active,
-.button.flat:hover,
-.menu-button:active,
-.titlebar .titlebutton:hover,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.primary-toolbar GtkComboBox .button,
-/* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar .combobox-entry .entry,
-.primary-toolbar .combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkComboBox .button:active,
-.primary-toolbar GtkComboBox .button:insensitive,
-/* primary toolbar - hover button borders */
-.primary-toolbar .button:hover {
-	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.primary-toolbar .entry,
-.primary-toolbar .combobox-entry .entry {
-	border-width: 1px 2px 2px;
-}
-
-.primary-toolbar .entry:focus,
-.primary-toolbar .combobox-entry .entry:focus {
-	border-width: 1px 2px 2px;
-}
-
-/* Linked single button */
-.linked .entry:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:focus:only-child,
-.linked .button:focus:active:only-child,
-.linked .button:insensitive:only-child,
-/* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:focus,
-.linked.vertical .button:focus:active,
-.linked.vertical .button:insensitive,
-/* 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:focus:first-child,
-.linked.vertical .button:focus:active:first-child,
-.linked.vertical .button:insensitive:first-child,
-/* 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:focus:last-child,
-.linked.vertical .button:focus:active:last-child,
-.linked.vertical .button:insensitive:last-child,
-/* 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:focus:only-child,
-.linked.vertical .button:focus:active:only-child,
-.linked.vertical .button:insensitive:only-child,
-/* Linked buttons on primary toolbars */
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:focus,
-.primary-toolbar .button.raised.linked:focus:active,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button,
-.primary-toolbar .raised.linked .button:active,
-.primary-toolbar .raised.linked .button:focus,
-.primary-toolbar .raised.linked .button:focus:active,
-.primary-toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:focus,
-.inline-toolbar.toolbar .button:focus:active,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button,
-.inline-toolbar.toolbar GtkToolButton .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:focus,
-.inline-toolbar.toolbar GtkToolButton .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive,
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:focus:first-child,
-.primary-toolbar .button.raised.linked:focus:active:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .raised.linked .button:first-child,
-.primary-toolbar .raised.linked .button:active:first-child,
-.primary-toolbar .raised.linked .button:focus:first-child,
-.primary-toolbar .raised.linked .button:focus:active:first-child,
-.primary-toolbar .raised.linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:focus:first-child,
-.inline-toolbar.toolbar .button:focus:active:first-child,
-.inline-toolbar.toolbar .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child .button,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive,
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:focus:last-child,
-.primary-toolbar .button.raised.linked:focus:active:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .raised.linked .button:last-child,
-.primary-toolbar .raised.linked .button:active:last-child,
-.primary-toolbar .raised.linked .button:focus:last-child,
-.primary-toolbar .raised.linked .button:focus:active:last-child,
-.primary-toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:focus:last-child,
-.inline-toolbar.toolbar .button:focus:active:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child .button,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:focus:only-child,
-.inline-toolbar.toolbar .button:focus:active:only-child,
-.inline-toolbar.toolbar .button:insensitive:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child .button,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive {
-	border-image: url("img/border-inline-button.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* generic insensitive element borders */
-GtkSwitch.trough:insensitive,
-.combobox-entry .entry:insensitive,
-.combobox-entry .button:insensitive,
-.entry:insensitive,
-.button:insensitive,
-.trough row {
-	border-image: url("img/border-insensitive.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.menuitem.button.flat,
-.button.flat,
-.button.flat:insensitive,
-GtkListBoxRow.button.list-row,
-GtkListBoxRow.button.list-row:hover {
-    border-image: none;
-    background-image: none;
-}
-
-/* focused element borders */
-.entry:focus,
-.combobox-entry .entry:focus,
-.button.flat:focus:active,
-.button:focus:active,
-.button.default:active,
-/* focused button borders */
-.button.flat:focus,
-.button.default,
-.primary-toolbar .entry:focus,
-.primary-toolbar .button:active:focus,
-.primary-toolbar .button:focus:hover,
-.primary-toolbar .combobox-entry .entry:focus,
-.primary-toolbar .combobox-entry .button:focus,
-.primary-toolbar .button.raised:focus:active,
-.primary-toolbar .raised .button:focus:active,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.primary-toolbar GtkComboBox .button:active:focus,
-.primary-toolbar .button.raised:focus,
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button:focus,
-.primary-toolbar .raised .button.default,
-.primary-toolbar GtkComboBox .button:focus {
-	border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused primary toolbar button borders */
-.primary-toolbar .button:focus {
-	border-image: url("img/border-focused-ptb.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused switch trough borders */
-GtkSwitch.trough:active {
-	border-image: url("img/border-focused-switch.svg") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover
-column-header.button:active:focus,
-column-header .button:active:focus {
-	border-image: none;
-	border-width: 1px;
-	border-radius: 0;
-	border-style: solid;
-	border-color: @column_header_border_top_color @column_header_border_right_color
-	              @column_header_border_bottom_color @column_header_border_left_color;
-
-}
-
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:focus,
-column-header:last-child .button:focus,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:active:focus,
-column-header:last-child .button:active:focus {
-	border-right: none;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked > GtkComboBox:first-child > .button:last-child,
-.linked > GtkComboBox:first-child > .button:active:last-child,
-.linked > GtkComboBox:first-child > .button:active:hover:last-child,
-.linked > GtkComboBox:first-child > .button:focus:last-child,
-.linked > GtkComboBox:first-child > .button:focus:active:last-child,
-.linked > GtkComboBox:first-child > .button:insensitive:last-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:focus:first-child,
-.linked .button:focus:active:first-child,
-.linked .button:insensitive:first-child {
-    border-image: none;
-    border-radius: 3px 0 0 3px;
-    border-color: @border_color;
-    border-width: 1px;
-    padding: 1px 2px;
-}
-
-.linked .entry:first-child {
-    padding: 6px;
-}
-
-/* Middle button */
-.linked .entry,
-.linked > GtkComboBox > .button:last-child,
-.linked > GtkComboBox > .button:active:last-child,
-.linked > GtkComboBox > .button:active:hover:last-child,
-.linked > GtkComboBox > .button:focus:last-child,
-.linked > GtkComboBox > .button:focus:active:last-child,
-.linked > GtkComboBox > .button:insensitive:last-child,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:focus,
-.linked .button:focus:active,
-.linked .button:insensitive {
-    border-image: none;
-	border-radius: 0;
-    border-color: @border_color;
-    border-width: 1px 0;
-    padding: 1px 2px;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked > GtkComboBox:last-child > .button,
-.linked > GtkComboBox:last-child > .button:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:focus:last-child,
-.linked .button:focus:active:last-child,
-.linked .button:insensitive:last-child {
-    border-image: none;
-	border-radius: 0 3px 3px 0;
-    border-color: @border_color;
-    border-width: 1px;
-    padding: 1px 2px;
-}
-
-.linked .entry:last-child {
-    padding: 6px;
-}
-
-/* vertical */
-
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:active,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:active:hover,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:checked,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:checked:hover,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:focus,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:focus:active,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:focus:checked,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:insensitive {
-    border-image: none;
-    border-radius: 3px 3px 3px 3px;
-    border-color: @border_color;
-    border-width: 1px 1px 1px 1px;
-    padding: 4px 5px;
-}
-
-.vertical .horizontal .vertical .frame .horizontal .vertical.toolbar .button.flat.image-button,
-.vertical .horizontal .vertical .frame .horizontal .vertical.toolbar .button.flat.image-button:focus {
-    background-image: none;
-    border-style: none;
-    border-radius: 3px;
-    border-width: 1px 1px 1px 1px;
-    border-color: @theme_bg_color;
-    border-image: none;
-    padding: 6px;
-    box-shadow: none;
-}
-
-.vertical .horizontal .vertical .frame .horizontal .vertical.toolbar .button.flat.image-button:hover,
-.vertical .horizontal .vertical .frame .horizontal .vertical.toolbar .button.flat.image-button:focus:hover {
-    background-image: linear-gradient(to bottom,
-                                      @button_hover_gradient_a 5%,
-                                      @button_hover_gradient_b 95%,
-                                      @button_hover_gradient_c);
-    border-image: none;
-    border-radius: 3px;
-    border-width: 1px 1px 1px 1px;
-    border-style: solid;
-    border-color: @border_color;
-    padding: 5px;
-}
-
-/* Middle button */
-
-.linked.vertical > GtkComboBox > .button:last-child,
-.linked.vertical > GtkComboBox > .button:active:last-child,
-.linked.vertical > GtkComboBox > .button:active:hover:last-child,
-.linked.vertical > GtkComboBox > .button:focus:last-child,
-.linked.vertical > GtkComboBox > .button:focus:active:last-child,
-.linked.vertical > GtkComboBox > .button:insensitive:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:hover,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:active,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:insensitive {
-    border-image: none;
-    border-radius: 0;
-    border-color: @border_color;
-    border-width: 0px 1px 0px 1px;
-    padding: 5px 5px;
-}
-
-/* top button */
-
-.linked.vertical > GtkComboBox:first-child > .button:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:active:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:active:hover:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:checked:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:checked:hover:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:focus:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:focus:active:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:focus:checked:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:insensitive:last-child {
-    border-image: none;
-    border-radius: 3px 3px 0px 0px;
-    border-color: @border_color;
-    border-width: 1px 1px 1px 1px;
-    padding: 5px 5px;
-}
-
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:hover:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:checked:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:checked:hover:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:active:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:checked:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:insensitive:first-child {
-    border-image: none;
-    border-radius: 3px 3px 0px 0px;
-    border-color: @border_color;
-    border-width: 1px 1px 0px 1px;
-    padding: 5px 5px;
-}
-
-/* bottom button */
-
-.linked.vertical > GtkComboBox:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:focus:last-child,
-.linked.vertical .button:focus:active:last-child,
-.linked.vertical .button:insensitive:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:hover:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:active:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:insensitive:last-child {
-    border-image: none;
-    border-radius: 0px 0px 3px 3px;
-    border-color: @border_color;
-    border-width: 0px 1px 1px 1px;
-    padding: 5px 5px;
-}
-
-/* vertical linked spinbutton */
-
-.linked.vertical .horizontal.entry.spinbutton {
-    border-image: none;
-    border-color: @border_color;
-    border-radius: 0px;
-    border-width: 0px 1px 1px 1px;
-    padding: 4px 5px;
-    background-image: none;
-}
-
-.linked.vertical .horizontal.entry.spinbutton  .button,
-.linked.vertical .horizontal.entry.spinbutton  .button:hover,
-.linked.vertical .horizontal.entry.spinbutton  .button:focus,
-.linked.vertical .horizontal.entry.spinbutton  .button:active,
-.linked.vertical .horizontal.entry.spinbutton  .button:checked,
-.linked.vertical .horizontal.entry.spinbutton  .button:active:hover,
-.linked.vertical .horizontal.entry.spinbutton  .button:checked:hover,
-.linked.vertical .horizontal.entry.spinbutton  .button:insensitive {
-    border-image: none;
-    border-color: @border_color;
-    border-radius: 0px;
-    border-width: 0px 1px 0px 1px;
-}
-
-.linked.vertical .horizontal.entry.spinbutton  .button:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:hover:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:focus:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:active:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:checked:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:active:hover:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:checked:hover:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:insensitive:last-child {
-    border-width: 0px 0px 0px 0px;
-}
-
-/* Dialog Action Area */
-
-/* Leftmost button */
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:focus:first-child,
-.dialog-action-area.linked .button:focus:active:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-/* Middle button */
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:focus,
-.dialog-action-area.linked .button:focus:active,
-.dialog-action-area.linked .button:insensitive,
-/* Rightmost button */
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:focus:last-child,
-.dialog-action-area.linked .button:focus:active:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-radius: 3px;
-	border-width: 1px;
-}
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
deleted file mode 100644
index 78e3c7c9..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk-widgets.css
+++ /dev/null
@@ -1,3065 +0,0 @@
-* {
-	engine: none;
-	padding: 0;
-
-	background-clip: padding-box;
-
-	-GtkToolButton-icon-spacing: 4;
-
-	-GtkTextView-error-underline-color: @error_color;
-
-	-GtkPaned-handle-size: 5;
-
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 10;
-
-	-GtkScrolledWindow-scrollbar-spacing: 3;
-	-GtkScrolledWindow-scrollbars-within-bevel: 0;
-
-	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 14;
-
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-
-	-GtkIMHtml-hyperlink-color: @link_color;
-	-GtkHTML-link-color: @link_color;
-
-	-WnckTasklist-fade-overlay-rect: 0;
-
-	-GtkWidget-focus-padding: 2;
-    /* disable focusline on active notebook tabs if focused*/
-    -GtkWidget-focus-line-width: 0;
-	outline-color: @focus_border_color;
-	outline-style: dashed;
-	outline-offset: -2px;
-	outline-width: 0px; /* disable ugly focus-line */
-	outline-radius: 2px;
-	-gtk-icon-style: regular; /* disable symbolic icons */
-	-GtkWindow-resize-grip-width: 11;
-	-GtkWindow-resize-grip-height: 11;
-}
-
-/***************
- * Base States *
- ***************/
-
-GtkWindow {
-	color: @theme_fg_color;
-}
-
-.background {
-	color: @theme_fg_color;
-	background-color: @theme_bg_color;
-}
-
-*:selected,
-*:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-*:insensitive {
-	background-color: @insensitive_bg_color;
-	color: @insensitive_fg_color;
-	text-shadow: 1px 1px @insensitive_text_shadow_color;
-	border-color: @insensitive_border_color;
-}
-
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
-GtkGrid,
-GtkGrid:insensitive {
-	background-color: transparent;
-}
-
-/************
- * Tooltips *
- ************/
-.tooltip,
-.tooltip.background {
-	padding: 4px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: @theme_tooltip_border_color;
-	border-radius: 0px;
-	background-color: @theme_tooltip_bg_color;
-	color: @theme_tooltip_fg_color;
-}
-
-.tooltip * {
-	background-color: transparent;
-}
-
-/*********************
- * Spinner Animation *
- *********************/
-/* This is could be CPU-intensive */
-
-@keyframes spin {
-	to { -gtk-icon-transform: rotate(1turn); }
-}
-
-.spinner {
-	background-image: none;
-	background-color: blue;
-	opacity: 0;
-	-gtk-icon-source: -gtk-icontheme("process-working-symbolic");
-}
-
-.spinner:active {
-	opacity: 1;
-	animation: spin 1s linear infinite; }
-.spinner:active:insensitive {
-	opacity: 0.5;
-}
-
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-
-/*****************
- * Miscellaneous *
- *****************/
-
-.floating-bar {
-	background-image: linear-gradient(
-	                  to bottom,
-	                  @theme_base_color 20%,
-	                  shade(@theme_base_color, 0.9));
-	background-color: @theme_base_color;
-	border-color: @border_color;
-	border-radius: 3px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-.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-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar .button {
-	background-color: alpha (@theme_base_color, 0.0);
-	background-image: none;
-	border-style: none;
-	border-image: none;
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-.view.rubberband,
-.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-	border-color: @theme_selected_bg_color;
-	border-style: solid;
-	border-width: 1px;
-	border-radius: 2px;
-}
-
-GtkStatusbar .label,
-GtkStatusbar .frame.flat {
-	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
-	font-size: smaller;
-}
-
-GtkStatusbar .frame.flat {
-	padding: 2px 0px;
-	border-width: 0;
-}
-
-GtkStatusbar .frame.flat .button.flat {
-	padding: 2px 0px 0px 0px;
-}
-
-.dnd {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @theme_selected_bg_color;
-	border-radius: 0;
-}
-
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
-	color: shade(@border_color, 1.30);
-}
-
-.pane-separator,
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_bg_color;
-	background-color: @theme_bg_color;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-/************************
- * overshoot/undershoot *
- ************************/
-
-/* displays at end of mouse scrolling */
-.overshoot.top {
-    background-image: -gtk-gradient(radial,
-                                    center top, 0,
-                                    center top, 0.5,
-                                    to(@overshoot_bg_color),
-                                    to(rgba(137, 158, 179, 0))),
-                      -gtk-gradient(radial,
-                                    center top, 0,
-                                    center top, 0.6,
-                                    from(rgba(56, 73, 87, 0.17)),
-                                    to(rgba(56, 73, 87, 0)));
-    background-size: 100% 20%, 100% 100%;
-    background-repeat: no-repeat;
-    background-position: center top;
-    background-color: transparent;
-    border-style: none;
-    box-shadow: none;
-}
-
-.overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial,
-                                    center top, 0,
-                                    center top, 0.5,
-                                    to(@overshoot_backdrop_bg_color),
-                                    to(rgba(131, 137, 145, 0)));
-    background-size: 100% 20%;
-    background-repeat: no-repeat;
-    background-position: center top;
-    background-color: transparent;
-    border-style: none;
-    box-shadow: none;
-}
-
-.overshoot.bottom {
-    background-image: -gtk-gradient(radial,
-                                    center bottom, 0,
-                                    center bottom, 0.5,
-                                    to(@overshoot_bg_color),
-                                    to(rgba(137, 158, 179, 0))),
-                      -gtk-gradient(radial,
-                                    center bottom, 0,
-                                    center bottom, 0.6,
-                                    from(rgba(56, 73, 87, 0.17)),
-                                    to(rgba(56, 73, 87, 0)));
-    background-size: 100% 20%, 100% 100%;
-    background-repeat: no-repeat;
-    background-position: center bottom;
-    background-color: transparent;
-    border-style: none;
-    box-shadow: none;
-}
-
-.overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial,
-                                    center bottom, 0,
-                                    center bottom, 0.5,
-                                    to(@overshoot_backdrop_bg_color),
-                                    to(rgba(131, 137, 145, 0)));
-    background-size: 100% 20%;
-    background-repeat: no-repeat;
-    background-position: center bottom;
-    background-color: transparent;
-    border-style: none;
-    box-shadow: none;
-}
-
-.overshoot.left {
-    background-image: -gtk-gradient(radial,
-                                    left center, 0,
-                                    left center, 0.5,
-                                    to(@overshoot_bg_color),
-                                    to(rgba(137, 158, 179, 0))),
-                      -gtk-gradient(radial,
-                                    left center, 0,
-                                    left center, 0.6,
-                                    from(rgba(56, 73, 87, 0.07)),
-                                    to(rgba(56, 73, 87, 0)));
-    background-size: 20% 100%, 100% 100%;
-    background-repeat: no-repeat;
-    background-position: left center;
-    background-color: transparent;
-    border-style: none;
-    box-shadow: none;
-}
-
-.overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial,
-                                    left center, 0,
-                                    left center, 0.5,
-                                    to(@overshoot_backdrop_bg_color),
-                                    to(rgba(131, 137, 145, 0)));
-    background-size: 20% 100%;
-    background-repeat: no-repeat;
-    background-position: left center;
-    background-color: transparent;
-    border-style: none;
-    box-shadow: none;
-}
-
-.overshoot.right {
-    background-image: -gtk-gradient(radial,
-                                    right center, 0,
-                                    right center, 0.5,
-                                    to(@overshoot_bg_color),
-                                    to(rgba(137, 158, 179, 0))),
-                      -gtk-gradient(radial,
-                                    right center, 0,
-                                    right center, 0.6,
-                                    from(rgba(56, 73, 87, 0.07)),
-                                    to(rgba(56, 73, 87, 0)));
-    background-size: 20% 100%, 100% 100%;
-    background-repeat: no-repeat;
-    background-position: right center;
-    background-color: transparent;
-    border-style: none;
-    box-shadow: none;
-}
-
-.overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial,
-                                    right center, 0,
-                                    right center, 0.5,
-                                    to(@overshoot_backdrop_bg_color),
-                                    to(rgba(131, 137, 145, 0)));
-    background-size: 20% 100%;
-    background-repeat: no-repeat;
-    background-position: right center;
-    background-color: transparent;
-    border-style: none;
-    box-shadow: none;
-}
-
-
-/* result is disable undershoot */
-.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%);
-    background-size: 10px 0px;
-    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%);
-    background-size: 10px 0px;
-    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%);
-    background-size: 0px 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%);
-    background-size: 0px 10px;
-    background-repeat: repeat-y;
-    background-origin: content-box;
-    background-position: right center;
-}
-
-/****************
- * Text Entries *
- ****************/
-
-.entry {
-	border-style: solid;
-	padding: 4px;
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-}
-
-.entry.progressbar {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.entry:selected {
-	color: @theme_selected_fg_color;
-	background-color: @theme_selected_bg_color;
-}
-
-.entry:insensitive {
-	color: @insensitive_fg_color;
-}
-
-/* Entry background */
-.entry {
-	background-color: @entry_bg_color;
-	background-image: linear-gradient(to bottom,
-	                  @entry_inner_border_color 1px,
-	                  @entry_bg_color 2px);
-}
-
-/* Focused entry background */
-.entry:focus {
-	background-image: none;
-}
-
-/* Insensitive entry background */
-.entry:insensitive {
-	background-image: linear-gradient(to bottom,
-	                  @entry_insensitive_inner_border_color 2px,
-	                  @entry_insensitive_bg_color 3px);
-}
-
-/*******************
- * Symbolic images *
- *******************/
-
-.image {
-	color: @internal_element_color;
-}
-
-.image:hover {
-	color: @internal_element_hover_color;
-}
-
-.image:selected {
-	color: @theme_selected_fg_color;
-}
-
-/*****************
- * Color Chooser *
- *****************/
-
-GtkColorSwatch,
-GtkColorSwatch:selected {
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 3px;
-	border-color: @color_swatch_border_color;
-	background-color: transparent;
-	background-clip: border-box;
-}
-
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
-	border-color: @color_swatch_hover_border_color;
-}
-
-GtkColorChooserWidget #add-color-button:hover,
-GtkColorChooserWidget #add-color-button:selected:hover {
-}
-
-.color-active-badge,
-.color-active-badge:selected {
-	border-style: solid;
-	border-width: 2px;
-	background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-	border-color: @color_active_badge_light_border_color;
-	color: @color_active_badge_light_color;
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-	border-color: @color_active_badge_dark_border_color;
-	color: @color_active_badge_dark_color;
-}
-
-GtkColorEditor GtkColorSwatch.color-light:hover,
-GtkColorEditor GtkColorSwatch.color-dark:hover {
-	background-image: none;
-}
-
-/****************
- * Progress bar *
- ****************/
-
-GtkProgressBar {
-	/* FIXME - Not working 3.14 */
-	-GtkProgressBar-min-horizontal-bar-height: 16;
-	-GtkProgressBar-min-vertical-bar-width: 16;
-	border-radius: 3px;
-	padding: 0 0 1px 0;
-}
-
-/* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	background-color: @progressbar_bg_color;
-	background-image: linear-gradient(to bottom,
-	                      alpha (@progressbar_gradient_a, 0.7),
-	                      alpha (@progressbar_gradient_b, 0.7) 50%,
-	                      alpha (@progressbar_gradient_c, 0.7) 50%,
-	                      alpha (@progressbar_gradient_d, 0.7)),
-	                  repeating-linear-gradient(135deg,
-	                      alpha (@progressbar_pattern_color, 0.0),
-	                      alpha (@progressbar_pattern_color, 0.0) 12px,
-	                      alpha (@progressbar_pattern_color, 0.5) 12px,
-	                      alpha (@progressbar_pattern_color, 0.5) 24px);
-	border-radius: 3px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: @progressbar_border_color;
-}
-
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-color: shade(@progressbar_border_color, 0.85);
-}
-
-.progressbar.vertical {
-	background-image: linear-gradient(to right,
-	                      alpha (@progressbar_gradient_a, 0.7),
-	                      alpha (@progressbar_gradient_b, 0.7) 50%,
-	                      alpha (@progressbar_gradient_c, 0.7) 50%,
-	                      alpha (@progressbar_gradient_d, 0.7)),
-	                  repeating-linear-gradient(45deg,
-	                      alpha (@progressbar_pattern_color, 0.0),
-	                      alpha (@progressbar_pattern_color, 0.0) 12px,
-	                      alpha (@progressbar_pattern_color, 0.5) 12px,
-	                      alpha (@progressbar_pattern_color, 0.5) 24px);
-}
-
-/* for progressbars in cell renderers */
-.trough row {
-	padding: 0;
-}
-
-.trough row:selected,
-.trough row:selected:focus {
-	background-image: -gtk-gradient (linear,
-	                  left top, left bottom,
-	                  from (mix (@trough_gradient_a, @theme_selected_bg_color, 0.25)),
-	                  to (mix (@trough_gradient_b, @theme_selected_bg_color, 0.25)));
-}
-
-/************
- * GtkScale *
- ************/
-
-GtkScale {
-	-GtkScale-slider-length: 21;
-	-GtkRange-slider-width: 13;
-	-GtkRange-trough-border: 4;
-}
-
-GtkScale.slider,
-GtkScale.slider:hover,
-GtkScale.slider:insensitive {
-	border-radius: 0;
-	border-style: none;
-	background-color: transparent;
-}
-
-GtkScale.trough,
-GtkScale.trough.highlight,
-GtkScale.trough.vertical,
-GtkScale.trough:insensitive {
-	border-image: none;
-	border-style: solid;
-	border-width: 1px;
-	border-radius: 1px;
-	background-image: none;
-}
-
-GtkScale.trough {
-	margin: 8px 0;
-	border-color: @scale_trough_border_color;
-	background-color: @scale_trough_bg_color;
-}
-
-GtkScale.trough.vertical {
-	margin: 0 8px;
-}
-
-GtkScale.trough.highlight {
-	border-color: @scale_trough_highlight_border_color;
-	background-color: @scale_trough_highlight_bg_color;
-}
-
-GtkScale.trough:insensitive {
-	border-color: @scale_trough_insensitive_border_color;
-	background-color: @scale_trough_insensitive_highlight_bg_color;
-}
-
-GtkScale.trough.highlight:insensitive {
-	border-color: @scale_trough_highlight_insensitive_border_color;
-	background-color: @scale_trough_highlight_insensitive_bg_color;
-}
-
-GtkScale.progressbar {
-	background-color: @scale_progressbar_bg_color;
-}
-
-GtkScale.mark {
-	color: @scale_mark_color;
-}
-
-/**********
- * Frames *
- **********/
-
-.frame {
-	border-width: 1px;
-	border-color: @border_color;
-	border-style: solid;
-	border-radius: 3px;
-	background-color: @notebook_bg_color;
-	padding: 0;
-}
-
-.frame.flat {
-   border-style:none;
-}
-
-GtkScrolledWindow.frame {
-	border-style: solid;
-	border-color: @border_color;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-GtkScrolledWindow GtkViewport {
-	background-color: @theme_bg_color;
-}
-
-/* avoid double borders when a viewport is
- * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
-	border-style: none;
-}
-
-/***********
- * Buttons *
- ***********/
-
-.button,
-.button.menuitem.menubar,
-.combobox-entry .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar.toolbar.horizontal .button,
-.primary-toolbar.toolbar.horizontal .button:active,
-.toolbar.horizontal .button,
-.toolbar.horizontal .button:active,
-.titlebar .linked.raised .button,
-.titlebar .linked.raised .button:active {
-	padding: 5px 5px 6px; /* larger values makes the button arrow smaller*/
-}
-
-.toolbar.horizontal .button,
-.toolbar.horizontal .button:active,
-.primary-toolbar.toolbar.horizontal .button,
-.primary-toolbar.toolbar.horizontal .button:active {
-	padding: 2px 2px;
-}
-
-.button.default {
-	text-shadow: none;
-	color: @theme_fg_color;
-}
-
-.button.flat {
-	border-color: transparent;
-	background-color: transparent;
-	background-image: none;
-	box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
-	text-shadow: none;
-	icon-shadow: none;
-	border-image: none;
-}
-
-.button.flat.hover {
-	border-radius: 3px;
-}
-
-.button.image-button.circular-button {
-   border-image: none;
-   border-width: 1px;
-   border-style: solid;
-   border-color: @border_color;
-}
-
-GtkComboBox GtkToggleButton.button,
-GtkComboBoxText GtkToggleButton.button,
-.toolbar.horizontal GtkComboBox GtkToggleButton.button,
-.toolbar.horizontal GtkComboBoxText GtkToggleButton.button {
-	padding: 4px;
-}
-
-.path-bar .button,
-.path-bar .button GtkImage,
-.path-bar .button GtkLabel {
-	padding: 2px;
-}
-
-.path-bar .button {
-	border-width: 1px 0px 1px 1px;
-}
-
-.path-bar .button:hover:active {
-	border-left-width: 1px;
-}
-
-.path-bar .button:first-child,
-.path-bar .button:first-child:hover:active {
-	border-right-width: 0px;
-}
-
-.path-bar .button:only-child,
-.path-bar .button:only-child:hover:active {
-	border-radius: 3px;
-	border-right-width: 1px;
-}
-
-.linked.raised .button:first-child,
-.linked.raised .button:first-child:hover:active {
-	border-right-width: 0px;
-}
-
-.button {
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5;
-	color: @theme_text_color;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* We want anything inside the buttons to use their background */
-.button * {
-	background-color: transparent;
-}
-
-/* We may want a background for focused buttons, but in the meantime let's remove it too */
-GtkMenuToolButton *,
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.primary-toolbar .button {
-	border-image: none;
-	border-style: solid;
-	border-width: 1px 1px 2px 1px;
-	border-color: transparent;
-}
-
-.primary-toolbar .button *:active,
-.inline-toolbar .button *:active,
-.button *:active,
-.button *:active:focus,
-.button *:focus {
-	color: @button_active_text_color;
-}
-
-.button *:insensitive,
-.button *:active:insensitive {
-	color: @insensitive_fg_color;
-}
-
-.button .separator {
-	color: shade(@internal_element_color, 1.30);
-}
-
-/*****************
- * GtkSpinButton *
- *****************/
-
-.spinbutton .button,
-.spinbutton .button:focus {
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0 0 0 1px;
-	border-radius: 0;
-	border-style: solid;
-	border-color: @spinbutton_border_color;
-	border-image: none;
-}
-
-.spinbutton .button {
-	background-color: transparent;
-}
-
-.spinbutton .button:insensitive {
-	color: @internal_element_insensitive_color;
-}
-
-.spinbutton .button:active,
-.spinbutton .button:active:focus,
-.spinbutton .button:hover {
-	color: @internal_element_hover_color;
-}
-
-.spinbutton .button:first-child {
-	border-radius: 2px 0 0 2px;
-}
-
-.spinbutton .button:last-child {
-	border-radius: 0 2px 2px 0;
-}
-
-/*vertical */
-
-.vertical.entry.spinbutton.entry {
-    border-image: none;
-    border-color: @border_color;
-    border-radius: 0px;
-    border-width: 0px 1px 0px 1px;
-    background-image: none;
-    padding: 4px;
-}
-
-.vertical.entry.spinbutton .button,
-.vertical.entry.spinbutton .button:hover,
-.vertical.entry.spinbutton .button:focus,
-.vertical.entry.spinbutton .button:active,
-.vertical.entry.spinbutton .button:checked,
-.vertical.entry.spinbutton .button:active:hover,
-.vertical.entry.spinbutton .button:checked:hover,
-.vertical.entry.spinbutton .button:insensitive {
-    border-radius: 3px 3px 0px 0px;
-    border-width: 1px;
-}
-
-.vertical.entry.spinbutton .button:last-child,
-.vertical.entry.spinbutton .button:hover:last-child,
-.vertical.entry.spinbutton .button:focus:last-child,
-.vertical.entry.spinbutton .button:active:last-child,
-.vertical.entry.spinbutton .button:checked:last-child,
-.vertical.entry.spinbutton .button:active:hover:last-child,
-.vertical.entry.spinbutton .button:checked:hover:last-child,
-.vertical.entry.spinbutton .button:insensitive:last-child {
-    border-width: 1px;
-    border-radius: 0px 0px 3px 3px;
-}
-
-/*********************
- * Button background *
- *********************/
-
-/* Button background */
-.button,
-.spinbutton .button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar .button.raised:focus,
-.toolbar .raised .button:focus,
-.toolbar GtkComboBox .button,
-.toolbar GtkComboBox .button:focus,
-.combobox-entry .button,
-.primary-toolbar .combobox-entry .button,
-.titlebar .titlebutton:hover,
-GtkColorChooserWidget #add-color-button {
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@button_gradient_a),
-	                  to (@button_gradient_d));
-	background-color: transparent;
-}
-
-/* Pushed button background */
-.button:checked,
-.button:checked:hover,
-.button:active,
-.button:active:hover,
-.menuitem.button:hover,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:active,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:active:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .raised .button:checked:hover,
-.primary-toolbar .combobox-entry .button:active,
-.combobox-entry .button:active,
-.primary-toolbar .button:active,
-.primary-toolbar .button:active:hover,
-.primary-toolbar .button:focus:active,
-.primary-toolbar .button:focus:active:hover,
-.inline-toolbar .button:active,
-.inline-toolbar .button:active:hover {
-	background-image: linear-gradient(to bottom,
-	                  @button_active_gradient_a,
-	                  @button_active_gradient_b 3px,
-	                  @button_active_gradient_c 4px,
-	                  @button_active_gradient_d 50%,
-	                  @button_active_gradient_e 50%,
-	                  @button_active_gradient_f);
-	background-color: transparent;
-}
-
-GtkListBoxRow.list-row,
-GtkListBoxRow.button.list-row {
-	color: @theme_text_color;
-	background-color: @theme_base_color;
-	border-radius: 0px;
-	border-style: none;
-    padding: 2px;
-}
-
-GtkListBoxRow.list-row:hover,
-GtkListBoxRow.button.list-row:hover {
-	background-image: linear-gradient(to bottom,
-	                  @button_hover_gradient_a 5%,
-	                  @button_hover_gradient_b 95%,
-	                  @button_hover_gradient_c);
-	background-color: transparent;
-}
-
-GtkListBoxRow.list-row:selected,
-GtkListBoxRow.button.list-row:selected {
-	color: @theme_selected_fg_color;
-	border-style: solid;
-	border-width: 1px;
-	border-color: @menubar_menuitem_hover_border_color;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_menuitem_hover_gradient_a),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
-	                  to (@menubar_menuitem_hover_gradient_d));
-}
-
-.trough,
-.trough.highlight,
-.trough row,
-.trough row:hover {
-	background-image: linear-gradient(to bottom,
-	                  @trough_gradient_a,
-	                  @trough_gradient_b 4px);
-}
-
-/* Flipped pushed button background for vertical progressbar through and the like */
-.trough.vertical {
-	background-image: linear-gradient(to right,
-	                  @trough_gradient_a,
-	                  @trough_gradient_b 4px);
-}
-
-/* Prelight button background */
-.button:hover,
-.spinbutton .button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.primary-toolbar .button:hover,
-.combobox-entry .button:hover,
-.primary-toolbar .combobox-entry .button:hover,
-GtkColorChooserWidget #add-color-button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-	                  @button_hover_gradient_a 5%,
-	                  @button_hover_gradient_b 95%,
-	                  @button_hover_gradient_c);
-}
-
-/* Insensitive button background */
-/* Insensitive button background */
-.button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.combobox-entry .button:insensitive {
-	background-image: none;
-	background-color: transparent;
-    color: @insensitive_fg_color;
-}
-
-/* Pushed + Insensitive button background */
-.button:active:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar GtkComboBox .button:active:insensitive {
-	background-image: linear-gradient(to bottom,
-	                  @button_active_insensitive_gradient_a,
-	                  @button_active_insensitive_gradient_b 3px,
-	                  @button_active_insensitive_gradient_c 4px,
-	                  @button_active_insensitive_gradient_d 50%,
-	                  @button_active_insensitive_gradient_e 50%,
-	                  @button_active_insensitive_gradient_f);
-	background-color: transparent;
-}
-
-/* Focused primary toolbar button background */
-.primary-toolbar .button:focus {
-	background-image: linear-gradient(to bottom,
-	                  @pt_button_focus_gradient_a,
-	                  @pt_button_focus_gradient_b 50%,
-	                  @pt_button_focus_gradient_c 50%,
-	                  @pt_button_focus_gradient_d);
-}
-
-/* Focused + prelit primary toolbar button background */
-.primary-toolbar .button:focus:hover {
-	background-image: linear-gradient(to bottom,
-	                  @pt_button_focus_hover_gradient_a,
-	                  @pt_button_focus_hover_gradient_b 50%,
-	                  @pt_button_focus_hover_gradient_c 50%,
-	                  @pt_button_focus_hover_gradient_d);
-}
-
-/*****************
- * Notebooks and *
- * tabs          *
- *****************/
-
-.notebook {
-	padding: 0;
-	background-clip: border-box;
-	background-color: @notebook_bg_color;
-	-GtkNotebook-tab-overlap: 2;
-	-GtkNotebook-tab-curvature: 3;
-	-GtkNotebook-initial-gap: 0;
-}
-
-.notebook.header.frame {
-	border-width: 0;
-}
-
-.notebook GtkViewport {
-	background-color: @theme_bg_color;
-}
-
-.notebook tab {
-	padding: 3px;
-	border-radius: 3px;
-	border-color: @border_color;
-	border-style: solid;
-	border-width: 1px;
-	background-color: transparent;
-}
-
-.notebook tab.top {
-	padding: 4px 2px 0 2px;
-	border-width: 1px 1px 0px;
-	background-image: linear-gradient(to bottom,
-	                  @notebook_tab_inner_border_color 1px,
-	                  @notebook_tab_gradient_a 2px,
-	                  @notebook_tab_gradient_b 50%,
-	                  @notebook_tab_gradient_c 50%,
-	                  @notebook_tab_gradient_d);
-}
-
-.notebook tab.right {
-	padding: 2px 4px 2px 0;
-	border-width: 1px 1px 1px 0;
-	background-image: linear-gradient(to left,
-	                  @notebook_tab_inner_border_color 1px,
-	                  @notebook_tab_gradient_a 2px,
-	                  @notebook_tab_gradient_b 50%,
-	                  @notebook_tab_gradient_c 50%,
-	                  @notebook_tab_gradient_d);
-}
-
-.notebook tab.bottom {
-	padding: 0 2px 4px;
-	border-width: 0px 1px 1px;
-	background-image: linear-gradient(to top,
-	                  @notebook_tab_inner_border_color 1px,
-	                  @notebook_tab_gradient_a 2px,
-	                  @notebook_tab_gradient_b 50%,
-	                  @notebook_tab_gradient_c 50%,
-	                  @notebook_tab_gradient_d);
-}
-
-.notebook tab.left {
-	padding: 2px 0 2px 4px;
-	border-width: 1px 0 1px 1px;
-	background-image: linear-gradient(to right,
-	                  @notebook_tab_inner_border_color 1px,
-	                  @notebook_tab_gradient_a 2px,
-	                  @notebook_tab_gradient_b 50%,
-	                  @notebook_tab_gradient_c 50%,
-	                  @notebook_tab_gradient_d);
-}
-
-.notebook tab.top:active {
-	padding-top: 7px;
-	border-top-color: @notebook_active_tab_border;
-	background-image: linear-gradient(to bottom,
-	                  @notebook_active_tab_strip_gradient_a,
-	                  @notebook_active_tab_strip_gradient_b 3px,
-	                  @notebook_active_tab_strip_border_bottom_color 4px,
-	                  @notebook_active_tab_gradient_a 4px,
-	                  @notebook_active_tab_gradient_b);
-}
-
-.notebook tab.right:active {
-	padding-right: 7px;
-	border-right-color: @notebook_active_tab_border;
-	background-image: linear-gradient(to left,
-	                  @notebook_active_tab_strip_gradient_a,
-	                  @notebook_active_tab_strip_gradient_b 3px,
-	                  @notebook_active_tab_strip_border_bottom_color 4px,
-	                  @notebook_active_tab_gradient_a 4px,
-	                  @notebook_active_tab_gradient_b);
-}
-
-.notebook tab.bottom:active {
-	padding-bottom: 7px;
-	border-bottom-color: @notebook_active_tab_border;
-	background-image: linear-gradient(to top,
-	                  @notebook_active_tab_strip_gradient_a,
-	                  @notebook_active_tab_strip_gradient_b 3px,
-	                  @notebook_active_tab_strip_border_bottom_color 4px,
-	                  @notebook_active_tab_gradient_a 4px,
-	                  @notebook_active_tab_gradient_b);
-}
-
-.notebook tab.left:active {
-	padding-left: 7px;
-	border-left-color: @notebook_active_tab_border;
-	background-image: linear-gradient(to right,
-	                  @notebook_active_tab_strip_gradient_a,
-	                  @notebook_active_tab_strip_gradient_b 3px,
-	                  @notebook_active_tab_strip_border_bottom_color 4px,
-	                  @notebook_active_tab_gradient_a 4px,
-	                  @notebook_active_tab_gradient_b);
-}
-
-.notebook tab * {
-	background-color: transparent;
-}
-
-/* close button styling */
-.notebook tab .button,
-.notebook tab .button:active,
-.notebook tab .button:hover {
-	border-image: none;
-	border-style: none;
-	background-image: none;
-	background-color: transparent;
-}
-
-.notebook tab .button GtkImage {
-	border-radius: 3px;
-	color: mix(@theme_fg_color, @theme_base_color, 0.6);
-	border-style: solid;
-	border-color: transparent;
-	border-width: 1px;
-	padding: 0;
-}
-
-.notebook tab .button GtkImage:hover {
-	color: @theme_fg_color;
-	border-color: alpha(black, 0.1);
-}
-
-.notebook tab .button GtkImage:active,
-.notebook tab .button GtkImage:active:hover {
-	background-color: alpha(black, 0.08);
-	color:  @theme_base_color;
-	border-color: alpha(black, 0.27)
-	              alpha(black, 0.13)
-	              alpha(black, 0.13)
-	              alpha(black, 0.13);
-}
-
-/**************
- * ComboBoxes *
- **************/
-
-GtkComboBox {
-	padding: 0;
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
-}
-
-GtkComboBox *:insensitive {
-	color: @insensitive_fg_color;
-}
-
-GtkComboBox .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-.combobox-entry .entry:first-child,
-.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-.combobox-entry .entry:last-child,
-.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 2px;
-}
-
-.primary-toolbar .combobox-entry .entry:first-child,
-.primary-toolbar .combobox-entry .button:first-child {
-	border-image-width: 4px 0 4px 4px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-.primary-toolbar .combobox-entry .entry:last-child,
-.primary-toolbar .combobox-entry .button:last-child {
-	border-image-width: 4px 4px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-.combobox-entry .button *:active,
-.combobox-entry .button *:active:hover {
-	color: @theme_text_color;
-}
-
-GtkComboBox .button {
-	color: @internal_element_color;
-}
-
-GtkComboBox .button *:hover {
-	color: @theme_text_color;
-}
-
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-	background-image: none;
-	border-style: solid;
-	-GtkRange-trough-border: 0;
-	-GtkScrollbar-has-backward-stepper: true;
-	-GtkScrollbar-has-forward-stepper: true;
-	-GtkRange-arrow-scaling: 0.4;
-	-GtkRange-slider-width: 15;
-	-GtkRange-stepper-size: 15px;
-	-GtkScrollbar-min-slider-length: 30;
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 0;
-}
-
-.scrollbars-junction {
-	background-image: none;
-	background-color: @scrollbars_junction_bg_color;
-}
-
-.scrollbars-junction,
-.scrollbar.trough {
-	border-color: @scrollbar_trough_border_color;
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.trough.horizontal {
-	border-width: 1px 0px;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  color-stop (0, @scrollbar_trough_gradient_a),
-	                  color-stop (0.5, @scrollbar_trough_gradient_b));
-}
-
-.scrollbar.trough.vertical {
-	border-width: 0px 1px;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  right top,
-	                  color-stop (0, @scrollbar_trough_gradient_a),
-	                  color-stop (0.5, @scrollbar_trough_gradient_b));
-}
-
-.scrollbar.button {
-	border-width: 1px;
-	border-image: none;
-	border-color: @scrollbar_button_border_color;
-	background-image: none;
-	background-color: transparent;
-	color: @scrollbar_button_color;
-}
-
-.scrollbar.button.top {
-	border-radius: 3px 3px 0px 0px;
-}
-
-.scrollbar.button.bottom {
-	border-radius: 0px 0px 3px 3px;
-}
-
-.scrollbar.button.left {
-	border-radius: 3px 0px 0px 3px;
-}
-
-.scrollbar.button.right {
-	border-radius: 0px 3px 3px 0px;
-}
-
-.scrollbar.button.horizontal {
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@scrollbar_button_gradient_a),
-	                  color-stop (0.50, @scrollbar_button_gradient_b),
-	                  color-stop (0.50, @scrollbar_button_gradient_c),
-	                  to (@scrollbar_button_gradient_d));
-}
-
-.scrollbar.button.vertical {
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  right top,
-	                  from (@scrollbar_button_gradient_a),
-	                  color-stop (0.50, @scrollbar_button_gradient_b),
-	                  color-stop (0.50, @scrollbar_button_gradient_c),
-	                  to (@scrollbar_button_gradient_d));
-}
-
-.scrollbar.button.horizontal:hover {
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@scrollbar_button_hover_gradient_a),
-	                  color-stop (0.50, @scrollbar_button_hover_gradient_b),
-	                  color-stop (0.50, @scrollbar_button_hover_gradient_c),
-	                  to (@scrollbar_button_hover_gradient_d));
-}
-
-.scrollbar.button.vertical:hover {
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  right top,
-	                  from (@scrollbar_button_hover_gradient_a),
-	                  color-stop (0.50, @scrollbar_button_hover_gradient_b),
-	                  color-stop (0.50, @scrollbar_button_hover_gradient_c),
-	                  to (@scrollbar_button_hover_gradient_d));
-}
-
-.scrollbar.button.horizontal:active {
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@scrollbar_button_active_gradient_a),
-	                  color-stop (0.50, @scrollbar_button_active_gradient_b),
-	                  color-stop (0.50, @scrollbar_button_active_gradient_c),
-	                  to (@scrollbar_button_active_gradient_d));
-}
-
-.scrollbar.button.vertical:active {
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  right top,
-	                  from (@scrollbar_button_active_gradient_a),
-	                  color-stop (0.50, @scrollbar_button_active_gradient_b),
-	                  color-stop (0.50, @scrollbar_button_active_gradient_c),
-	                  to (@scrollbar_button_active_gradient_d));
-}
-
-.scrollbar.button:insensitive {
-	color: @scrollbar_button_insensitive_color;
-}
-
-.scrollbar.slider {
-	background-color: @scrollbar_slider_bg_color;
-	background-image: none;
-	border-radius: 0;
-	border-style: solid;
-	border-image: none;
-	border-color: @scrollbar_slider_border_color;
-	border-width: 1px;
-}
-
-.scrollbar.slider:hover {
-	background-color: @scrollbar_slider_hover_bg_color;
-}
-
-/*********
- * Menus *
- *********/
-
-/* combobox menus */
-GtkTreeMenu.menu,
-GtkTreeMenu.menu * {
-	background-color: @menu_bg_color;
-}
-
-GtkTreeMenu .menuitem {
-	padding: 2px;
-}
-
-.menu {
-	font: normal;
-	background-color: @menu_bg_color;
-	color: @menu_fg_color;
-	padding: 1px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: @menu_border_color;
-}
-
-.menu.button {
-	background-image: none;
-	background-color: @menu_bg_color;
-	color: @internal_element_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:hover {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:insensitive {
-	background-color: @theme_base_color;
-	color: lighter(@internal_element_color);
-
-	border-image: none;
-	border-style: none;
-}
-
-/* this controls the general appearance of the menubar */
-.menubar {
-	border-style: none;
-	padding: 1px;
-	-GtkWidget-window-dragging: true;
-	-GtkMenuBar-internal-padding: 1;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_gradient_a),
-	                  color-stop (0.50, @menubar_gradient_b),
-	                  to (@menubar_gradient_c));
-}
-
-.menubar .menuitem {
-	border-style: none;
-	padding: 3px 5px;
-	background-color: transparent;
-}
-
-.menubar .menuitem:hover,
-.menuitem.button.flat:hover,
-.menuitem.button.flat:active {
-	background-color: @menu_bg_color;
-	border-style: solid;
-	border-width: 1px 1px 0px;
-	border-color: @menubar_menuitem_hover_border_color;
-	border-radius: 3px 3px 0 0;
-	color: @menubar_menuitem_hover_color;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_menuitem_hover_gradient_a),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
-	                  to (@menubar_menuitem_hover_gradient_d));
-}
-
-.menuitem.button.flat:hover {
-	border-width: 1px;
-	border-radius: 3px;
-}
-
-.menuitem.button.flat:focus {
-	color: @theme_text_color;
-}
-
-.menubar .menuitem *:hover {
-	border-width: 1px;
-	color: @menubar_menuitem_hover_color;
-}
-
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.5;
-	padding: 4px;
-	background-color: @menu_bg_color;
-}
-
-.menu .menuitem > * {
-	background-color: transparent;
-}
-
-.menu .menuitem:hover {
-	border-radius: 0;
-}
-
-GtkTreeMenu .menuitem:hover,
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	border-style: solid;
-	border-width: 1px;
-	border-color: @menubar_menuitem_hover_border_color;
-}
-
-GtkTreeMenu .menuitem *:hover,
-GtkComboBox .menuitem:hover *,
-.menu .menuitem:active,
-.menu .menuitem *:active,
-.menu .menuitem:hover,
-.menu .menuitem *:hover {
-	color: @theme_selected_fg_color;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_menuitem_hover_gradient_a),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
-	                  to (@menubar_menuitem_hover_gradient_d));
-}
-
-.menu .menuitem:insensitive,
-.menu .menuitem *:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
-}
-
-.menu .menuitem .accelerator:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
-}
-
-.menuitem .accelerator {
-	color: alpha (@menu_fg_color, 0.4);
-}
-
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
-	color: alpha (@menu_fg_color, 0.3);
-}
-
-.menuitem.arrow {
-	color: @menu_controls_color;
-}
-
-.menuitem.separator {
-	color: @menu_separator_color;
-	padding: 3px 1px 3px 1px;
-
-	-GtkMenuItem-horizontal-padding: 0;
-}
-
-.menuitem.check,
-.menuitem.radio,
-.menuitem.check:hover,
-.menuitem.radio:hover,
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.menuitem.check:active,
-.menuitem.radio:active {
-	background-color: transparent;
-}
-
-/***************
- * Menu Button *
- ***************/
-
-.button.menuitem.menubar:active,
-.button.menuitem.menubar *:active {
-	color: @theme_text_color;
-	background-image: none;
-	background-color: @menu_bg_color;
-	border-radius: 5px 5px 0 0;
-	border-image: none;
-	border-width: 1px 1px 0 1px;
-	border-color: shade(@border_color, 1.30);
-	border-style: solid;
-}
-
-/****************
- * Radiobuttons *
- ****************/
-
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-	background-color: transparent;
-	border-style: none;
-}
-
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
-	background-color: transparent;
-}
-
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus {
-	background-color: transparent;
-}
-
-/************
- * Toolbars *
- ************/
-
-.toolbar {
-	border-style: none;
-	border-color: darker (@theme_bg_color);
-	padding: 3px;
-}
-
-.toolbar .button {
-	padding: 1px;
-}
-
-.toolbar:insensitive {
-	color: alpha (@theme_fg_color, 0.6);
-}
-
-/********************
- * Menubar Toolbars *
- ********************/
-
-.toolbar.menubar {
-	border-style: none;
-	-GtkToolbar-button-relief: normal;
-	padding-left: 4px;
-	padding-right: 4px;
-}
-
-/********************
- * Primary Toolbars *
- ********************/
-
-/* applications using EggEditableToolbar usually set the primary-toolbar
- * hint on the containing vbox, so we need to handle both these cases here.
- */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar {
-	border-width: 1px 0 1px 0;
-	border-radius: 0;
-	border-style: solid;
-	border-top-color: @toolbar_border_top_color;
-	border-bottom-color: @toolbar_border_bottom_color;
-	-GtkWidget-window-dragging: true;
-	-GtkToolbar-button-relief: normal;
-}
-
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
-	background-image: none;
-	background-color: shade (@theme_bg_color, 0.97);
-	border-color: shade (@theme_bg_color, 0.91);
-}
-
-/* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
-	background-image: -gtk-gradient (linear,
-	                  left top, left bottom,
-	                  from (@trough_gradient_a),
-	                  to (@trough_gradient_b));
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: shade(@internal_element_color, 1.10);
-	border-image: none;
-	color: @theme_text_color;
-}
-
-/*******************
- * Inline toolbars *
- *******************/
-
-.inline-toolbar.toolbar {
-	border-width: 1px;
-	border-radius: 0;
-	border-style: solid;
-	-GtkToolbar-button-relief: normal;
-	padding: 4px;
-}
-
-.inline-toolbar.toolbar:last-child {
-	border-width: 0 1px 1px 1px;
-	border-radius: 0 0 3px 3px;
-}
-
-/* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-	                  @toolbar_gradient_a 2px,
-	                  @toolbar_gradient_b 50%,
-	                  @toolbar_gradient_c 50%,
-	                  @toolbar_gradient_d);
-}
-
-/***********
- * Sidebar *
- ***********/
-
-.sidebar,
-.sidebar .view {
-	background-color: @sidebar_bg_color;
-}
-
-.sidebar .frame {
-    border-style: none;
-}
-
-/* dialog open */
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame GtkListBox.sidebar.list,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame GtkListBox.sidebar.list,
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row {
-    background-color: @theme_base_color;
-}
-
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected,
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected:hover,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected:hover {
-    border-style: none;
-    color: @theme_selected_fg_color;
-    background-image: -gtk-gradient (linear,
-                      left top,
-                      left bottom,
-                      from (@menubar_menuitem_hover_gradient_a),
-                      color-stop (0.50, @menubar_menuitem_hover_gradient_b),
-                      color-stop (0.50, @menubar_menuitem_hover_gradient_c),
-                      to (@menubar_menuitem_hover_gradient_d));
-}
-
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:hover,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:hover {
-	background-image: linear-gradient(to bottom,
-	                  shade(@button_active_gradient_a, 1.20),
-	                  shade(@button_active_gradient_b, 1.20) 3px,
-	                  shade(@button_active_gradient_c, 1.20) 4px,
-	                  shade(@button_active_gradient_d, 1.20) 50%,
-	                  shade(@button_active_gradient_e, 1.20) 50%,
-	                  shade(@button_active_gradient_f, 1.20));
-	background-color: transparent;
-}
-
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-icon,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-icon {
-    padding: 4px 8px 4px 6px;
-}
-
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-label,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-label {
-    padding: 4px 0px 4px 1px;
-}
-
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-button.image-button.button,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-button.image-button.button {
-    background-color: transparent;
-    background-image: none;
-    border-image:none;
-    box-shadow: none;
-    border-width: 0px;
-    padding: 4px 12px 4px 0px;
-}
-
-/* workaround for broken first/last-child logic with linked buttons
-   in pathbar with gtk+-3.18 */
-.path-bar.linked .button.text-button {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-radius: 2px;
-    padding: 4px;
-}
-
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
-	background-image: none;
-	background-color: transparent;
-}
-
-/*******
- * OSD *
- *******/
-
-.background.osd {
-    color: @osd_fg;
-    background-color: @osd_bg;
-}
-
-GtkOverlay.osd {
-    background-color: transparent;
-}
-
-.osd.frame {
-    background-clip: border-box;
-    background-origin: border-box;
-}
-
-.osd.button,
-.osd.button:active,
-.osd.button:checked,
-.osd .button,
-.osd .button:active,
-.osd .button:checked {
-    border-width: 1px;
-    border-style: solid;
-    border-image: none;
-    border-radius: 5px;
-}
-
-.osd .button {
-    border-color: shade (@theme_bg_color, 0.4);
-}
-.osd .button:insensitive {
-    border-color: alpha(@osd_button_border,0.5);
-}
-
-.osd .button:hover,
-.osd .button:active,
-.osd .button:checked {
-    border-color: shade (@theme_selected_bg_color, 0.5);
-}
-
-.osd.button,
-.osd .button {
-    padding: 6px;
-    background-image: linear-gradient(to bottom,
-                                      @osd_button_bg_a,
-                                      @osd_button_bg_b 68%,
-                                      @osd_button_bg_c);
-    color: @osd_button_fg;
-    text-shadow: 0 -1px @osd_button_shadow;
-    icon-shadow: 0 -1px @osd_button_shadow;
-}
-
-.osd.button {
-    padding: 8px;
-}
-
-.osd.button,
-.osd.button:active,
-.osd.button:checked {
-    border-color: transparent;
-}
-
-.osd.button,
-.osd.button:prelight,
-.osd.button:active,
-.osd.button:checked {
-    background-color: shade(@osd_bg, 1.10);
-}
-
-.osd .button,
-.osd .button:prelight,
-.osd .button:active,
-.osd .button:checked {
-    background-color: transparent;
-}
-
-.osd.button:insensitive,
-.osd .button:insensitive {
-    background-image: none;
-    background-color: @osd_button_bg_insensitive;
-}
-
-.osd.button:active:insensitive,
-.osd .button:active:insensitive,
-.osd.button:checked:insensitive,
-.osd .button:checked:insensitive {
-    background-image: none;
-    background-color: @osd_button_bg_insensitive_active;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-    color: @osd_button_fg_hover;
-}
-
-.osd.button:active,
-.osd.button:hover:active,
-.osd .button:active,
-.osd .button:hover:active,
-.osd.button:checked,
-.osd.button:hover:checked,
-.osd .button:checked,
-.osd .button:hover:checked {
-    color: @osd_button_fg_active;
-}
-
-.osd.button:insensitive,
-.osd.button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:insensitive,
-.osd .button:active *:insensitive,
-.osd .button:checked *:insensitive {
-    color: @osd_button_fg_insensitive;
-    text-shadow: none;
-    icon-shadow: none;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-    background-image: linear-gradient(to bottom,
-                                      @osd_button_bg_hover_a,
-                                      @osd_button_bg_hover_b 68%,
-                                      @osd_button_bg_hover_c);
-}
-
-.osd.button:active,
-.osd.button:active:hover,
-.osd .button:active,
-.osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
-.osd.button:checked,
-.osd.button:checked:hover,
-.osd .button:checked,
-.osd .button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
-    background-image: linear-gradient(to bottom,
-                                      @osd_button_bg_active_a,
-                                      @osd_button_bg_active_b 20%,
-                                      @osd_button_bg_active_c);
-}
-
-.osd .linked .button:active:first-child {
-    border-left-width: 1px;
-}
-
-.osd .linked .button:active:last-child {
-    border-right-width: 1px;
-}
-
-.osd GtkMenuButton.menu-button:active {
-    background-color: transparent;
-    border-color: @osd_button_border;
-}
-
-.osd GtkMenuButton.menu-button:active {
-    color: @osd_button_fg_active;
-    text-shadow: 0 -1px @osd_button_shadow;
-}
-
-
-.osd.toolbar {
-    color: @osd_fg;
-    text-shadow: 0 1px @osd_text_shadow;
-    padding: 5px;
-    border-style: solid;
-    border-width: 1px;
-    border-color: shade (@theme_bg_color, 0.4);
-    border-radius: 2px;
-    background-image: linear-gradient(to bottom,
-                                      @osd_toolbar_bg_a,
-                                      @osd_toolbar_bg_b 63%,
-                                      @osd_toolbar_bg_c);
-    background-color: transparent;
-    -GtkToolbar-button-relief: normal;
-}
-
-.osd.toolbar .flat.button.image-button {
-    box-shadow: none;
-}
-
-.osd.toolbar .button,
-.osd.toolbar .button:hover,
-.osd.toolbar .button:active,
-.osd.toolbar .button:checked,
-.osd.toolbar .button:active:hover,
-.osd.toolbar .button:insensitive,
-.osd.toolbar .linked .button,
-.osd.toolbar .linked .button:hover,
-.osd.toolbar .linked .button:active,
-.osd.toolbar .linked .button:checked,
-.osd.toolbar .linked .button:active:hover,
-.osd.toolbar .linked .button:insensitive {
-    border-color: shade (@theme_bg_color, 0.4);
-    border-style: solid;
-    border-image: none;
-    padding: 8px;
-    border-radius: 0px;
-}
-
-.osd.toolbar .button:active,
-.osd.toolbar .button:active:hover {
-    background-image: linear-gradient(to bottom,
-                                      @osd_button_bg_active_a,
-                                      @osd_button_bg_active_b 20%,
-                                      @osd_button_bg_active_c);
-}
-
-.osd.toolbar .button:hover {
-    background-image: linear-gradient(to bottom,
-                                      @osd_button_bg_hover_a,
-                                      @osd_button_bg_hover_b 68%,
-                                      @osd_button_bg_hover_c);
-}
-
-.osd.toolbar .button:first-child,
-.osd.toolbar .button:hover:first-child,
-.osd.toolbar .button:active:first-child,
-.osd.toolbar .button:active:hover:first-child {
-    border-radius: 3px 0 0 3px;
-    border-width: 1px 0 1px 1px;
-    box-shadow: inset -1px 0 @osd_button_inset;
-}
-
-.osd.toolbar .button:last-child,
-.osd.toolbar .button:hover:last-child,
-.osd.toolbar .button:active:last-child,
-.osd.toolbar .button:active:hover:last-child {
-    box-shadow: none;
-    border-radius: 0 3px 3px 0;
-    border-width: 1px 1px 1px 0;
-}
-
-.osd.toolbar .button:only-child,
-.osd.toolbar .button:hover:only-child,
-.osd.toolbar .button:active:only-child,
-.osd.toolbar .button:active:hover:only-child,
-.osd.toolbar GtkToolButton .button,
-.osd.toolbar GtkToolButton:only-child .button,
-.osd.toolbar GtkToolButton:last-child .button,
-.osd.toolbar GtkToolButton:first-child .button {
-    border-width: 1px;
-    border-radius: 3px;
-    border-style: solid;
-    box-shadow: none;
-}
-
-.osd.toolbar .separator {
-    color: shade(@osd_lowlight, 0.80);
-}
-
-/* used by gnome-settings-daemon's media-keys OSD */
-.osd.trough {
-    background-color: @osd_trough_bg;
-    border-width: 0;
-}
-
-.osd.progressbar {
-    background-color: @osd_fg;
-}
-
-.osd .scale.trough {
-    border-color: shade (@theme_bg_color, 0.4);
-    border-image: none;
-    /* this defines the bg color of the played segment */
-    background-color: @osd_scale_trough_bg_color;
-}
-
-.osd .scale.trough.highlight {
-    background-image: none;
-    background-color: @theme_selected_bg_color;
-    background-color: @osd_scale_trough_highlight_bg_color;
-}
-
-.osd .scale.trough:insensitive,
-.osd .scale.trough.highlight:insensitive {
-    background-image: none;
-    background-color: transparent;
-}
-
-.osd .scale-popup.popover.background {
-    color: @osd_fg;
-    border-style: solid;
-    border-width: 1px;
-    border-color: shade (@theme_bg_color, 0.4);
-    border-radius: 2px;
-    background-image: linear-gradient(to bottom,
-                                      @osd_toolbar_bg_a,
-                                      @osd_toolbar_bg_b 63%,
-                                      @osd_toolbar_bg_c);
-    background-color: transparent;
-    padding: 2px;
-}
-
-.osd .scale-popup.popover.background .button.flat.image-button {
-    background-image: linear-gradient(to bottom,
-                                      @osd_button_bg_a,
-                                      @osd_button_bg_b 68%,
-                                      @osd_button_bg_c);
-    border-radius: 3px;
-    border-width: 1px;
-    padding: 3px;
-}
-
-.osd .scale-popup.popover.background .button.flat.image-button:hover {
-    background-image: linear-gradient(to bottom,
-                                      @osd_button_bg_hover_a,
-                                      @osd_button_bg_hover_b 78%,
-                                      @osd_button_bg_hover_c);
-    box-shadow: none;
-}
-
-.osd .scale-popup.popover.background .button.flat.image-button:insensitive {
-    border-color: alpha (shade(@theme_bg_color, 0.4), 0.0);
-    background-image: none;
-    background-color: transparent;
-}
-
-.osd GtkProgressBar,
-GtkProgressBar.osd {
-    padding: 0;
-    -GtkProgressBar-xspacing: 0;
-    -GtkProgressBar-yspacing: 3px;
-    -GtkProgressBar-min-horizontal-bar-height: 3px;
-}
-
-.osd GtkProgressBar.trough,
-GtkProgressBar.osd.trough {
-    padding: 0;
-    border-image: none;
-    border-style: none;
-    border-width: 0;
-    background-image: none;
-    background-color: transparent;
-    border-radius: 0;
-}
-
-.osd GtkProgressBar.progressbar,
-GtkProgressBar.osd.progressbar {
-    border-style: none;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    border-radius: 0;
-}
-
-.osd .view,
-.osd.view {
-    background-color: @osd_view_bg;
-}
-
-.osd .scrollbar.trough {
-    background-color: @osd_scrollbar_trough;
-}
-
-.osd .scrollbar.slider {
-    background-color: @osd_scrollbar_slider;
-}
-
-.osd .scrollbar.slider:hover {
-    background-color: @osd_scrollbar_slider_prelight;
-}
-
-.osd .scrollbar.slider:active {
-    background-color: @osd_scrollbar_slider_active;
-}
-
-.osd GtkIconView.cell:selected,
-.osd GtkIconView.cell:selected:focus {
-    background-color: transparent;
-    border-style: solid;
-    border-radius: 15px;
-    border-width: 3px;
-    border-color: @osd_button_fg;
-    outline-color: transparent;
-}
-
-/* used by Documents */
-.osd .page-thumbnail {
-    border-style: solid;
-    border-width: 1px;
-    border-color: @osd_lowlight;
-    /* when there's no pixbuf yet */
-    background-color: @osd_bg;
-}
-
-/****************
- * GtkAssistant *
- ****************/
-
-GtkAssistant .sidebar .highlight {
-	color: @theme_fg_color;
-	font: bold;
-}
-
-GtkAssistant .sidebar {
-	padding: 12px;
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: @gtkassistant_sidebar_border_color;
-	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-	background-color: shade (@theme_bg_color, 0.97);
-	/* shall we make it like sidebars in general? */
-}
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch {
-	color: @switch_color;
-}
-
-GtkScale.progressbar,
-GtkSwitch.trough:active {
-	color: @switch_trough_active_color;
-}
-
-GtkSwitch.trough:active {
-	background-image: -gtk-gradient (linear,
-	                  left top, left bottom,
-	                  from (@switch_trough_active_gradient_a),
-	                  to (@switch_trough_active_gradient_b));
-}
-
-GtkSwitch.trough:insensitive {
-	background-image: none;
-	background-color: @insensitive_bg_color;
-	color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5);
-}
-
-GtkSwitch.slider {
-	background-color: @switch_slider_bg_color;
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: @switch_slider_border_color;
-	padding: 0px 0px 1px 0px;
-}
-
-GtkSwitch.slider:insensitive {
-	background-color: @switch_slider_insensitive_bg_color;
-	border-color: @insensitive_border_color;
-}
-
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-	-GtkTreeView-expander-size: 13;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
-}
-
-GtkTreeView.dnd {
-	border-color: @internal_element_color;
-	border-radius: 2px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-GtkViewport,
-GtkIconView {
-	border-radius: 3px;
-	padding: 0;
-	background-color: @theme_base_color;
-}
-
-GtkIconView.view.cell:selected,
-GtkIconView.view.cell:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	border-radius: 4px;
-}
-
-.view,
-GtkTreeView {
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-}
-
-.view:selected,
-GtkTreeView:selected {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.view:insensitive,
-GtkTreeView:insensitive {
-	background-color: @insensitive_bg_color;
-	color: @insensitive_fg_color;
-}
-
-GtkTreeView:hover {
-	background-image: linear-gradient(to bottom,
-	                  shade(@button_active_gradient_a, 1.20),
-	                  shade(@button_active_gradient_b, 1.20) 3px,
-	                  shade(@button_active_gradient_c, 1.20) 4px,
-	                  shade(@button_active_gradient_d, 1.20) 50%,
-	                  shade(@button_active_gradient_e, 1.20) 50%,
-	                  shade(@button_active_gradient_f, 1.20));
-	background-color: transparent;
-}
-
-column-header.button,
-column-header .button {
-	color: @internal_element_color;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:focus:hover,
-column-header .button:focus:hover {
-	background-color: @theme_base_color;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@column_header_button_gradient_a),
-	                  color-stop (0.50, @column_header_button_gradient_b),
-	                  color-stop (0.50, @column_header_button_gradient_c),
-	                  to (@column_header_button_gradient_d));
-	padding: 0 4px;
-	font-weight: normal;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	background-color: @insensitive_bg_color;
-}
-
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:focus:hover,
-column-header .button:focus:hover,
-column-header.button:active:focus:hover,
-column-header .button:active:focus:hover,
-column-header.button:active:focus,
-column-header .button:active:focus,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button *:active,
-column-header .button *:active,
-column-header.button *:active:hover,
-column-header .button *:active:hover {
-	color: @internal_element_hover_color;
-}
-
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:active:hover:focus,
-column-header .button:active:hover:focus,
-column-header.button:active:focus,
-column-header .button:active:focus {
-	background-color: @entry_bg_color;
-	background-image: none;
-}
-
-row:hover {
-	border-width: 0;
-}
-
-row:insensitive {
-	border-width: 0;
-}
-
-row:selected,
-row:selected:focus {
-	border-width: 0;
-}
-
-row:selected:focus,
-.cell:selected {
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_menuitem_hover_gradient_a),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
-	                  to (@menubar_menuitem_hover_gradient_d));
-}
-
-.cell {
-	color: @theme_text_color;
-	padding: 2px;
-	border-width: 0;
-}
-
-.cell:selected {
-	color: @theme_selected_fg_color;
-}
-
-.expander {
-	border-style: solid;
-	border-width: 1px;
-	border-radius: 2px;
-	border-color: shade (@internal_element_color, 1.40);
-	color: @theme_base_color;
-	background-color: @theme_base_color;
-}
-
-.expander:active {
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade (@internal_element_color, 1.40);
-	background-color: @theme_base_color;
-}
-
-.expander:hover {
-	border-style: solid;
-	border-width: 1px;
-	color: @internal_element_color;
-	border-color: shade (@internal_element_color, 1.40);
-	background-color: shade (@theme_bg_color, 1.02);
-}
-
-.expander row {
-	border-radius: 2px;
-}
-
-.expander row:selected,
-.expander row:selected:focus {
-	border-style: solid;
-	border-width: 1px;
-	border-color: @expander_row_selected_border_color;
-	color: @expander_row_selected_color;
-	background-color: @theme_selected_bg_color;
-}
-
-/* Calendars */
-GtkCalendar {
-	padding: 2px;
-}
-
-GtkCalendar.view {
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px;
-}
-
-GtkCalendar.header {
-	border-radius: 0;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (shade (@theme_bg_color, 1.04)),
-	                  to (shade (@theme_bg_color, 0.89)));
-	border-width: 0;
-}
-
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.highlight,
-GtkCalendar.highlight {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	border-radius: 0;
-	padding: 0;
-	border-width: 0;
-}
-
-/* Use different button and entry borders on infobars */
-GtkInfoBar .entry,
-GtkInfoBar .entry:focus,
-GtkInfoBar .button,
-GtkInfoBar .button:insensitive,
-GtkInfoBar .button:active,
-GtkInfoBar .button:focus,
-GtkInfoBar .button:active:focus,
-.info .entry,
-.info .entry:focus,
-.info .button,
-.info .button:insensitive,
-.info .button:active,
-.info .button:focus,
-.info .button:active:focus,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:focus,
-.warning .button:active:focus,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:focus,
-.question .button:active:focus,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:focus,
-.error .button:active:focus {
-	border-image: none;
-	border-color: shade(@border_color, 0.9);
-	border-style: solid;
-	border-width: 1px;
-}
-
-GtkInfoBar:last-child,
-.info:last-child,
-.warning:last-child,
-.question:last-child,
-.error:last-child {
-	/* only apply a border on the last infobar if
-	 * there's more than one packed in */
-	border-bottom-width: 1px;
-	border-style: solid;
-}
-
-.info > * {
-	background-color: @info_bg_color;
-	color: @info_fg_color;
-	border-color: darker(@info_bg_color);
-}
-
-.warning > * {
-	background-color: @warning_bg_color;
-	color: @warning_fg_color;
-	border-color: darker(@warning_bg_color);
-}
-
-.question > * {
-	background-color: @question_bg_color;
-	color: @question_fg_color;
-	border-color: darker(@question_bg_color);
-}
-
-.error > * {
-	background-color: @error_bg_color;
-	color: @error_fg_color;
-	border-color: darker(@error_bg_color);
-}
-
-.view.dim-label,
-.dim-label,
-.dim-label:hover,
-.dim-label:focus {
-	color: mix (@theme_fg_color, @theme_bg_color, 0.50);
-}
-
-.dim-label:selected,
-.dim-label:selected:focus {
-	color: mix (@theme_selected_fg_color, @theme_base_color, 0.50);
-}
-
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-}
-
-/************
- * Titlebar *
- ************/
-
-.titlebar {
-	background-image: linear-gradient(to bottom,
-	                  @theme_base_color,
-	                  @theme_bg_color);
-	background-color: transparent;
-	border-radius: 7px 7px 0 0;
-	border-bottom: 1px solid;
-	border-color: shade(@border_color, 1.30);
-	padding: 5px 4px 4px 4px;
-}
-
-.titlebar > * {
-	background: none;
-}
-
-.tiled .titlebar {
-	border-radius: 0;
-}
-
-.maximized .titlebar {
-	border-radius: 0;
-}
-
-.titlebar .title {
-	font: Bold;
-}
-
-/*.titlebar :first-child {*/
-/*	padding: 5px 5px 6px 5px;*/
-/*}*/
-
-.titlebar .titlebutton {
-	background: none;
-	border-image: none;
-}
-
-/* workaround to avoid unwanted black frames if switching compositor on/off */
-.background .window-frame  {
-    box-shadow: none;
-}
-
-.background.csd .window-frame {
-	border-width: 0px;
-	border-radius: 7px 7px 0 0;
-	border-style: solid;
-	box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
-	margin: 10px;
-}
-
-/* workaround to avoid unwanted black frames if switching compositor on/off */
-.window-frame:backdrop {
-/*	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px*/
-    box-shadow: none;
-}
-
-.window-frame.tiled {
-	border-radius: 0;
-	background-color: @theme_bg_color;
-}
-
-.window-frame.ssd {
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23);
-}
-
-.window-frame.solid-csd {
-    border-radius: 0;
-    margin: 4px;
-    background-color: @wm_bg_a;
-    border: solid 1px @wm_csd_solid_border_color;
-    box-shadow: none;
-}
-
-.window-frame.csd.popup {
-    border-radius: 0;
-    box-shadow: none;
-}
-
-.window-frame.csd.tooltip {
-    border-radius: 5px;
-    box-shadow: 0 1px 5px @wm_shadow;
-}
-
-.window-frame.csd.message-dialog {
-    border-radius: 7px;
-    box-shadow: 0 1px 5px @wm_shadow;
-}
-
-/**************
- * Action bar *
- **************/
-
-.action-bar {
-	border-style: none;
-	padding: 7px 7px 3px 7px;
-}
-
-/**************
- * Header bar *
- **************/
-
-GtkHeaderBar .header-bar {
-	padding: 5px 4px 4px 4px;
-}
-
-/*************
- * Popovers *
- *************/
-
-.popover {
-	background-clip: initial;
-	margin: 10px;
-	padding: 2px;
-	border-color: @border_color;
-	border: 1px solid;
-	border-radius: 2px;
-	background-color: @theme_bg_color;
-	background-image: linear-gradient(to bottom,
-	                                  shade(@theme_bg_color, 1.0),
-	                                  shade(@theme_bg_color, 0.85));
-	box-shadow: 0 1px 5px @wm_shadow;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-.popover > .list,
-.popover > .view,
-.popover > .toolbar .popover.osd > .toolbar,
-.popover > .inline-toolbar .popover.osd > .toolbar,
-.popover > .search-bar .popover.osd > .toolbar,
-.popover > .location-bar .popover.osd > .toolbar,
-.popover > .toolbar .popover.osd > .inline-toolbar,
-.popover > .inline-toolbar .popover.osd > .inline-toolbar,
-.popover > .search-bar .popover.osd > .inline-toolbar,
-.popover > .location-bar .popover.osd > .inline-toolbar,
-.popover > .toolbar .popover.osd > .search-bar,
-.popover > .inline-toolbar .popover.osd > .search-bar,
-.popover > .search-bar .popover.osd > .search-bar,
-.popover > .location-bar .popover.osd > .search-bar,
-.popover > .toolbar .popover.osd > .location-bar,
-.popover > .inline-toolbar .popover.osd > .location-bar,
-.popover > .search-bar .popover.osd > .location-bar,
-.popover > .location-bar .popover.osd > .location-bar {
-	border-style: none;
-	background-color: transparent;
-}
-
-.popover .separator {
-	font-size: 80%;
-	font-weight: bold;
-	color: alpha(@theme_fg_color,0.1);
-	text-shadow: none;
-	background-color: transparent;
-	icon-shadow: none;
-	border: 0;
-}
-
-.popover.osd {
-	background-image: none;
-	background-color: alpha(shade(#3E403D, 0.85), 0.75);
-	border: 1px solid black;
-	box-shadow: none;
-	color: @theme_selected_fg_color;
-}
-.popover.osd .toolbar {
-	background-image: none;
-	background-color: transparent;
-	border-style: none;
-	box-shadow: none;
-}
-.popover.osd .button {
-	text-shadow: 0 -1px @osd_text_shadow;
-	icon-shadow: 0 -1px @osd_text_shadow;
-}
-.popover.osd .button:active,
-.popover.osd .button:checked {
-        box-shadow: none;
-}
-.popover.osd .button:insensitive {
-	color: alpha(@theme_selected_fg_color, 0.4);
-}
-
-.popover .list {
-	background-color: @theme_base_color;
-}
-
-GtkModelButton.button {
-	color: @theme_fg_color;
-	border-radius: 3px;
-}
-
-GtkModelButton.button:checked,
-GtkModelButton.button:active,
-GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
-GtkModelButton.button,
-GtkModelButton.button:focus,
-GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
-	color: @theme_fg_color;
-	background-color: transparent;
-	background-image: none;
-	border-color: transparent;
-	border-image: none;
-	border-style: none;
-	box-shadow: none;
-	border-radius: 3px;
-}
-
-GtkModelButton.button:checked:hover,
-GtkModelButton.button:active:hover,
-GtkModelButton.button:hover,
-GtkModelButton.button:selected {
-	color: @theme_selected_fg_color;
-	background-image:  linear-gradient(to bottom,
-	                                  shade(@theme_selected_bg_color, 1.1),
-	                                  shade(@theme_selected_bg_color, 0.8));
-	text-shadow: none;
-	border-width: 2px;
-	border-color: @border_color;
-	border-radius: 3px;
-}
-
-GtkPopover .separator {
-	font-size: 80%;
-	font-weight: bold;
-	color: alpha(@theme_text_color,0.4);
-	text-shadow: none;
-	background-color: transparent;
-	icon-shadow: none;
-	border: 0;
-}
-
-.popover .button.default.suggested-action.text-button {
-    background-color: transparent;
-    background-image: none;
-    text-shadow:none;
-    border-style: none;
-    border-image: none;
-    box-shadow: none;
-}
-
-.popover .button.default.suggested-action.text-button:hover {
-	color: @theme_selected_fg_color;
-	background-image:  linear-gradient(to bottom,
-	                                  shade(@theme_selected_bg_color, 1.1),
-	                                  shade(@theme_selected_bg_color, 0.8));
-	text-shadow: none;
-	border-color: @border_color;
-	border-width: 2px;
-	border-radius: 3px;
-}
-
-/************
- * GtkStack *
- ************/
-
-GtkStackSidebar.sidebar .separator.horizontal {
-    -GtkWidget-separator-height: 0px;
-}
-
-GtkStackSidebar.sidebar GtkViewport.frame {
-    border-color: @border_color;
-    border-style: solid;
-    border-width: 0 1px 0 0;
-    /* FIXME radius > 0 doesn't work */
-    border-radius: 0px 0px 0px 3px;
-    background-color: @theme_base_color;
-}
-
-GtkStackSidebar.sidebar GtkListBoxRow.button.list-row:active,
-GtkStackSidebar.sidebar GtkListBoxRow.button.list-row:selected {
-    border-style: none;
-    border-width: 0px;
-    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 0.8),
-                inset  1px  0px shade (@theme_selected_bg_color, 0.8),
-                inset -1px  0px shade (@theme_selected_bg_color, 0.8),
-                inset  0px -1px shade (@theme_selected_bg_color, 0.8);
-}
-
-/* address entry */
-GtkStack .linked.vertical .entry {
-    padding: 4px;
-}
-
-.horizontal.titlebar.header-bar .horizontal.linked.stack-switcher .button.text-button {
-    padding: 4px;
-}
-
-/*********************
- * App Notifications *
- *********************/
-
-.app-notification,
-.app-notification.frame {
-    color: @theme_fg_color;
-    padding: 10px;
-    border-style: none;
-    border-radius: 0 0 4px 4px;
-    background-color: rgba(245, 121, 0, 0.7);
-    background-image: linear-gradient(to bottom,
-                                      rgba(0, 0, 0, 0.2),
-                                      transparent 2px);
-    background-clip: padding-box;
-}
-
-.app-notification:backdrop,
-.app-notification.frame:backdrop {
-    background-image: none;
-}
-
-.app-notification .button,
-.app-notification .header-bar .button.titlebutton,
-.header-bar .app-notification .button.titlebutton,
-.app-notification .titlebar .button.titlebutton,
-.titlebar .app-notification .button.titlebutton,
-.app-notification GtkCalendar.header .button.titlebutton,
-GtkCalendar.header .app-notification .button.titlebutton,
-.app-notification.frame .button {
-    color: @theme_fg_color;
-    border-color: rgba(75, 89, 112, 0.7);
-    background-image: linear-gradient(to bottom,
-                                      rgba(245, 121, 0, 0.7));
-    background-clip: padding-box;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-    text-shadow: none;
-    icon-shadow: 0 1px black;
-    outline-color: rgba(238, 238, 236, 0.3);
-    border-radius: 3px;
-    padding: 0 0px 2px 0px;
-}
-
-.app-notification .button.flat,
-.app-notification .header-bar .titlebutton.button,
-.header-bar .app-notification .titlebutton.button,
-.app-notification .titlebar .titlebutton.button,
-.titlebar .app-notification .titlebutton.button,
-.app-notification GtkCalendar.header .titlebutton.button,
-GtkCalendar.header .app-notification .titlebutton.button,
-.app-notification.frame .button.flat,
-.app-notification.frame .header-bar .titlebutton.button,
-.header-bar .app-notification.frame .titlebutton.button,
-.app-notification.frame .titlebar .titlebutton.button,
-.titlebar .app-notification.frame .titlebutton.button,
-.app-notification.frame GtkCalendar.header .titlebutton.button,
-GtkCalendar.header .app-notification.frame .titlebutton.button {
-    icon-shadow: 0 1px black;
-    text-shadow: 0 1px black;
-}
-
-.app-notification .button:hover,
-.app-notification.frame .button:hover {
-    color: white;
-    border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom,
-                                      rgba(62, 46, 30, 0.7));
-    background-clip: padding-box;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-    text-shadow: none;
-    icon-shadow: 0 1px black;
-    outline-color: rgba(238, 238, 236, 0.3);
-    border-radius: 3px;
-}
-
-.app-notification .button:active,
-.app-notification .button:checked,
-.app-notification .button:backdrop:active,
-.app-notification .button:backdrop:checked,
-.app-notification.frame .button:active,
-.app-notification.frame .button:checked,
-.app-notification.frame .button:backdrop:active,
-.app-notification.frame .button:backdrop:checked {
-    color: white;
-    border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom,
-                                      rgba(175, 120, 65, 0.7));
-    background-clip: padding-box;
-    box-shadow: none;
-    text-shadow: none;
-    icon-shadow: none;
-    outline-color: rgba(238, 238, 236, 0.3);
-    border-radius: 3px;
-}
-
-.app-notification .button:insensitive,
-.app-notification .button:backdrop:insensitive,
-.app-notification.frame .button:insensitive,
-.app-notification.frame .button:backdrop:insensitive {
-    color: #878989;
-    border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom,
-                                      rgba(52, 57, 57, 0.5));
-    background-clip: padding-box;
-    box-shadow: none;
-    text-shadow: none;
-    icon-shadow: none;
-    border-radius: 3px;
-    padding: 0px;
-}
-
-.app-notification .button:backdrop,
-.app-notification.frame .button:backdrop {
-    color: #eeeeec;
-    border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom,
-                                      rgba(245, 121, 0, 0.7));
-    background-clip: padding-box;
-    box-shadow: none;
-    text-shadow: none;
-    icon-shadow: none;
-    border-radius: 3px;
-    padding: 0px;
-}
-
-/* hyperlinks */
-/* ie. yelp */
-*:link,
-*:visited {
-  color: @link_color;
-}
-
-GtkLinkButton.button,
-GtkLinkButton.button:hover,
-GtkLinkButton.button:active,
-GtkLinkButton.button:active:hover {
-    transition: all 400ms ease-in;
-    text-shadow: none;
-}
-
-/******************
- * Dialog Windows *
- ******************/
-
-/* ie. mate-keyboard-properties option window */
-GtkDialog GtkScrolledWindow.frame {
-    border-color: @border_color;
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 2px;
-}
-
-GtkDialog GtkScrolledWindow.frame GtkViewport .vertical {
-    background-color: shade (@theme_bg_color, 1.04);
-}
-
-GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
-    background-color: @theme_base_color;
-    border-radius: 3px;
-    border-color: @border_color;
-    border-style: solid;
-    border-width: 1px;
-}
-
-/******************
- * GtkAboutDialog *
- ******************/
-
-GtkAboutDialog.background .vertical.dialog-vbox  GtkGrid.vertical {
-    background: transparent;
-}
-
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css b/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
deleted file mode 100644
index 692a38ba..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/gtk.css
+++ /dev/null
@@ -1,515 +0,0 @@
-/***********************************************************************
- * This section can be modified to create color variants of the theme. *
- ***********************************************************************/
-
-/****************
- * color scheme *
- ****************/
-
-@define-color theme_base_color #babdb6;
-
-@define-color theme_bg_color #888a85;
-@define-color theme_fg_color #000000;
-
-@define-color theme_selected_bg_color #f57900;
-@define-color theme_selected_fg_color #ffffff;
-
-@define-color theme_tooltip_bg_color #EAF5B5;
-@define-color theme_tooltip_fg_color #000000;
-
-@define-color theme_text_color #000000;
-
-@define-color link_color #0000ee;
-@define-color visited_link_color #551a8b;
-
-/*****************
- * error/warning *
- *****************/
-
-@define-color error_color #cc0000;
-
-@define-color warning_bg_color #faad3d;
-
-/***************
- * core colors *
- ***************/
-
-/* Core colors are only used in the current file, as bases for other
-   color declarations. */
-
-@define-color core_color_a #f57900; /* Core color for orange widgets in TraditionalOKTest. */
-@define-color core_color_b #888a85; /* Core color for gray widgets in TraditionalOKTest. */
-
-/********************************************
- * End of configuration for color variants. *
- ********************************************/
-
-/***********
- * general *
- ***********/
-
-@define-color insensitive_bg_color @theme_bg_color;
-@define-color insensitive_fg_color shade(@core_color_b, 0.70);
-@define-color insensitive_text_shadow_color @theme_base_color;
-
-@define-color internal_element_color @theme_text_color;
-@define-color internal_element_hover_color @theme_text_color;
-@define-color internal_element_insensitive_color @insensitive_fg_color;
-
-/* border */
-
-@define-color border_color shade(@core_color_b, 0.67);
-@define-color focus_border_color mix(#acacac, shade(@core_color_a, 0.75), 0.54);
-@define-color insensitive_border_color shade(@core_color_b, 0.79);
-
-/**********
- * button *
- **********/
-
-@define-color button_gradient_a shade(@core_color_b, 1.07);
-@define-color button_gradient_b shade(@core_color_b, 1.06);
-@define-color button_gradient_c shade(@core_color_b, 1.04);
-@define-color button_gradient_d shade(@core_color_b, 0.98);
-
-/* hover */
-
-@define-color button_hover_gradient_a @theme_base_color;
-@define-color button_hover_gradient_b shade(@core_color_b, 1.05);
-@define-color button_hover_gradient_c @core_color_b;
-
-/* active */
-
-@define-color button_active_text_color @theme_fg_color;
-
-@define-color button_active_gradient_a shade(@core_color_b, 0.85);
-@define-color button_active_gradient_b shade(@core_color_b, 0.90);
-@define-color button_active_gradient_c shade(@core_color_b, 0.91);
-@define-color button_active_gradient_d shade(@core_color_b, 0.86);
-@define-color button_active_gradient_e shade(@core_color_b, 0.84);
-@define-color button_active_gradient_f shade(@core_color_b, 0.80);
-
-/* insensitive */
-
-@define-color button_insensitive_inner_border_color shade(@core_color_b, 1.05);
-
-@define-color button_insensitive_gradient_a shade(@core_color_b, 1.04);
-@define-color button_insensitive_gradient_b shade(@core_color_b, 1.01);
-@define-color button_insensitive_gradient_c shade(@core_color_b, 0.99);
-@define-color button_insensitive_gradient_d shade(@core_color_b, 0.96);
-
-/* active insensitive */
-
-@define-color button_active_insensitive_gradient_a shade(@core_color_b, 0.98);
-@define-color button_active_insensitive_gradient_b shade(@core_color_b, 1.02);
-@define-color button_active_insensitive_gradient_c shade(@core_color_b, 1.03);
-@define-color button_active_insensitive_gradient_d shade(@core_color_b, 1.01);
-@define-color button_active_insensitive_gradient_e shade(@core_color_b, 0.99);
-@define-color button_active_insensitive_gradient_f shade(@core_color_b, 0.96);
-
-/* primary toolbar focus */
-
-@define-color pt_button_focus_gradient_a mix(#fafafa, shade(@core_color_a, 1.09), 0.3);
-@define-color pt_button_focus_gradient_b mix(#ededed, shade(@core_color_a, 1.05), 0.3);
-@define-color pt_button_focus_gradient_c mix(#e8e8e8, shade(@core_color_a, 1.01), 0.25);
-@define-color pt_button_focus_gradient_d mix(#e8e8e8, shade(@core_color_a, 0.96), 0.3);
-
-/* primary toolbar focus hover */
-
-@define-color pt_button_focus_hover_gradient_a mix(#fcfcfc, shade(@core_color_a, 1.09), 0.15);
-@define-color pt_button_focus_hover_gradient_b mix(#fcfcfc, shade(@core_color_a, 1.05), 0.15);
-@define-color pt_button_focus_hover_gradient_c mix(#fcfcfc, shade(@core_color_a, 1.01), 0.2);
-@define-color pt_button_focus_hover_gradient_d mix(#e8e8e8, shade(@core_color_a, 0.96), 0.2);
-
-/*****************
- * color chooser *
- *****************/
-
-@define-color color_swatch_border_color @border_color;
-@define-color color_swatch_hover_border_color @menubar_menuitem_hover_border_color;
-
-@define-color color_active_badge_light_border_color @theme_fg_color;
-@define-color color_active_badge_light_color @color_active_badge_light_border_color;
-
-@define-color color_active_badge_dark_border_color @theme_base_color;
-@define-color color_active_badge_dark_color @color_active_badge_light_border_color;
-
-/*****************
- * column-header *
- *****************/
-
-@define-color column_header_border_top_color @theme_base_color;
-@define-color column_header_border_right_color shade(@core_color_b, 0.82);
-@define-color column_header_border_bottom_color shade(@core_color_b, 0.70);
-@define-color column_header_border_left_color @column_header_border_top_color;
-
-@define-color column_header_button_gradient_a shade(@core_color_b, 1.05);
-@define-color column_header_button_gradient_b shade(@core_color_b, 1.02);
-@define-color column_header_button_gradient_c @core_color_b;
-@define-color column_header_button_gradient_d shade(@core_color_b, 0.96);
-
-/*********
- * entry *
- *********/
-
-@define-color entry_text_color @theme_text_color;
-
-@define-color entry_inner_border_color shade(@core_color_b, 0.96);
-@define-color entry_bg_color @theme_base_color;
-
-/* insensitive */
-
-@define-color entry_insensitive_inner_border_color shade(@core_color_b, 0.97);
-@define-color entry_insensitive_bg_color @insensitive_bg_color;
-
-/************
- * expander *
- ************/
-
-@define-color expander_row_selected_border_color mix(#acacac, shade(@core_color_a, 0.75), 0.54);
-
-/*****************
- * fallback mode *
- *****************/
-
-@define-color os_chrome_bg_color @theme_bg_color;
-@define-color os_chrome_fg_color @theme_fg_color;
-
-/* gnome-panel */
-
-@define-color applet_frame_bg_color shade(@core_color_b, 0.89);
-@define-color pager_bg_color shade(@core_color_b, 0.97);
-
-/*******************************
- * info/question/error/warning *
- *******************************/
-
-@define-color info_bg_color @theme_tooltip_bg_color;
-@define-color info_fg_color @theme_fg_color;
-
-@define-color question_bg_color mix(#727272, shade(@core_color_a, 0.90), 0.95);
-@define-color question_fg_color @theme_base_color;
-
-@define-color error_bg_color mix(#ababab, shade(@error_color, 0.77), 0.78);
-@define-color error_fg_color @theme_base_color;
-
-@define-color warning_fg_color @theme_fg_color;
-
-/********
- * menu *
- ********/
-
-@define-color menu_bg_color @theme_base_color;
-@define-color menu_fg_color @theme_fg_color;
-
-/* Example: submenu arrow. */
-@define-color menu_controls_color @theme_fg_color;
-
-@define-color menu_border_color shade(@core_color_b, 0.72);
-@define-color menu_separator_color @menu_border_color;
-
-/***********
- * menubar *
- ***********/
-
-@define-color menubar_gradient_a shade(@core_color_b, 0.99);
-@define-color menubar_gradient_b shade(@core_color_b, 0.98);
-@define-color menubar_gradient_c shade(@core_color_b, 0.96);
-
-/* hover */
-
-@define-color menubar_menuitem_hover_color @theme_selected_fg_color;
-@define-color menubar_menuitem_hover_border_color shade(@core_color_a, 0.58);
-
-@define-color menubar_menuitem_hover_gradient_a @core_color_a;
-@define-color menubar_menuitem_hover_gradient_b shade(@core_color_a, 0.95);
-@define-color menubar_menuitem_hover_gradient_c shade(@core_color_a, 0.93);
-@define-color menubar_menuitem_hover_gradient_d shade(@core_color_a, 0.88);
-
-/************
- * notebook *
- ************/
-
-@define-color notebook_bg_color shade(@core_color_b, 1.02);
-
-@define-color notebook_tab_inner_border_color shade(@core_color_b, 1.04);
-
-@define-color notebook_tab_gradient_a shade(@core_color_b, 0.97);
-@define-color notebook_tab_gradient_b shade(@core_color_b, 0.92);
-@define-color notebook_tab_gradient_c shade(@core_color_b, 0.90);
-@define-color notebook_tab_gradient_d shade(@core_color_b, 0.86);
-
-/* active tab */
-
-@define-color notebook_active_tab_border @menubar_menuitem_hover_border_color;
-
-@define-color notebook_active_tab_strip_gradient_a shade(@core_color_a, 1.05);
-@define-color notebook_active_tab_strip_gradient_b shade(@core_color_a, 0.94);
-@define-color notebook_active_tab_strip_border_bottom_color mix(#727272, shade(@core_color_a, 0.84), 0.65);
-@define-color notebook_active_tab_gradient_a shade(@core_color_b, 1.07);
-@define-color notebook_active_tab_gradient_b @notebook_bg_color;
-
-/*******
- * osd *
- *******/
-
-@define-color osd_highlight #ffffff;
-@define-color osd_lowlight #525252;
-@define-color osd_base #212526;
-@define-color osd_base_backdrop shade(@osd_base, 1.40);
-
-@define-color osd_fg #ededed;
-@define-color osd_bg alpha(@osd_base, 0.80);
-@define-color osd_bg_backdrop alpha(@osd_base_backdrop, 0.90);
-
-@define-color osd_text_shadow alpha(black, 0.75);
-
-@define-color osd_toolbar_bg_a alpha(@osd_base, 0.50);
-@define-color osd_toolbar_bg_b alpha(#101010, 0.50);
-@define-color osd_toolbar_bg_c alpha(shade(@osd_base, 1.02), 0.50);
-
-@define-color osd_button_bg_a alpha(@osd_highlight, 0.16);
-@define-color osd_button_bg_b alpha(@osd_lowlight, 0.05);
-@define-color osd_button_bg_c alpha(@osd_highlight, 0.12);
-
-@define-color osd_button_bg_insensitive alpha(@osd_bg, 0.25);
-@define-color osd_button_bg_insensitive_active alpha(@osd_bg, 0.16);
-
-@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
-@define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
-@define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14);
-
-@define-color osd_button_bg_active_a alpha(black, .9);
-@define-color osd_button_bg_active_b alpha(black, 0.4);
-@define-color osd_button_bg_active_c alpha(black, 0);
-
-@define-color osd_button_bg_backdrop alpha(@osd_bg, 0.18);
-@define-color osd_button_bg_backdrop_hover alpha(@osd_bg, 0.25);
-@define-color osd_button_bg_backdrop_active alpha(@osd_bg, 0.35);
-@define-color osd_button_bg_backdrop_insensitive alpha(@osd_bg, 0.08);
-
-@define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
-@define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
-
-@define-color osd_button_fg shade(@osd_fg, 0.80);
-@define-color osd_button_fg_hover shade(@osd_fg, 0.96);
-@define-color osd_button_fg_active shade(@osd_fg, 1.10);
-@define-color osd_button_fg_insensitive shade(@osd_fg, 0.70);
-
-@define-color osd_button_border alpha(@osd_highlight, 0.40);
-@define-color osd_button_border_active alpha(@osd_highlight, 0.8);
-@define-color osd_button_inset shade(@osd_fg, 0.67);
-@define-color osd_button_shadow alpha(black, 0.35);
-
-@define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
-@define-color osd_scale_trough_bg_color alpha(shade(@core_color_b, 0.35), 0.4);
-@define-color osd_scale_trough_highlight_bg_color alpha(shade(@core_color_a, 1.00), 0.4);
-
-@define-color osd_view_bg alpha(@osd_bg, 0.60);
-@define-color osd_view_bg_backdrop alpha(@osd_bg_backdrop, 0.60);
-
-@define-color osd_scrollbar_trough shade(@osd_base, 1.70);
-@define-color osd_scrollbar_trough_backdrop shade(@osd_base_backdrop, 1.40);
-
-@define-color osd_scrollbar_slider shade(@osd_scrollbar_trough, 1.50);
-@define-color osd_scrollbar_slider_prelight shade(@osd_scrollbar_trough, 1.80);
-@define-color osd_scrollbar_slider_active shade(@osd_scrollbar_trough, 2.10);
-@define-color osd_scrollbar_slider_backdrop shade(@osd_scrollbar_trough_backdrop, 1.50);
-
-/***************
- * progressbar *
- ***************/
-
-@define-color progressbar_border_color mix(#6a6a6a, shade(@core_color_a, 0.75), 0.80);
-@define-color progressbar_pattern_color @progressbar_border_color;
-
-@define-color progressbar_bg_color @core_color_a;
-
-@define-color progressbar_gradient_a @progressbar_bg_color;
-@define-color progressbar_gradient_b @menubar_menuitem_hover_gradient_b;
-@define-color progressbar_gradient_c @menubar_menuitem_hover_gradient_c;
-@define-color progressbar_gradient_d @menubar_menuitem_hover_gradient_d;
-
-/*********
- * scale *
- *********/
-
-@define-color scale_mark_color @border_color;
-@define-color scale_progressbar_bg_color @scale_trough_highlight_gradient_b;
-
-@define-color scale_trough_border_color shade(@core_color_b, 0.56);
-@define-color scale_trough_bg_color shade(@core_color_b, 0.90);
-
-/* trough highlight */
-
-@define-color scale_trough_highlight_border_color mix(#2b2b2b, shade(@core_color_a, 0.75), 0.80);
-@define-color scale_trough_highlight_bg_color shade(@core_color_a, 0.92);
-
-/* trough insensitive */
-
-@define-color scale_trough_insensitive_border_color @insensitive_border_color;
-@define-color scale_trough_insensitive_bg_color shade(@core_color_b, 0.97);
-
-/* trough highlight insensitive */
-
-@define-color scale_trough_highlight_insensitive_border_color mix(#6a6a6a, shade(@core_color_a, 0.88), 0.90);
-@define-color scale_trough_highlight_insensitive_bg_color shade(@core_color_a, 1.20);
-
-/*************
- * scrollbar *
- *************/
-
-/* junction */
-
-@define-color scrollbars_junction_bg_color @theme_bg_color;
-
-/* trough */
-
-@define-color scrollbar_trough_border_color shade(@core_color_b, 0.67);
-
-@define-color scrollbar_trough_gradient_a shade(@core_color_b, 0.86);
-@define-color scrollbar_trough_gradient_b shade(@core_color_b, 0.90);
-
-/* slider */
-
-@define-color scrollbar_slider_bg_color shade(@core_color_a, 0.99);
-
-@define-color scrollbar_slider_gradient_a @scrollbar_slider_bg_color;
-@define-color scrollbar_slider_gradient_b shade(@core_color_a, 0.96);
-@define-color scrollbar_slider_gradient_c shade(@core_color_a, 0.92);
-@define-color scrollbar_slider_gradient_d shade(@core_color_a, 0.88);
-
-@define-color scrollbar_slider_border_color mix(#000000, shade(@core_color_a, 0.72), 0.95);
-
-@define-color scrollbar_slider_inner_border_color shade(@core_color_a, 1.04);
-
-/* slider hover */
-
-@define-color scrollbar_slider_hover_bg_color shade(@core_color_a, 1.03);
-
-@define-color scrollbar_slider_hover_gradient_a @scrollbar_slider_hover_bg_color;
-@define-color scrollbar_slider_hover_gradient_b shade(@core_color_a, 0.99);
-@define-color scrollbar_slider_hover_gradient_c shade(@core_color_a, 0.96);
-@define-color scrollbar_slider_hover_gradient_d shade(@core_color_a, 0.91);
-
-/* button */
-
-@define-color scrollbar_button_color @theme_fg_color;
-@define-color scrollbar_button_insensitive_color @internal_element_insensitive_color;
-@define-color scrollbar_button_border_color shade(@core_color_b, 0.56);
-
-@define-color scrollbar_button_gradient_a shade(@core_color_b, 1.07);
-@define-color scrollbar_button_gradient_b shade(@core_color_b, 1.02);
-@define-color scrollbar_button_gradient_c shade(@core_color_b, 0.99);
-@define-color scrollbar_button_gradient_d shade(@core_color_b, 0.95);
-
-/* button hover */
-
-@define-color scrollbar_button_hover_gradient_a shade(@core_color_b, 1.07);
-@define-color scrollbar_button_hover_gradient_b shade(@core_color_b, 1.05);
-@define-color scrollbar_button_hover_gradient_c shade(@core_color_b, 1.02);
-@define-color scrollbar_button_hover_gradient_d shade(@core_color_b, 0.97);
-
-/* button active */
-
-@define-color scrollbar_button_active_gradient_a shade(@core_color_b, 0.95);
-@define-color scrollbar_button_active_gradient_b shade(@core_color_b, 0.92);
-@define-color scrollbar_button_active_gradient_c shade(@core_color_b, 0.89);
-@define-color scrollbar_button_active_gradient_d shade(@core_color_b, 0.85);
-
-/***********
- * sidebar *
- ***********/
-
-@define-color sidebar_bg_color @theme_base_color;
-@define-color gtkassistant_sidebar_border_color @border_color;
-
-/**************
- * spinbutton *
- **************/
-
-@define-color spinbutton_border_color @border_color;
-
-/**********
- * switch *
- **********/
-
-@define-color switch_color shade(@core_color_b, 0.45);
-
-@define-color switch_slider_border_color @progressbar_border_color;
-
-@define-color switch_slider_bg_color @scrollbar_slider_bg_color;
-
-@define-color switch_slider_gradient_a @switch_slider_bg_color;
-@define-color switch_slider_gradient_b @scrollbar_slider_gradient_b;
-@define-color switch_slider_gradient_c @scrollbar_slider_gradient_c;
-@define-color switch_slider_gradient_d @scrollbar_slider_gradient_d;
-
-/* active */
-
-@define-color switch_trough_active_color @theme_base_color;
-
-@define-color switch_trough_active_gradient_a @menubar_menuitem_hover_border_color;
-@define-color switch_trough_active_gradient_b shade(@core_color_a, 1.12);
-
-/* insensitive */
-
-@define-color switch_slider_insensitive_bg_color @button_insensitive_gradient_a;
-
-@define-color switch_slider_insensitive_gradient_a @switch_slider_insensitive_bg_color;
-@define-color switch_slider_insensitive_gradient_b @button_insensitive_gradient_b;
-@define-color switch_slider_insensitive_gradient_c @button_insensitive_gradient_c;
-@define-color switch_slider_insensitive_gradient_d @button_insensitive_gradient_d;
-
-/***********
- * toolbar *
- ***********/
-
-@define-color toolbar_border_top_color shade(@core_color_b, 0.82);
-@define-color toolbar_inner_border_color @theme_base_color;
-@define-color toolbar_border_bottom_color @toolbar_border_top_color;
-
-@define-color toolbar_gradient_a shade(@core_color_b, 1.04);
-@define-color toolbar_gradient_b shade(@core_color_b, 1.01);
-@define-color toolbar_gradient_c @core_color_b;
-@define-color toolbar_gradient_d shade(@core_color_b, 0.97);
-
-/***********
- * tooltip *
- ***********/
-
-@define-color theme_tooltip_border_color shade(@theme_tooltip_bg_color, 0.60);
-
-/**********
- * trough *
- **********/
-
-@define-color trough_gradient_a shade(@core_color_b, 0.81);
-@define-color trough_gradient_b shade(@core_color_b, 0.90);
-
-/************************
- * overshoot/undershoot *
- ************************/
-
-@define-color overshoot_bg_color alpha (@theme_selected_bg_color, 0.35);
-@define-color overshoot_backdrop_bg_color @theme_selected_bg_color;
-
-/**********
- * WM *
- **********/
-
-@define-color wm_shadow alpha(black, 0.5);
-@define-color wm_border alpha(black,0.18);
-@define-color wm_bg_a shade (@theme_base_color, 1.0);
-@define-color wm_bg_b @theme_bg_color;
-@define-color wm_csd_solid_border_color shade (@theme_selected_bg_color, 0.55);
-
-/***********
- * imports *
- ***********/
-
-@import url("gtk-widgets-img.css");
-@import url("gtk-widgets.css");
-@import url("applications.css");
-@import url("mate-applications.css");
-@import url("other-applications.css");
-
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile.am b/desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile.am
deleted file mode 100644
index 80bdbb25..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-THEME_NAME=TraditionalOkTest
-
-themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0/img
-
-theme_DATA = \
-	border-error.svg \
-	border-focused-ptb.svg \
-	border-focused.svg \
-	border-focused-switch.svg \
-	border-gnome-panel-button.svg \
-	border-inline-button.svg \
-	border-insensitive.svg \
-	border.svg \
-	checkbox-checked-hover.png \
-	checkbox-checked-insensitive.png \
-	checkbox-checked.png \
-	checkbox-mixed-hover.png \
-	checkbox-mixed-insensitive.png \
-	checkbox-mixed.png \
-	checkbox-unchecked-hover.png \
-	checkbox-unchecked-insensitive.png \
-	checkbox-unchecked.png \
-	menuitem-checkbox-checked-hover.png \
-	menuitem-checkbox-checked-insensitive.png \
-	menuitem-checkbox-checked.png \
-	menuitem-checkbox-hover.png \
-	menuitem-checkbox-insensitive.png \
-	menuitem-checkbox-mixed-hover.png \
-	menuitem-checkbox-mixed-insensitive.png \
-	menuitem-checkbox-mixed.png \
-	menuitem-checkbox.png \
-	menuitem-radio-checked-hover.png \
-	menuitem-radio-checked-insensitive.png \
-	menuitem-radio-checked.png \
-	menuitem-radio-hover.png \
-	menuitem-radio-insensitive.png \
-	menuitem-radio.png \
-	pane-separator-grip-horz.png \
-	pane-separator-grip-vert.png \
-	radio-checked-hover.png \
-	radio-checked-insensitive.png \
-	radio-checked.png \
-	radio-mixed-hover.png \
-	radio-mixed-insensitive.png \
-	radio-mixed.png \
-	radio-unchecked-hover.png \
-	radio-unchecked-insensitive.png \
-	radio-unchecked.png \
-	resize-grip.png \
-	scale-slider-horz-hover.png \
-	scale-slider-horz-insensitive.png \
-	scale-slider-horz.png \
-	scale-slider-vert-hover.png \
-	scale-slider-vert-insensitive.png \
-	scale-slider-vert.png \
-	slider-horz-grip.png \
-	slider-vert-grip.png
-
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg
deleted file mode 100755
index 6532d220..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-error.svg
+++ /dev/null
@@ -1,104 +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"
-   width="16px"
-   height="16px"
-   id="svg33222"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="border-error.svg">
-  <defs
-     id="defs33224">
-    <linearGradient
-       id="linearGradient3837">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3839" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3841" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#8e8e8e"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.768656"
-     inkscape:cx="7.9987245"
-     inkscape:cy="7.9987245"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="951"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:showpageshadow="false"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2992"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata33227">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6"
-       d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
-       id="rect17861-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssssc" />
-    <rect
-       ry="2.5"
-       rx="2.5000005"
-       y="0.5"
-       x="0.5"
-       height="13.999999"
-       width="15"
-       id="rect17861"
-       style="color:#000000;fill:none;stroke:#9b3636;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       ry="1.5"
-       rx="1.5"
-       y="1.5"
-       x="1.5"
-       height="12"
-       width="13.000001"
-       id="rect17861-6"
-       style="color:#000000;fill:none;stroke:#9b3636;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.25000000000000000" />
-  </g>
-</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-ptb.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-ptb.svg
deleted file mode 100644
index a7c88dec..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-ptb.svg
+++ /dev/null
@@ -1,98 +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"
-   sodipodi:docname="border-focused-ptb.svg"
-   inkscape:version="0.48.5 r10040"
-   version="1.1"
-   id="svg33222"
-   height="16px"
-   width="16px">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#8e8e8e"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.5625"
-     inkscape:cx="8.0448808"
-     inkscape:cy="8.3391504"
-     inkscape:current-layer="svg33222"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1122"
-     inkscape:window-height="903"
-     inkscape:window-x="-2"
-     inkscape:window-y="42"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:showpageshadow="false"
-     showborder="false">
-    <inkscape:grid
-       snapvisiblegridlinesonly="true"
-       enabled="true"
-       visible="true"
-       empspacing="5"
-       id="grid2992"
-       type="xygrid" />
-  </sodipodi:namedview>
-  <defs
-     id="defs33224">
-    <linearGradient
-       id="linearGradient3837">
-      <stop
-         id="stop3839"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3841"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata33227">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <rect
-       style="color:#000000;fill:none;stroke:#b7a886;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect17861"
-       width="15"
-       height="13.999999"
-       x="0.5"
-       y="0.5"
-       rx="2.5000005"
-       ry="2.5" />
-    <rect
-       style="color:#000000;fill:none;stroke:#cccccc;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.25"
-       id="rect17861-6"
-       width="13.000001"
-       height="12"
-       x="1.5"
-       y="1.5"
-       rx="1.5"
-       ry="1.5" />
-  </g>
-</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-switch.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-switch.svg
deleted file mode 100644
index a4da0cd8..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused-switch.svg
+++ /dev/null
@@ -1,95 +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"
-   width="16px"
-   height="16px"
-   id="svg33222"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="border-focused-switch.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#8e8e8e"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.93732"
-     inkscape:cy="9.5803639"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="674"
-     inkscape:window-height="512"
-     inkscape:window-x="650"
-     inkscape:window-y="313"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:showpageshadow="false"
-     showborder="false">
-    <inkscape:grid
-       snapvisiblegridlinesonly="true"
-       enabled="true"
-       visible="true"
-       empspacing="5"
-       id="grid2992"
-       type="xygrid" />
-  </sodipodi:namedview>
-  <defs
-     id="defs33224">
-    <linearGradient
-       id="linearGradient3837">
-      <stop
-         id="stop3839"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3841"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata33227">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       sodipodi:nodetypes="cssssc"
-       inkscape:connector-curvature="0"
-       id="rect17861-5"
-       d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6" />
-    <rect
-       style="color:#000000;fill:none;stroke:#fdad5c;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect17861"
-       width="15"
-       height="13.999999"
-       x="0.5"
-       y="0.5"
-       rx="2.5000005"
-       ry="2.5" />
-  </g>
-</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused.svg
deleted file mode 100644
index 19338aa2..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-focused.svg
+++ /dev/null
@@ -1,104 +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"
-   width="16px"
-   height="16px"
-   id="svg33222"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="border-focused.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#8e8e8e"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.81232"
-     inkscape:cy="9.5803639"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1132"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:showpageshadow="false"
-     showborder="false">
-    <inkscape:grid
-       snapvisiblegridlinesonly="true"
-       enabled="true"
-       visible="true"
-       empspacing="5"
-       id="grid2992"
-       type="xygrid" />
-  </sodipodi:namedview>
-  <defs
-     id="defs33224">
-    <linearGradient
-       id="linearGradient3837">
-      <stop
-         id="stop3839"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3841"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata33227">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       sodipodi:nodetypes="cssssc"
-       inkscape:connector-curvature="0"
-       id="rect17861-5"
-       d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4"
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6" />
-    <rect
-       style="color:#000000;fill:none;stroke:#fdad5c;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect17861"
-       width="15"
-       height="13.999999"
-       x="0.5"
-       y="0.5"
-       rx="2.5000005"
-       ry="2.5" />
-    <rect
-       style="color:#000000;fill:none;stroke:#c8daef;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.80000000000000004"
-       id="rect17861-6"
-       width="13.000001"
-       height="12"
-       x="1.5"
-       y="1.5"
-       rx="1.5"
-       ry="1.5" />
-  </g>
-</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-gnome-panel-button.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-gnome-panel-button.svg
deleted file mode 100755
index bcc83d8d..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-gnome-panel-button.svg
+++ /dev/null
@@ -1,112 +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"
-   width="16px"
-   height="16px"
-   id="svg33222"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="0.svg">
-  <defs
-     id="defs33224">
-    <linearGradient
-       id="linearGradient4410-4-9-7-9">
-      <stop
-         style="stop-color:#fbfcfb;stop-opacity:1;"
-         offset="0"
-         id="stop4412-6-7-4-4" />
-      <stop
-         style="stop-color: rgb(221, 222, 221); stop-opacity: 1;"
-         offset="1"
-         id="stop4414-9-8-8-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5378-2-93"
-       id="linearGradient17869"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.59659086,0,0,0.59090912,-423.94512,-57.054903)"
-       x1="220"
-       y1="304"
-       x2="220"
-       y2="336.06244" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5378-2-93">
-      <stop
-         style="stop-color:#f4f6f4;stop-opacity:1"
-         offset="0"
-         id="stop5380-6-3" />
-      <stop
-         style="stop-color:#d7dad7;stop-opacity:1"
-         offset="1"
-         id="stop5382-06-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4410-4-9-7-9"
-       id="linearGradient34952"
-       x1="7.9695358"
-       y1="0.96953601"
-       x2="7.9695358"
-       y2="14.937024"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.88240352,0,0,0.88240352,0.9407721,0.9407716)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.5625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="948"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     showborder="true"
-     fit-margin-top="0" />
-  <metadata
-     id="metadata33227">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       ry="2.2060091"
-       rx="2.2060091"
-       y="1.3819733"
-       x="1.3819733"
-       height="13.236053"
-       width="13.236053"
-       id="rect17861"
-       style="color:#000000;fill:none;stroke:#918e8c;stroke-width:0.88240348999999996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-inline-button.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-inline-button.svg
deleted file mode 100644
index 76adc2c9..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-inline-button.svg
+++ /dev/null
@@ -1,74 +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"
-   width="16px"
-   height="16px"
-   id="svg12251"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="entry-border-focused-dark.svg">
-  <defs
-     id="defs12253" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="2.9655938"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1216"
-     inkscape:window-height="739"
-     inkscape:window-x="5"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata12256">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
-       id="rect5836"
-       width="15.000001"
-       height="15"
-       x="0.49999997"
-       y="-15.5"
-       rx="2.2980974"
-       ry="2.2980971"
-       transform="scale(1,-1)" />
-    <rect
-       transform="matrix(0,1,-1,0,0,0)"
-       style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new"
-       id="rect6042"
-       width="1"
-       height="12"
-       x="1"
-       y="-14" />
-  </g>
-</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-insensitive.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-insensitive.svg
deleted file mode 100644
index 76adc2c9..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border-insensitive.svg
+++ /dev/null
@@ -1,74 +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"
-   width="16px"
-   height="16px"
-   id="svg12251"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="entry-border-focused-dark.svg">
-  <defs
-     id="defs12253" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="2.9655938"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1216"
-     inkscape:window-height="739"
-     inkscape:window-x="5"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata12256">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
-       id="rect5836"
-       width="15.000001"
-       height="15"
-       x="0.49999997"
-       y="-15.5"
-       rx="2.2980974"
-       ry="2.2980971"
-       transform="scale(1,-1)" />
-    <rect
-       transform="matrix(0,1,-1,0,0,0)"
-       style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new"
-       id="rect6042"
-       width="1"
-       height="12"
-       x="1"
-       y="-14" />
-  </g>
-</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg b/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg
deleted file mode 100644
index 646f882d..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/border.svg
+++ /dev/null
@@ -1,92 +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"
-   width="16px"
-   height="16px"
-   id="svg11633"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="entry-border-normal-dark.svg">
-  <defs
-     id="defs11635">
-    <linearGradient
-       id="linearGradient3751">
-      <stop
-         style="stop-color:#2d2d2d;stop-opacity:1;"
-         offset="0"
-         id="stop3753" />
-      <stop
-         style="stop-color:#525258;stop-opacity:1;"
-         offset="1"
-         id="stop3755" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3751"
-       id="linearGradient3757"
-       x1="0.49999997"
-       y1="-0.5"
-       x2="0.49999997"
-       y2="-15.5"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.24"
-     inkscape:cx="10.506099"
-     inkscape:cy="8.1522251"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1065"
-     inkscape:window-height="814"
-     inkscape:window-x="301"
-     inkscape:window-y="155"
-     inkscape:window-maximized="0"
-     inkscape:object-nodes="true" />
-  <metadata
-     id="metadata11638">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       transform="scale(1,-1)"
-       ry="3"
-       rx="3"
-       y="-15.5"
-       x="0.49999997"
-       height="15"
-       width="15.000001"
-       id="rect5760"
-       style="fill:none;stroke:url(#linearGradient3757);stroke-width:0.99999988;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
-       inkscape:export-filename="/home/cosimoc/Sources/Checkouts/gnome-themes-standard/themes/Adwaita/gtk-3.0/assets/entry-normal-border.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-hover.png
deleted file mode 100644
index ab2e56bd..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-insensitive.png
deleted file mode 100644
index ca4ad904..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked.png
deleted file mode 100644
index 25370da6..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-checked.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-hover.png
deleted file mode 100644
index 10b8c27b..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-insensitive.png
deleted file mode 100644
index 8b84e388..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed.png
deleted file mode 100644
index f68af349..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-mixed.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-hover.png
deleted file mode 100644
index 42ab9b38..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-insensitive.png
deleted file mode 100644
index 56d6a6cc..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked.png
deleted file mode 100644
index 5c315ff0..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/checkbox-unchecked.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-hover.png
deleted file mode 100644
index b4372877..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png
deleted file mode 100644
index 70c02000..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked.png
deleted file mode 100644
index 2191b1d7..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-checked.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-hover.png
deleted file mode 100644
index 704444a4..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-insensitive.png
deleted file mode 100644
index 2f387960..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-hover.png
deleted file mode 100644
index d5686f7e..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
deleted file mode 100644
index 882b675b..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed.png
deleted file mode 100644
index 15b05201..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox-mixed.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox.png
deleted file mode 100644
index 69e491b5..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-checkbox.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-hover.png
deleted file mode 100644
index d92ebe5f..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-insensitive.png
deleted file mode 100644
index d8bd994d..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked.png
deleted file mode 100644
index 717f0892..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-checked.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-hover.png
deleted file mode 100644
index 3beafb40..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-insensitive.png
deleted file mode 100644
index d94dfd54..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio.png
deleted file mode 100644
index aba5c767..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/menuitem-radio.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-horz.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-horz.png
deleted file mode 100755
index 2670deba..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-horz.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-vert.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-vert.png
deleted file mode 100755
index 6358b068..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/pane-separator-grip-vert.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-hover.png
deleted file mode 100644
index 53eebea9..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-insensitive.png
deleted file mode 100644
index 46e46c25..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked.png
deleted file mode 100644
index 6250c17f..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-checked.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-hover.png
deleted file mode 100644
index 9f3c2eec..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-insensitive.png
deleted file mode 100644
index bf64ef22..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed.png
deleted file mode 100644
index 556083f0..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-mixed.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-hover.png
deleted file mode 100644
index 7e9bfcdf..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-insensitive.png
deleted file mode 100644
index e9d18a2f..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked.png
deleted file mode 100644
index e903a422..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/radio-unchecked.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/resize-grip.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/resize-grip.png
deleted file mode 100755
index 3bd6e607..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/resize-grip.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-hover.png
deleted file mode 100755
index a2a1cfd2..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-insensitive.png
deleted file mode 100755
index 9319b7b0..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz.png
deleted file mode 100755
index 355b9d6b..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-horz.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-hover.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-hover.png
deleted file mode 100755
index acfee6b2..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-hover.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-insensitive.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-insensitive.png
deleted file mode 100755
index 23402339..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert-insensitive.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert.png
deleted file mode 100755
index acc04350..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/scale-slider-vert.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-horz-grip.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-horz-grip.png
deleted file mode 100755
index 313c11dc..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-horz-grip.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-vert-grip.png b/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-vert-grip.png
deleted file mode 100755
index 4b5a55a3..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/img/slider-vert-grip.png
+++ /dev/null
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
deleted file mode 100644
index 3ec81844..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/mate-applications.css
+++ /dev/null
@@ -1,542 +0,0 @@
-/************
- * Caja *
- ************/
-
-/* caja sidebar */
-CajaWindow FMTreeView .view,
-CajaWindow CajaNotesViewer .view,
-CajaWindow CajaPlacesSidebar .view,
-CajaWindow CajaHistorySidebar .view,
-CajaWindow CajaEmblemSidebar .frame,
-CajaWindow CajaInformationPanel .vertical {
-	background-color: shade (@theme_base_color, 1.00);
-	color: @theme_fg_color;
-}
-
-/* moved eject button to left better for overlay scrollbars */
-CajaWindow CajaPlacesSidebar .view row {
-    padding: 0px 4px 0px 0px;
-}
-
-/* better for overlay scrollbars */
-CajaWindow FMTreeView .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaNotesViewer .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaPlacesSidebar .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaEmblemSidebar .vertical.scrollbar.overlay-indicator,
-CajaWindow CajaHistorySidebar .vertical.scrollbar.overlay-indicator {
-	-GtkRange-slider-width: 13;
-}
-
-/* ComboBox views */
-CajaWindow .toolbar.horizontal GtkComboBox .button,
-CajaWindow .primary-toolbar.toolbar.horizontal GtkComboBox .button {
-    padding: 4px 4px;
-}
-
-.caja-canvas-item,
-EelEditableLabel.entry {
-	border-radius: 3px;
-}
-
-EelEditableLabel.entry,
-EelEditableLabel.entry:focus {
-   border-image: none;
-   border-width: 1px;
-   border-color: @theme_fg_color;
-   box-shadow: none;
-   border-radius: 3px;
-   text-shadow: none;
-}
-
-/* desktop */
-CajaDesktopWindow.background .caja-canvas-item {
-	color: @theme_sectected_fg_color;
-	text-shadow: 1px 1px alpha (@theme_fg_color, 0.8);
-}
-
-CajaDesktopWindow.background .caja-canvas-item:active,
-CajaDesktopWindow.background .caja-canvas-item:prelight,
-CajaDesktopWindow.background .caja-canvas-item:selected {
-	text-shadow: none;
-    color: @theme_sectected_fg_color;
-}
-
-/* view */
-CajaNavigationWindow.background .view.caja-canvas-item {
-    color: @theme_fg_color;
-}
-
-CajaNavigationWindow.background .view.caja-canvas-item:selected {
-    color: @theme_sectected_fg_color;
-}
-
-/***************
- * mate-panel *
- ***************/
-
-.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelFrame,
-PanelAppletFrame,
-MatePanelAppletFrameDBus,
-MatePanelAppletContainer,
-MatePanelApplet {
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_gradient_a),
-	                  color-stop (0.50, @menubar_gradient_b),
-	                  to (@menubar_gradient_c));
-	background-color: @theme_bg_color;
-	padding: 0px;
-	color: @theme_fg_color;
-	text-shadow: none;
-}
-
-/* workaround to avoid unwanted black frames if switching compositor on/off */
-.mate-panel-menu-bar .window-frame.csd.popup {
-    box-shadow: none;
-}
-
-/* set selected menubar button */
-PanelMenuBar.menubar .menuitem:hover {
-	background-color: shade(@theme_selected_bg_color, 1.1);
-	border-style: solid;
-	border-width: 1px 1px 0px;
-	border-color: @menubar_menuitem_hover_border_color;
-	border-radius: 3px 3px 0 0;
-	color: @menubar_menuitem_hover_color;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_menuitem_hover_gradient_a),
-	                  to (@menubar_menuitem_hover_gradient_d));
-}
-
-/* set menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem {
-	background-image: none;
-	color: @theme_text_color;
-	border-style: solid;
-	border-width: 1px;
-	border-radius: 3px;
-	border-color: @theme_base_color;
-	padding: 6px 5px;
-}
-
-/* set selected menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem:checked:hover,
-PanelMenuBar.menubar .menu .menuitem:active:hover,
-PanelMenuBar.menubar .menu .menuitem:hover {
-	background-image: none;
-	color: @theme_selected_fg_color;
-	border-style: solid;
-	border-width: 1px;
-	border-radius: 3px;
-	border-color: alpha(@theme_selected_bg_color, 0.1);
-}
-
-MatePanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: none;
-	color: shade (@theme_bg_color, 0.75);
-	text-shadow: none;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button {
-	/* Due to a bug somewhere in gtk or cairo,
-	   a padding of zero (or even one) doesn't work always!!! */
-	padding: 0px;
-
-	border-radius: 3px;
-	border-width: 1px;
-	border-style: solid;
-	text-shadow: none;
-
-	color: @theme_fg_color;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@button_gradient_a),
-	                  color-stop (0.50, @button_gradient_b),
-	                  color-stop (0.50, @button_gradient_c),
-	                  to (@button_gradient_d));
-}
-
-MatePanelApplet .button:checked:hover,
-MatePanelApplet .button:checked,
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
-	border-style: solid;
-	background-image: linear-gradient(to bottom,
-	                  @button_active_gradient_a,
-	                  @button_active_gradient_b 3px,
-	                  @button_active_gradient_c 4px,
-	                  @button_active_gradient_d 50%,
-	                  @button_active_gradient_e 50%,
-	                  @button_active_gradient_f);
-}
-
-MatePanelApplet .button:hover {
-	border-style: solid;
-	background-image: linear-gradient(to bottom,
-	                                  @button_gradient_color_b,
-	                                  @button_gradient_color_a);
-}
-
-/*Wncklist */
-WnckTasklist .button {
-	padding: 0px;
-	border-radius: 3px;
-	border-width: 1px;
-	border-style: solid;
-	text-shadow: none;
-
-	color: @theme_fg_color;
-	background-color: transparent;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@button_gradient_a),
-	                  color-stop (0.50, @button_gradient_b),
-	                  color-stop (0.50, @button_gradient_c),
-	                  to (@button_gradient_d));
-}
-
-WnckTasklist .button:checked:hover,
-WnckTasklist .button:checked,
-WnckTasklist .button:active:hover,
-WnckTasklist .button:active {
-	border-style: solid;
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-	                  @button_active_gradient_a,
-	                  @button_active_gradient_b 3px,
-	                  @button_active_gradient_c 4px,
-	                  @button_active_gradient_d 50%,
-	                  @button_active_gradient_e 50%,
-	                  @button_active_gradient_f);
-}
-
-WnckTasklist .button:hover {
-	border-style: solid;
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-	                  @button_hover_gradient_c);
-}
-
-/* set selected button WnckSelector */
-.mate-panel-window-menu-menu-bar .menuitem:hover,
-MatePanelApplet > WnckSelector.menubar .menuitem:hover {
-	color: @theme_fg_color;
-	border-style: solid;
-	background-image: linear-gradient(to bottom,
-	                  @button_active_gradient_a,
-	                  @button_active_gradient_b 3px,
-	                  @button_active_gradient_c 4px,
-	                  @button_active_gradient_d 50%,
-	                  @button_active_gradient_e 50%,
-	                  @button_active_gradient_f);
-}
-
-/* set WnckSelector selected menuitem */
-.mate-panel-window-menu-menu-bar .menu .menuitem:hover,
-MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover {
-	background-image: none;
-	background-color: shade(@theme_selected_bg_color, 1.1);
-	color: @theme_text_color;
-	border-style: solid;
-	border-width: 1px;
-	border-radius: 3px;
-	border-image: url("assets/menu-border.svg") 2 / 2px stretch;
-	/*border-color: alpha(@theme_selected_bg_color, 0.1);*/
-}
-
-ClockBox,
-.mate-panel-menu-bar.menubar,
-MatePanelApplet > GtkMenuBar.menubar {
-	font: normal;
-}
-
-WnckPager {
-	background-image: none;
-	border-color: transparent;
-	background-color: shade(@theme_bg_color, 0.9);
-	text-shadow: none;
-}
-
-/* prelight of WnckPager */
-WnckPager:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.86),
-		shade (@theme_selected_bg_color, 1.0));
-	background-color: @theme_base_color;
-}
-
-/* Classic icon style */
-.mate-panel-menu-bar {
-	-PanelMenuBar-icon-visible: true;
-}
-
-/* no background for icon-padding area */
-GtkTrayIcon.background {
-    background-color: transparent;
-}
-
-NaTrayApplet {
-	background-image: none;
-	background-color: transparent;
-	padding: 0;
-	text-shadow: none;
-	-NaTrayApplet-icon-padding: 3;
-	-NaTrayApplet-icon-size: 16;
-}
-
-/* volume applet, brightness applet */
-.mate-panel-applet-slider {
-    background: transparent;
-}
-
-.mate-panel-applet-slider .frame {
-    background-color: @theme_bg_color;
-    border-image: none;
-    border-style: solid;
-    border-radius:2px;
-    padding: 0px;
-    margin: 0px;
-}
-
-.mate-panel-applet-slider .frame .frame{
-    background-color:transparent;
-    border-style: none;
-    box-shadow: none;
-}
-
-.mate-panel-applet-slider .frame .button {
-    color: @theme_fg_color;
-}
-
-/******************
- * mate-terminal *
- ******************/
-
-TerminalWindow .entry {
-    -TerminalWindow-background-darkness: 0.95;
-	background-color: @theme_base_color;
-	color: @theme_fg_color;
-}
-
-/***********************
- * Mate-Control-Center *
- ***********************/
-
-/* background */
-ShellWindow AppResizer .view {
-    background-color: @theme_base_color;
-}
-
-ShellWindow .button.flat {
-    border-image: none;
-    padding: 3px;
-}
-
-/* button hover of applications */
-ShellWindow GtkScrolledWindow .button.flat:hover {
-    background-color: transparent;
-    padding: 3px;
-}
-
-/****************
- * Pluma *
- ****************/
-
-PlumaFloatingSlider .entry.not-found:focus {
-	border-image: url("img/border-error.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-}
-
-PlumaCloseButton.button.flat,
-PlumaCloseButton.button.flat:hover,
-PlumaCloseButton:prelight.button.flat,
-PlumaCloseButton:prelight.button.flat:hover {
-    padding: 0px;
-}
-
-/* close button tab text view */
-PlumaWindow .vertical .horizontal .vertical .notebook .horizontal PlumaCloseButton.button.flat,
-PlumaWindow .vertical .horizontal .vertical .notebook .horizontal PlumaCloseButton.button.flat:hover {
-    padding: 2px;
-}
-
-/* Pluma status bar */
-PlumaWindow .button.flat,
-PlumaWindow .button.flat:hover {
-    border-style: none;
-    border-image: none;
-    padding: 2px 5px;
-}
-
-/* Printpreview */
-PlumaPrintPreview.vertical .toolbar.horizontal {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-	                  @toolbar_gradient_a 2px,
-	                  @toolbar_gradient_b 50%,
-	                  @toolbar_gradient_c 50%,
-	                  @toolbar_gradient_d);
-	border-width: 1px 0 1px 1px;
-	border-radius: 0;
-	border-style: solid;
-	border-top-color: @toolbar_border_top_color;
-	border-bottom-color: @toolbar_border_bottom_color;
-    padding: 0px;
-}
-
-PlumaPrintPreview.vertical GtkLayout {
-    background-color: @theme_base_color;
-}
-
-PlumaPrintPreview.vertical .toolbar.horizontal GtkToolItem .horizontal .entry {
-    padding: 2px 6px;
-}
-
-PlumaPrintPreview.vertical .toolbar.horizontal .button.image-button,
-PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.image-button {
-    background-color: transparent;
-    padding: 0px;
-}
-
-PlumaPrintPreview.vertical .toolbar.horizontal .button.text-button,
-PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.text-button {
-    background-color: transparent;
-    padding: 0px 8px;
-    border-radius: 2px;
-}
-
-/* sidebar file-browser */
-PlumaPanel.vertical .horizontal .horizontal GtkImage {
-    padding: 0px;
-}
-
-PlumaPanel.vertical .notebook {
-	border-width: 0px;
-	border-radius: 0px;
-	border-style: none;
-}
-
-PlumaPanel.vertical .notebook.header.frame {
-	border-width: 0px 1px 1px 0px;
-	border-color: @border_color;
-	border-radius: 0px;
-	border-style: solid;
-}
-
-PlumaFileBrowserWidget.vertical GtkExpander .vertical .entry {
-    padding: 3px;
-}
-
-PlumaFileBrowserWidget.vertical .toolbar.horizontal {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-	                  @toolbar_gradient_a 2px,
-	                  @toolbar_gradient_b 50%,
-	                  @toolbar_gradient_c 50%,
-	                  @toolbar_gradient_d);
-	border-width: 1px 1px 1px 1px;
-	border-radius: 1px;
-	border-style: solid;
-	border-top-color: @toolbar_border_top_color;
-	border-bottom-color: @toolbar_border_bottom_color;
-    padding: 5px;
-}
-
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.menu-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.image-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.menu-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.image-button {
-    padding: 3px;
-    background-color: transparent;
-}
-
-/************
- * Engrampa *
- ************/
-
-FrWindow .horizontal.toolbar .button.flat.image-button:insensitive {
-    background-image: none;
-}
-
-/* close button sidebar */
-FrWindow GtkTable .horizontal .vertical .frame .horizontal .flat.button {
-    border-radius: 4px;
-    padding: 0px;
-}
-
-/*********
- * Atril *
- *********/
-
-EvWindow .vertical.primary-toolbar .horizontal.toolbar {
-    padding: 1px 4px;
-}
-
-EvWindow .toolbar .button,
-EvWindow .toolbar .button.flat {
-    padding: 0px 4px;
-}
-
-EvWindow .vertical.primary-toolbar .horizontal.toolbar EphyZoomControl GtkToggleButton.button,
-EvWindow .vertical.primary-toolbar .horizontal.toolbar EphyZoomControl GtkToggleButton:prelight.button {
-    padding: 8px 4px;
-    border-radius: 4px;
-}
-
-EvSidebar .flat.button {
-    border-radius: 4px;
-    padding: 4px;
-}
-
-/* atril and eom */
-EggToolbarEditor.vertical GtkScrolledWindow .frame {
-    background-color: shade (@theme_base_color, 1.0);
-    border-color: @border_color;
-    border-width: 1px;
-    border-radius: 0px;
-    border-style: solid;
-}
-
-/*******
- * Eom *
- *******/
-
-EomThumbNav .button.flat:first-child {
-    border-radius: 3px 0px 0px 3px;
-    border-width: 1px 0px 1px 1px;
-}
-
-EomThumbNav .button.flat:last-child {
-    border-radius: 0px 3px 3px 0px;
-    border-width: 1px 1px 1px 0px;
-}
-
-EomThumbNav .button.flat {
-    border-image: none;
-    border-color: @border_color;
-}
-
-EomThumbNav .button.flat:hover {
-    border-color: @focus_border_color;
-}
-
-EomThumbNav .button.flat:insensitive {
-    border-color: @insensitive_border_color;
-}
-
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/other-applications.css b/desktop-themes/TraditionalOkTest/gtk-3.0/other-applications.css
deleted file mode 100644
index 771872b2..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/other-applications.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Parole media player needs more testing!
- hopefully do not set other stuff */
-
-/* background control panel */
-GtkPaned.horizontal .vertical GtkOverlay GtkRevealer.bottom .background.horizontal.osd {
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-}
-
-/* buttons control panel */
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:hover ,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover {
-    border-style: none;
-    border-radius: 4px;
-    background-color: transparent;
-    background-image: none;
-    box-shadow: none;
-    padding: 4px 7px;
-    color: @theme_fg_color;
-}
-
-/* rhythmbox */
-
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:active,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
-	padding: 0px 6px;
-}
-
diff --git a/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini b/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini
deleted file mode 100755
index cf65fbe7..00000000
--- a/desktop-themes/TraditionalOkTest/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Settings]
-gtk-color-scheme = "base_color:#babdb6\nbg_color:#888a85\nfg_color:#000000\nselected_bg_color:#f57900\nselected_fg_color:#ffffff\ntooltip_bg_color:#EAF5B5\ntooltip_fg_color:#000000\ntext_color:#000000\nlink_color:#0000ee\nvisited_link_color:#551a8b"
-gtk-auto-mnemonics = 0
-gtk-visible-focus = automatic
-gtk-primary-button-warps-slider = false
diff --git a/desktop-themes/TraditionalOkTest/index.theme.in b/desktop-themes/TraditionalOkTest/index.theme.in
deleted file mode 100644
index b600b308..00000000
--- a/desktop-themes/TraditionalOkTest/index.theme.in
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=X-GNOME-Metatheme
-Name=TraditionalOkTest
-Comment=GTK2/3 port of Clearlooks-Phenix
-Encoding=UTF-8
-
-[X-GNOME-Metatheme]
-_Name=TraditionalOkTest
-Type=X-GNOME-Metatheme
-_Comment=Unattractive Usability
-Encoding=UTF-8
-GtkTheme=TraditionalOkTest
-MetacityTheme=TraditionalOkTest
-IconTheme=mate
-CursorTheme=mate
-CursorSize=16
-ButtonLayout=:minimize,maximize,close
diff --git a/desktop-themes/TraditionalOkTest/metacity-1/Makefile.am b/desktop-themes/TraditionalOkTest/metacity-1/Makefile.am
deleted file mode 100644
index 53dd46a2..00000000
--- a/desktop-themes/TraditionalOkTest/metacity-1/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-THEME_NAME=TraditionalOkTest
-
-themedir = $(datadir)/themes/$(THEME_NAME)/metacity-1
-
-theme_DATA = \
-	metacity-theme-1.xml
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml b/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
deleted file mode 100644
index 1f06a9a4..00000000
--- a/desktop-themes/TraditionalOkTest/metacity-1/metacity-theme-1.xml
+++ /dev/null
@@ -1,954 +0,0 @@
-<?xml version="1.0"?>
-<!-- 	$Id$	 -->
-<metacity_theme>
-<info>
-	<name>TraditionalMarine</name>
-	<author> Wolfgang Ulbrich &lt;[email protected]&gt;</author>
-	<copyright>&#194; 2013 Wolfgang Ulbrich </copyright>
-	<date>March, 2013</date>
-	<description>The Clearlooks Marine Metacity Theme</description>
-</info>
-
-<!-- ::: GEOMETRY ::: -->
-<frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false">
-	<distance name="left_width" value="4"/>
-	<distance name="right_width" value="4"/>
-	<distance name="bottom_height" value="4"/>
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="4"/>
-	<aspect_ratio name="button" value="1.0"/>
-	<distance name="title_vertical_pad" value="0"/>
-	<border name="title_border" left="2" right="2" top="4" bottom="3"/>
-	<border name="button_border" left="1" right="1" top="2" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="shaded" parent="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true"/>
-
-<frame_geometry name="normal_maximized" parent="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
-	<!-- strip frame spacing off the normal geometry when maximised -->
-	<distance name="left_width" value="0"/>
-	<distance name="right_width" value="0"/>
-	<distance name="bottom_height" value="1"/>
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="utility" title_scale="small" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
-	<distance name="left_width" value="4"/>
-	<distance name="right_width" value="4"/>
-	<distance name="bottom_height" value="4"/>
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="4"/>
-	<distance name="title_vertical_pad" value="0"/>
-	<border name="title_border" left="2" right="2" top="4" bottom="3"/>
-	<border name="button_border" left="0" right="0" top="2" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="border" has_title="false">
-	<distance name="left_width" value="3"/>
-	<distance name="right_width" value="3"/>
-	<distance name="bottom_height" value="3"/>
-	<distance name="left_titlebar_edge" value="0"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="button_width" value="0"/>
-	<distance name="button_height" value="0"/>
-	<distance name="title_vertical_pad" value="3"/>
-	<border name="title_border" left="0" right="0" top="0" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-</frame_geometry>
-
-<!-- button minimum size -->
-<constant name="Bmin" value="7"/>
-<!-- button inside padding -->
-<constant name="Bpad" value="6"/>
-
-<!-- ::: CORNERS ::: -->
-<draw_ops name="corners_outline_selected_top">
-	<!-- top left -->
-	<line color="shade/#f57900/0.6" x1="1" y1="3" x2="1" y2="3"/>
-	<line color="shade/#f57900/0.73" x1="1" y1="4" x2="1" y2="4"/>
-	<line color="shade/#f57900/0.6" x1="2" y1="2" x2="2" y2="2"/>
-	<line color="shade/#f57900/0.6" x1="3" y1="1" x2="3" y2="1"/>
-	<line color="shade/#f57900/0.73" x1="4" y1="1" x2="4" y2="1"/>
-
-	<!-- top right -->
-	<line color="shade/#f57900/0.6" x1="width-2" y1="3" x2="width-2" y2="3"/>
-	<line color="shade/#f57900/0.73" x1="width-2" y1="4" x2="width-2" y2="4"/>
-	<line color="shade/#f57900/0.6" x1="width-3" y1="2" x2="width-3" y2="2"/>
-	<line color="shade/#f57900/0.6" x1="width-4" y1="1" x2="width-4" y2="1"/>
-	<line color="shade/#f57900/0.73" x1="width-5" y1="1" x2="width-5" y2="1"/>
-</draw_ops>
-
-<draw_ops name="corners_outline_top">
-	<!-- top left -->
-	<line color="shade/#888a85/0.55" x1="1" y1="3" x2="1" y2="3"/>
-	<line color="shade/#888a85/0.68" x1="1" y1="4" x2="1" y2="4"/>
-	<line color="shade/#888a85/0.55" x1="2" y1="2" x2="2" y2="2"/>
-	<line color="shade/#888a85/0.55" x1="3" y1="1" x2="3" y2="1"/>
-	<line color="shade/#888a85/0.68" x1="4" y1="1" x2="4" y2="1"/>
-
-	<!-- top right -->
-	<line color="shade/#888a85/0.55" x1="width-2" y1="3" x2="width-2" y2="3"/>
-	<line color="shade/#888a85/0.68" x1="width-2" y1="4" x2="width-2" y2="4"/>
-	<line color="shade/#888a85/0.55" x1="width-3" y1="2" x2="width-3" y2="2"/>
-	<line color="shade/#888a85/0.55" x1="width-4" y1="1" x2="width-4" y2="1"/>
-	<line color="shade/#888a85/0.68" x1="width-5" y1="1" x2="width-5" y2="1"/>
-</draw_ops>
-
-<draw_ops name="corners_outline_selected_bottom">
-	<!-- bottom left -->
-	<line color="shade/#f57900/0.6" x1="1" y1="height-4" x2="1" y2="height-5"/>
-	<line color="shade/#f57900/0.6" x1="2" y1="height-3" x2="2" y2="height-3"/>
-	<line color="shade/#f57900/0.6" x1="2" y1="height-2" x2="4" y2="height-2"/>
-
-	<!-- bottom right -->
-	<line color="shade/#f57900/0.6" x1="width-2" y1="height-4" x2="width-2" y2="height-5"/>
-	<line color="shade/#f57900/0.6" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
-	<line color="shade/#f57900/0.6" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
-</draw_ops>
-
-<draw_ops name="corners_outline_bottom">
-	<!-- bottom left -->
-	<line color="shade/#888a85/0.55" x1="1" y1="height-4" x2="1" y2="height-5"/>
-	<line color="shade/#888a85/0.55" x1="2" y1="height-3" x2="2" y2="height-3"/>
-	<line color="shade/#888a85/0.55" x1="2" y1="height-2" x2="4" y2="height-2"/>
-
-	<!-- bottom right -->
-	<line color="shade/#888a85/0.55" x1="width-2" y1="height-4" x2="width-2" y2="height-5"/>
-	<line color="shade/#888a85/0.55" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
-	<line color="shade/#888a85/0.55" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
-</draw_ops>
-
-<draw_ops name="corners_highlight">
-	<!-- ** corner highlight for left top ** -->
-	<line color="shade/#f57900/1.18" x1="2" y1="3" x2="2" y2="4"/>
-	<line color="shade/#f57900/1.18" x1="3" y1="2" x2="4" y2="2"/>
-
-	<!-- ** corner highlight for right top ** -->
-	<line color="shade/#f57900/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
-	<line color="shade/#f57900/1.16" x1="width-5" y1="2" x2="width-4" y2="2"/>
-
-	<!-- ** corner highlight for left bottom ** -->
-	<!--<line color="shade/#888a85/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
-	<line color="shade/#888a85/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
-
-	<!-- ** corner highlight for right bottom ** -->
-	<!--<line color="shade/#888a85/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
-	<line color="shade/#888a85/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
-</draw_ops>
-
-<draw_ops name="corners_highlight_unfocused">
-	<!-- ** corner highlight for left top ** -->
-	<line color="shade/#888a85/1.05" x1="2" y1="3" x2="2" y2="4"/>
-	<line color="shade/#888a85/1.05" x1="3" y1="2" x2="4" y2="2"/>
-
-	<!-- ** corner highlight for right top ** -->
-	<line color="shade/#888a85/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
-	<line color="shade/#888a85/1.04" x1="width-5" y1="2" x2="width-4" y2="2"/>
-
-	<!-- ** corner highlight for left bottom ** -->
-	<!--<line color="shade/#888a85/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
-	<line color="shade/#888a85/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
-
-	<!-- ** corner highlight for right bottom ** -->
-	<!--<line color="shade/#888a85/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
-	<line color="shade/#888a85/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
-</draw_ops>
-
-<draw_ops name="corners_highlight_shaded">
-	<!-- ** corner highlight for left top ** -->
-	<line color="shade/#f57900/1.18" x1="2" y1="3" x2="2" y2="4"/>
-	<line color="shade/#f57900/1.18" x1="3" y1="2" x2="4" y2="2"/>
-
-	<!-- ** corner highlight for right top ** -->
-	<line color="shade/#f57900/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
-	<line color="shade/#f57900/1.16" x1="width-5" y1="2" x2="width-4" y2="2"/>
-
-	<!-- ** corner highlight for left bottom ** -->
-	<line color="shade/#f57900/1.08" x1="2" y1="height-4" x2="2" y2="height-5"/>
-	<line color="shade/#f57900/0.98" x1="3" y1="height-3" x2="4" y2="height-3"/>
-
-	<!-- ** corner highlight for right bottom ** -->
-	<line color="shade/#f57900/0.98" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
-	<line color="shade/#f57900/0.98" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
-</draw_ops>
-
-<draw_ops name="corners_highlight_shaded_unfocused">
-	<!-- ** corner highlight for left top ** -->
-	<line color="shade/#888a85/1.05" x1="2" y1="3" x2="2" y2="4"/>
-	<line color="shade/#888a85/1.05" x1="3" y1="2" x2="4" y2="2"/>
-
-	<!-- ** corner highlight for right top ** -->
-	<line color="shade/#888a85/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
-	<line color="shade/#888a85/1.04" x1="width-5" y1="2" x2="width-4" y2="2"/>
-
-	<!-- ** corner highlight for left bottom ** -->
-	<line color="shade/#888a85/1.02" x1="2" y1="height-4" x2="2" y2="height-5"/>
-	<line color="shade/#888a85/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>
-
-	<!-- ** corner highlight for right bottom ** -->
-	<line color="shade/#888a85/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
-	<line color="shade/#888a85/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
-</draw_ops>
-
-<draw_ops name="window_bg">
-	<rectangle color="#888a85" filled="true" x="0" y="0" width="width" height="height"/>
-</draw_ops>
-
-<!-- ::: BEVEL FOCUSED ::: -->
-<draw_ops name="bevel">
-	<include name="window_bg"/>
-	<!-- ** titlebar outline ** -->
-	<rectangle color="shade/#f57900/0.55" filled="false" x="0" y="0" width="width - 1" height="((title_height + 6) `max` (top_height - 2))"/>
-
-	<!-- ** 3d beveled frame ** -->
-	<line color="shade/#888a85/0.88" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
-	<line color="shade/#888a85/0.88" x1="width - 2" y1="3" x2="width - 2" y2="height - 2"/>
-	<line color="shade/#888a85/1.2" x1="3" y1="1" x2="width - 4" y2="1"/>
-	<line color="shade/#888a85/1.2" x1="1" y1="3" x2="1" y2="height - 2"/>
-
-	<line color="shade/#f57900/0.94" x1="2" y1="((title_height + 5) `max` (top_height - 3))" x2="width - 3" y2="((title_height + 5) `max` (top_height - 3))"/>
-	<line color="shade/#f57900/0.95" x1="width - 2" y1="2" x2="width - 2" y2="((title_height + 6) `max` (top_height - 2))"/>
-	<line color="shade/#f57900/1.18" x1="1" y1="1" x2="width - 2" y2="1"/>
-	<line color="shade/#f57900/1.1" x1="1" y1="2" x2="1" y2="((title_height + 5) `max` (top_height - 3))"/>
-
-	<!-- ** fancy gradient ** -->
-	<gradient type="vertical" x="2" y="top_height/2" width="width-4" height="top_height/2-1">
-		<color value="shade/#f57900/1.0"/>
-		<color value="shade/#f57900/0.94"/>
-	</gradient>
-	<gradient type="vertical" x="2" y="2" width="width-4" height="top_height/2-2">
-		<color value="shade/#f57900/1.08"/>
-		<color value="shade/#f57900/1.02"/>
-	</gradient>
-
-	<line color="shade/#f57900/0.7" x1="1" y1="((title_height + 6) `max` (top_height - 2))" x2="width - 2" y2="((title_height + 6) `max` (top_height - 2))"/>
-
-	<!-- ** border outline ** -->
-	<line color="shade/#888a85/0.45" x1="0" y1="((title_height + 6) `max` (top_height - 2))" x2="0" y2="height"/>
-	<line color="shade/#888a85/0.45" x1="width - 1" y1="((title_height + 6) `max` (top_height - 2))" x2="width - 1" y2="height"/>
-	<line color="shade/#888a85/0.45" x1="1" y1="height - 1" x2="width - 2" y2="height - 1"/>
-</draw_ops>
-
-<draw_ops name="bevel_maximized">
-	<!-- ** 3d beveled frame ** -->
-	<line color="shade/#f57900/0.55" x1="0" y1="0" x2="width" y2="0"/>
-	<line color="shade/#f57900/1.18" x1="0" y1="1" x2="width" y2="1"/>
-	<line color="shade/#f57900/0.94" x1="0" y1="((title_height + 5) `max` (top_height - 3))" x2="width" y2="((title_height + 5) `max` (top_height - 3))"/>
-
-	<!-- ** fancy gradient ** -->
-	<gradient type="vertical" x="0" y="top_height/2" width="width" height="top_height/2-1">
-		<color value="shade/#f57900/1.0"/>
-		<color value="shade/#f57900/0.94"/>
-	</gradient>
-	<gradient type="vertical" x="0" y="1" width="width" height="top_height/2-1">
-		<color value="shade/#f57900/1.08"/>
-		<color value="shade/#f57900/1.02"/>
-	</gradient>
-
-	<line color="shade/#f57900/0.7" x1="0" y1="((title_height + 6) `max` (top_height - 2))" x2="width" y2="((title_height + 6) `max` (top_height - 2))"/>
-	<line color="shade/#f57900/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
-</draw_ops>
-
-<draw_ops name="round_bevel">
-	<include name="bevel"/>
-	<include name="corners_outline_selected_top"/>
-	<!--<include name="corners_outline_bottom"/>-->
-	<include name="corners_highlight"/>
-</draw_ops>
-
-<draw_ops name="bevel_shaded">
-	<include name="bevel"/>
-	<line color="shade/#f57900/0.6" x1="0" y1="height-1" x2="width" y2="height-1"/>
-</draw_ops>
-
-<draw_ops name="round_bevel_shaded">
-	<include name="bevel"/>
-	<include name="corners_outline_selected_top"/>
-	<include name="corners_outline_selected_bottom"/>
-	<include name="corners_highlight_shaded"/>
-	<line color="shade/#f57900/0.6" x1="5" y1="height-1" x2="width-6" y2="height-1"/>
-</draw_ops>
-
-<!-- ::: BEVEL UNFOCUSED ::: -->
-<draw_ops name="bevel_unfocused">
-	<include name="window_bg"/>
-	<line color="shade/#888a85/0.88" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
-	<line color="shade/#888a85/0.88" x1="width - 2" y1="2" x2="width - 2" y2="height - 2"/>
-	<line color="shade/#888a85/1.05" x1="1" y1="1" x2="width - 2" y2="1"/>
-	<line color="shade/#888a85/1.03" x1="1" y1="2" x2="1" y2="height - 2"/>
-	<line color="shade/#888a85/0.89" x1="2" y1="((title_height + 5) `max` (top_height - 3))" x2="width - 3" y2="((title_height + 5) `max` (top_height - 3))"/>
-
-	<!-- ** fancy gradient ** -->
-	<gradient type="vertical" x="2" y="top_height/2" width="width-4" height="top_height/2-1">
-		<color value="shade/#888a85/0.93"/>
-		<color value="shade/#888a85/0.89"/>
-	</gradient>
-	<gradient type="vertical" x="2" y="2" width="width-4" height="top_height/2-2">
-		<color value="shade/#888a85/0.99"/>
-		<color value="shade/#888a85/0.95"/>
-	</gradient>
-
-	<line color="shade/#888a85/0.65" x1="1" y1="((title_height + 6) `max` (top_height - 2))" x2="width - 2" y2="((title_height + 6) `max` (top_height - 2))"/>
-	<rectangle color="shade/#888a85/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
-</draw_ops>
-
-<draw_ops name="bevel_maximized_unfocused">
-	<!-- ** 3d beveled frame ** -->
-	<line color="shade/#888a85/0.55" x1="0" y1="0" x2="width" y2="0"/>
-	<line color="shade/#888a85/1.05" x1="0" y1="1" x2="width" y2="1"/>
-	<line color="shade/#888a85/0.89" x1="0" y1="((title_height + 5) `max` (top_height - 3))" x2="width" y2="((title_height + 5) `max` (top_height - 3))"/>
-
-	<!-- ** fancy gradient ** -->
-	<gradient type="vertical" x="0" y="top_height/2" width="width" height="top_height/2-1">
-		<color value="shade/#888a85/0.93"/>
-		<color value="shade/#888a85/0.89"/>
-	</gradient>
-	<gradient type="vertical" x="0" y="2" width="width" height="top_height/2-2">
-		<color value="shade/#888a85/0.99"/>
-		<color value="shade/#888a85/0.95"/>
-	</gradient>
-
-	<line color="shade/#888a85/0.65" x1="0" y1="((title_height + 6) `max` (top_height - 2))" x2="width" y2="((title_height + 6) `max` (top_height - 2))"/>
-	<line color="shade/#888a85/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
-</draw_ops>
-
-<draw_ops name="round_bevel_unfocused">
-	<include name="bevel_unfocused"/>
-	<include name="corners_outline_top"/>
-	<!--<include name="corners_outline_bottom"/>-->
-	<include name="corners_highlight_unfocused"/>
-</draw_ops>
-
-<draw_ops name="round_bevel_unfocused_shaded">
-	<include name="bevel_unfocused"/>
-	<include name="corners_outline_top"/>
-	<include name="corners_outline_bottom"/>
-	<include name="corners_highlight_shaded_unfocused"/>
-</draw_ops>
-
-<!-- ::: BORDER ::: -->
-<draw_ops name="border">
-	<line color="shade/#888a85/0.88" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
-	<line color="shade/#888a85/0.88" x1="width - 2" y1="1" x2="width - 2" y2="height - 2"/>
-	<line color="shade/#888a85/1.2" x1="1" y1="1" x2="width - 2" y2="1"/>
-	<line color="shade/#888a85/1.2" x1="1" y1="1" x2="1" y2="height - 2"/>
-
-	<rectangle color="shade/#888a85/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
-</draw_ops>
-
-<!-- ::: TITLES ::: -->
-<draw_ops name="title_text">
-	<!--<title color="shade/#f57900/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0) + 1"/>
-	<title color="shade/#f57900/0.7" x="((3 `max` (width-title_width)) / 2)+1" y="(((height - title_height) / 2) `max` 0)"/>
-	<title color="shade/#f57900/0.7" x="((3 `max` (width-title_width)) / 2)-1" y="(((height - title_height) / 2) `max` 0)"/>
-	<title color="shade/#f57900/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0)-1"/>-->
-	<title color="blend/#000000/#000000/0.95" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
-</draw_ops>
-
-<draw_ops name="title_text_unfocused">
-	<!--<title color="shade/#888a85/1.07" x="5 `max` (width-title_width)/2+1" y="1 `max` ((height-title_height)/2)+1"/>-->
-	<title color="blend/#000000/#000000/0.65" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
-</draw_ops>
-
-<draw_ops name="title">
-	<include name="title_text"/>
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<include name="title_text_unfocused"/>
-</draw_ops>
-
-<!-- ::: BUTTONS ::: -->
-<draw_ops name="button_bg">
-	<!-- inset -->
-	<gradient type="vertical" x="0" y="3" width="width" height="height-6">
-		<color value="shade/#f57900/0.96"/>
-		<color value="shade/#f57900/1.05"/>
-	</gradient>
-
-	<line color="shade/#f57900/1.00" x1="2" y1="0" x2="width-3" y2="0"/>
-	<line color="shade/#f57900/0.99" x1="1" y1="1" x2="width-2" y2="1"/>
-	<line color="shade/#f57900/0.99" x1="0" y1="2" x2="width-1" y2="2"/>
-	<line color="shade/#f57900/0.98" x1="3" y1="0" x2="width-4" y2="0"/>
-
-	<line color="shade/#f57900/0.91" x1="2" y1="1" x2="width-3" y2="1"/>
-	<line color="shade/#f57900/0.90" x1="1" y1="2" x2="width-2" y2="2"/>
-
-	<line color="shade/#f57900/1.03" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
-	<line color="shade/#f57900/1.00" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
-	<line color="shade/#f57900/1.01" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
-	<line color="shade/#f57900/1.06" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
-	<line color="shade/#f57900/1.02" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
-	<line color="shade/#f57900/1.03" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
-
-	<!-- border outline -->
-	<line color="shade/#f57900/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
-	<line color="shade/#f57900/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
-	<line color="shade/#f57900/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
-	<line color="shade/#f57900/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-	<line color="shade/#f57900/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
-	<line color="shade/#f57900/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
-	<!-- border smooth effect -->
-	<line color="shade/#f57900/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
-	<line color="shade/#f57900/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
-	<line color="shade/#f57900/0.90" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
-
-	<!-- inside highlight -->
-	<line color="shade/#f57900/1.18" x1="4" y1="2" x2="width-5" y2="2"/>
-	<line color="shade/#f57900/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
-	<!-- inside shadow -->
-	<line color="shade/#f57900/1.0" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
-
-	<!-- fill gradient -->
-	<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
-		<color value="shade/#f57900/1.1"/>
-		<color value="shade/#f57900/1.02"/>
-	</gradient>
-	<gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2">
-		<color value="shade/#f57900/1.0"/>
-		<color value="shade/#f57900/0.92"/>
-	</gradient>
-
-	<!-- bottom border smooth effect -->
-	<line color="shade/#f57900/0.84" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
-	<line color="shade/#f57900/0.92" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
-</draw_ops>
-
-<draw_ops name="button_bg_unfocused">
-	<!-- inset -->
-	<gradient type="vertical" x="0" y="3" width="width" height="height-6">
-		<color value="shade/#888a85/0.92"/>
-		<color value="shade/#888a85/0.96"/>
-	</gradient>
-
-	<line color="shade/#888a85/0.93" x1="2" y1="0" x2="width-3" y2="0"/>
-	<line color="shade/#888a85/0.92" x1="1" y1="1" x2="width-2" y2="1"/>
-	<line color="shade/#888a85/0.92" x1="0" y1="2" x2="width-1" y2="2"/>
-	<line color="shade/#888a85/0.91" x1="3" y1="0" x2="width-4" y2="0"/>
-
-	<line color="shade/#888a85/0.87" x1="2" y1="1" x2="width-3" y2="1"/>
-	<line color="shade/#888a85/0.86" x1="1" y1="2" x2="width-2" y2="2"/>
-
-	<line color="shade/#888a85/0.945" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
-	<line color="shade/#888a85/0.93" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
-	<line color="shade/#888a85/0.935" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
-	<line color="shade/#888a85/0.96" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
-	<line color="shade/#888a85/0.94" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
-	<line color="shade/#888a85/0.95" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
-
-	<!-- border outline -->
-	<line color="shade/#888a85/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
-	<line color="shade/#888a85/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
-	<line color="shade/#888a85/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
-	<line color="shade/#888a85/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-
-	<line color="shade/#888a85/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
-	<line color="shade/#888a85/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
-	<!-- border smooth effect -->
-	<line color="shade/#888a85/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
-	<line color="shade/#888a85/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
-	<line color="shade/#888a85/0.95" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
-
-	<!-- inside highlight -->
-	<line color="shade/#888a85/1.2" x1="4" y1="2" x2="width-5" y2="2"/>
-	<line color="shade/#888a85/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
-	<!-- inside shadow -->
-	<line color="shade/#888a85/1.05" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
-
-	<!-- fill gradient -->
-	<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
-		<color value="shade/#888a85/0.95"/>
-		<color value="shade/#888a85/0.87"/>
-	</gradient>
-	<gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2">
-		<color value="shade/#888a85/0.85"/>
-		<color value="shade/#888a85/0.77"/>
-	</gradient>
-
-	<!-- bottom border smooth effect -->
-	<line color="shade/#888a85/0.89" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
-	<line color="shade/#888a85/0.97" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
-</draw_ops>
-
-<draw_ops name="button_bg_prelight">
-	<include name="button_bg"/>
-	<tint color="shade/#f57900/1.5" alpha="0.2" x="3" y="3" width="width-5" height="height-5"/>
-	<line color="shade/#f57900/0.6" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
-</draw_ops>
-
-<draw_ops name="button_bg_pressed">
-	<!-- outside highlight -->
-	<gradient type="vertical" x="width-2" y="2" width="1" height="height-4">
-		<color value="shade/#f57900/1.2"/>
-		<color value="shade/#f57900/1.0"/>
-	</gradient>
-	<gradient type="vertical" x="width-1" y="3" width="1" height="height-6">
-		<color value="shade/#f57900/1.2"/>
-		<color value="shade/#f57900/1.0"/>
-	</gradient>
-	<line color="shade/#f57900/1.0" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
-	<line color="shade/#f57900/1.0" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
-	<!-- border outline -->
-	<line color="shade/#f57900/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
-	<line color="shade/#f57900/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
-	<line color="shade/#f57900/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
-	<line color="shade/#f57900/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-
-	<line color="shade/#f57900/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
-	<line color="shade/#f57900/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
-	<!-- inside shadow -->
-	<line color="shade/#f57900/0.9" x1="3" y1="2" x2="width-4" y2="2"/>
-	<line color="shade/#f57900/0.85" x1="2" y1="3" x2="2" y2="height-4"/>
-
-	<!-- fill gradient -->
-	<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
-		<color value="shade/#f57900/0.95"/>
-		<color value="shade/#f57900/0.9"/>
-	</gradient>
-
-	<line color="shade/#f57900/0.9" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
-</draw_ops>
-
-<draw_ops name="button_bg_unfocused_prelight">
-	<include name="button_bg_unfocused"/>
-	<tint color="shade/#888a85/1.5" alpha="0.3" x="3" y="3" width="width-5" height="height-5"/>
-	<line color="shade/#888a85/0.6" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
-</draw_ops>
-
-<draw_ops name="button_bg_unfocused_pressed">
-	<!-- outside highlight -->
-	<gradient type="vertical" x="width-2" y="2" width="1" height="height-4">
-		<color value="shade/#888a85/1.25"/>
-		<color value="shade/#888a85/1.05"/>
-	</gradient>
-	<gradient type="vertical" x="width-1" y="3" width="1" height="height-6">
-		<color value="shade/#888a85/1.25"/>
-		<color value="shade/#888a85/1.05"/>
-	</gradient>
-	<line color="shade/#888a85/1.05" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
-	<line color="shade/#888a85/1.05" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
-	<!-- border outline -->
-	<line color="shade/#888a85/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
-	<line color="shade/#888a85/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
-	<line color="shade/#888a85/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
-	<line color="shade/#888a85/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-	<line color="shade/#888a85/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
-	<line color="shade/#888a85/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
-	<!-- inside shadow -->
-	<line color="shade/#888a85/0.8" x1="3" y1="2" x2="width-4" y2="2"/>
-	<line color="shade/#888a85/0.75" x1="2" y1="3" x2="2" y2="height-4"/>
-
-	<!-- fill gradient -->
-	<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
-		<color value="shade/#888a85/0.9"/>
-		<color value="shade/#888a85/0.85"/>
-	</gradient>
-
-	<line color="shade/#888a85/0.85" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
-</draw_ops>
-
-<!-- ::: ICONS ::: -->
-<!--
-	using a minimum icon size until there is a proper way to specify relative sizes
-	unfortunately it's logically impossible to always center the icons on non-square
-	buttons (utility windows) without distortion.
-
-	icon_size = (Bmin`max`height-Bpad*2)
-	hpadding = (width - icon_size) / 2 = ((width-(Bmin`max`height-Bpad*2))/2)
-	vpadding = (height - icon_size) / 2 = ((height-(Bmin`max`height-Bpad*2))/2)
--->
-
-<!-- menu icon -->
-<draw_ops name="menu_button_icon">
-	<!--<icon  x="0" y="0" width="width" height="height"/>-->
-	<icon  x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
-</draw_ops>
-
-<draw_ops name="menu_button_icon_unfocused">
-	<!--<icon  x="0" y="0" width="width" height="height" alpha="0.5"/>-->
-	<icon  x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
-</draw_ops>
-
-<draw_ops name="menu_button_normal">
-	<include name="menu_button_icon"/>
-</draw_ops>
-<draw_ops name="menu_button_pressed">
-	<include name="menu_button_icon"/>
-</draw_ops>
-<draw_ops name="menu_button_unfocused">
-	<include name="menu_button_icon_unfocused"/>
-</draw_ops>
-
-<!-- close icon -->
-<draw_ops name="close_button_icon">
-	<!-- outside border -->
-
-	<!-- main cross  -->
-	<line color="shade/#f57900/0.7" width="4"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
-		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
-	<line color="shade/#f57900/0.7" width="4"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
-		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
-	<!-- top-left -->
-	<tint color="shade/#f57900/0.7" alpha="1.0"
-		x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
-		width="2" height="1"/>
-	<tint color="shade/#f57900/0.7" alpha="1.0"
-		x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
-		width="1" height="2"/>
-	<!-- top-right -->
-	<tint color="shade/#f57900/0.7" alpha="1.0"
-		x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
-		width="2" height="1"/>
-	<tint color="shade/#f57900/0.7" alpha="1.0"
-		x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
-		width="1" height="2"/>
-	<!-- bottom-left -->
-	<tint color="shade/#f57900/0.7" alpha="1.0"
-		x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
-		width="2" height="1"/>
-	<tint color="shade/#f57900/0.7" alpha="1.0"
-		x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
-		width="1" height="2"/>
-	<!-- bottom-right -->
-	<tint color="shade/#f57900/0.7" alpha="1.0"
-		x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
-		width="2" height="1"/>
-	<tint color="shade/#f57900/0.7" alpha="1.0"
-		x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
-		width="1" height="2"/>
-
-	<!-- icon -->
-	<line color="blend/#f57900/#FFFFFF/0.75" width="2"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
-		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
-	<line color="blend/#f57900/#FFFFFF/0.75" width="1"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
-		x2="width- ((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
-	<line color="blend/#f57900/#FFFFFF/0.75" width="2"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
-		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
-	<line color="blend/#f57900/#FFFFFF/0.75" width="1"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
-		x2="width - ((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
-</draw_ops>
-
-<draw_ops name="close_button_icon_unfocused">
-	<line color="blend/#000000/#888a85/0.45" width="2"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"/>
-	<line color="blend/#000000/#888a85/0.45" width="1"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
-	<line color="blend/#000000/#888a85/0.45" width="2"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
-	<line color="blend/#000000/#888a85/0.45" width="1"
-		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
-</draw_ops>
-
-<draw_ops name="close_button_normal">
-	<include name="button_bg"/>
-	<include name="close_button_icon"/>
-</draw_ops>
-<draw_ops name="close_button_prelight">
-	<include name="button_bg_prelight"/>
-	<include name="close_button_icon"/>
-</draw_ops>
-<draw_ops name="close_button_pressed">
-	<include name="button_bg_pressed"/>
-	<include name="close_button_icon"/>
-</draw_ops>
-<draw_ops name="close_button_unfocused">
-	<include name="button_bg_unfocused"/>
-	<include name="close_button_icon_unfocused"/>
-</draw_ops>
-<draw_ops name="close_button_unfocused_prelight">
-	<include name="button_bg_unfocused_prelight"/>
-	<include name="close_button_icon_unfocused"/>
-</draw_ops>
-<draw_ops name="close_button_unfocused_pressed">
-	<include name="button_bg_unfocused_pressed"/>
-	<include name="close_button_icon_unfocused"/>
-</draw_ops>
-
-<!-- maximize icon -->
-<draw_ops name="maximize_button_icon">
-	<!-- outside border -->
-	<rectangle color="shade/#f57900/0.7" filled="false"
-		x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2+1"/>
-	<rectangle color="shade/#f57900/0.7" filled="false"
-		x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-4"/>
-
-	<!-- icon -->
-	<rectangle color="blend/#f57900/#FFFFFF/0.75" filled="false"
-		x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
-	<line color="blend/#f57900/#FFFFFF/0.75" width="1"
-		x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
-</draw_ops>
-
-<draw_ops name="maximize_button_icon_unfocused">
-	<rectangle color="blend/#000000/#888a85/0.45" filled="false"
-		x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
-	<line color="blend/#000000/#888a85/0.45" width="1"
-		x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
-</draw_ops>
-
-<draw_ops name="maximize_button_normal">
-	<include name="button_bg"/>
-	<include name="maximize_button_icon"/>
-</draw_ops>
-<draw_ops name="maximize_button_prelight">
-	<include name="button_bg_prelight"/>
-	<include name="maximize_button_icon"/>
-</draw_ops>
-<draw_ops name="maximize_button_pressed">
-	<include name="button_bg_pressed"/>
-	<include name="maximize_button_icon"/>
-</draw_ops>
-<draw_ops name="maximize_button_unfocused">
-	<include name="button_bg_unfocused"/>
-	<include name="maximize_button_icon_unfocused"/>
-</draw_ops>
-<draw_ops name="maximize_button_unfocused_prelight">
-	<include name="button_bg_unfocused_prelight"/>
-	<include name="maximize_button_icon_unfocused"/>
-</draw_ops>
-<draw_ops name="maximize_button_unfocused_pressed">
-	<include name="button_bg_unfocused_pressed"/>
-	<include name="maximize_button_icon_unfocused"/>
-</draw_ops>
-
-<!-- restore icon -->
-<draw_ops name="restore_button_icon">
-	<!-- outside border -->
-	<rectangle color="shade/#f57900/0.7" filled="false"
-		x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
-	<rectangle color="shade/#f57900/0.7" filled="false"
-		x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-5" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-6"/>
-
-	<!-- icon -->
-	<rectangle color="blend/#f57900/#FFFFFF/0.75" filled="false"
-		x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
-	<line color="blend/#f57900/#FFFFFF/0.75" width="1"
-		x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
-</draw_ops>
-
-<draw_ops name="restore_button_icon_unfocused">
-	<rectangle color="blend/#000000/#888a85/0.45" filled="false"
-		x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
-	<line color="blend/#000000/#888a85/0.45" width="1"
-		x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
-</draw_ops>
-
-<draw_ops name="restore_button_normal">
-	<include name="button_bg"/>
-	<include name="restore_button_icon"/>
-</draw_ops>
-<draw_ops name="restore_button_prelight">
-	<include name="button_bg_prelight"/>
-	<include name="restore_button_icon"/>
-</draw_ops>
-<draw_ops name="restore_button_pressed">
-	<include name="button_bg_pressed"/>
-	<include name="restore_button_icon"/>
-</draw_ops>
-<draw_ops name="restore_button_unfocused">
-	<include name="button_bg_unfocused"/>
-	<include name="restore_button_icon_unfocused"/>
-</draw_ops>
-<draw_ops name="restore_button_unfocused_prelight">
-	<include name="button_bg_unfocused_prelight"/>
-	<include name="restore_button_icon_unfocused"/>
-</draw_ops>
-<draw_ops name="restore_button_unfocused_pressed">
-	<include name="button_bg_unfocused_pressed"/>
-	<include name="restore_button_icon_unfocused"/>
-</draw_ops>
-
-<!-- minimize icon -->
-<draw_ops name="minimize_button_icon">
-	<!-- outside border -->
-	<rectangle color="shade/#f57900/0.7" filled="false"
-		x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="3"/>
-	<!-- icon -->
-	<rectangle color="blend/#f57900/#FFFFFF/0.75" filled="true"
-		x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
-</draw_ops>
-
-<draw_ops name="minimize_button_icon_unfocused">
-	<rectangle color="blend/#000000/#888a85/0.45" filled="true"
-		x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
-		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
-</draw_ops>
-
-<draw_ops name="minimize_button_normal">
-	<include name="button_bg"/>
-	<include name="minimize_button_icon"/>
-</draw_ops>
-<draw_ops name="minimize_button_prelight">
-	<include name="button_bg_prelight"/>
-	<include name="minimize_button_icon"/>
-</draw_ops>
-<draw_ops name="minimize_button_pressed">
-	<include name="button_bg_pressed"/>
-	<include name="minimize_button_icon"/>
-</draw_ops>
-<draw_ops name="minimize_button_unfocused">
-	<include name="button_bg_unfocused"/>
-	<include name="minimize_button_icon_unfocused"/>
-</draw_ops>
-<draw_ops name="minimize_button_unfocused_prelight">
-	<include name="button_bg_unfocused_prelight"/>
-	<include name="minimize_button_icon_unfocused"/>
-</draw_ops>
-<draw_ops name="minimize_button_unfocused_pressed">
-	<include name="button_bg_unfocused_pressed"/>
-	<include name="minimize_button_icon_unfocused"/>
-</draw_ops>
-
-<draw_ops name="blank">
-<!-- nothing -->
-</draw_ops>
-
-<!-- ::: FRAME STYLES ::: -->
-<frame_style name="normal" geometry="normal">
-	<piece position="entire_background" draw_ops="round_bevel_unfocused"/>
-	<piece position="title" draw_ops="title_unfocused"/>
-	<button function="close" state="normal" draw_ops="close_button_unfocused"/>
-	<button function="close" state="pressed" draw_ops="close_button_unfocused_pressed"/>
-	<button function="close" state="prelight" draw_ops="close_button_unfocused_prelight"/>
-	<button function="maximize" state="normal" draw_ops="maximize_button_unfocused"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_button_unfocused_pressed"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_button_unfocused_prelight"/>
-	<button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_button_unfocused_pressed"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_button_unfocused_prelight"/>
-	<button function="menu" state="normal" draw_ops="menu_button_normal"/>
-	<button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
-</frame_style>
-
-<frame_style name="normal_shaded" geometry="shaded" parent="normal">
-	<piece position="entire_background" draw_ops="round_bevel_unfocused_shaded"/>
-</frame_style>
-
-<frame_style name="focused" geometry="normal" parent="normal">
-	<piece position="entire_background" draw_ops="round_bevel"/>
-	<piece position="title" draw_ops="title"/>
-	<button function="close" state="normal" draw_ops="close_button_normal"/>
-	<button function="close" state="pressed" draw_ops="close_button_pressed"/>
-	<button function="close" state="prelight" draw_ops="close_button_prelight"/>
-	<button function="maximize" state="normal" draw_ops="maximize_button_normal"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/>
-	<button function="minimize" state="normal" draw_ops="minimize_button_normal"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/>
-</frame_style>
-
-<frame_style name="focused_shaded" geometry="shaded" parent="focused">
-	<piece position="entire_background" draw_ops="round_bevel_shaded"/>
-</frame_style>
-
-<frame_style name="normal_maximized" geometry="normal_maximized" parent="normal">
-	<piece position="entire_background" draw_ops="bevel_maximized_unfocused"/>
-	<button function="maximize" state="normal" draw_ops="restore_button_unfocused"/>
-	<button function="maximize" state="pressed" draw_ops="restore_button_unfocused_pressed"/>
-	<button function="maximize" state="prelight" draw_ops="restore_button_unfocused_prelight"/>
-</frame_style>
-
-<frame_style name="focused_maximized" geometry="normal_maximized" parent="focused">
-	<piece position="entire_background" draw_ops="bevel_maximized"/>
-	<button function="maximize" state="normal" draw_ops="restore_button_normal"/>
-	<button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
-	<button function="maximize" state="prelight" draw_ops="restore_button_prelight"/>
-</frame_style>
-
-<frame_style name="border" geometry="border" parent="normal">
-	<piece position="entire_background" draw_ops="border"/>
-	<piece position="title" draw_ops="blank"/>
-</frame_style>
-
-<frame_style name="utility_normal" geometry="utility" parent="normal">
-	<piece position="entire_background" draw_ops="bevel_unfocused"/>
-</frame_style>
-<frame_style name="utility_focused" geometry="utility" parent="focused">
-	<piece position="entire_background" draw_ops="bevel"/>
-</frame_style>
-<frame_style name="utility_focused_shaded" geometry="utility" parent="focused_shaded">
-	<piece position="entire_background" draw_ops="bevel_shaded"/>
-</frame_style>
-
-<frame_style_set name="normal">
-	<frame focus="yes" state="normal" resize="both" style="focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal"/>
-	<frame focus="yes" state="maximized" style="focused_maximized"/>
-	<frame focus="no" state="maximized" style="normal_maximized"/>
-	<frame focus="yes" state="shaded" style="focused_shaded"/>
-	<frame focus="no" state="shaded" style="normal_shaded"/>
-	<frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_maximized"/>
-</frame_style_set>
-
-<frame_style_set name="utility" parent="normal">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_normal"/>
-	<!-- this is a bunch of crack since utility windows shouldn't be maximized -->
-	<frame focus="yes" state="maximized" style="focused"/>
-	<frame focus="no" state="maximized" style="normal"/>
-	<frame focus="yes" state="shaded" style="utility_focused_shaded"/>
-	<frame focus="no" state="shaded" style="utility_normal"/>
-	<frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal"/>
-</frame_style_set>
-
-<frame_style_set name="border">
-	<frame focus="yes" state="normal" resize="both" style="border"/>
-	<frame focus="no" state="normal" resize="both" style="border"/>
-	<frame focus="yes" state="maximized" style="border"/>
-	<frame focus="no" state="maximized" style="border"/>
-	<frame focus="yes" state="shaded" style="border"/>
-	<frame focus="no" state="shaded" style="border"/>
-	<frame focus="yes" state="maximized_and_shaded" style="border"/>
-	<frame focus="no" state="maximized_and_shaded" style="border"/>
-</frame_style_set>
-
-<window type="normal" style_set="normal"/>
-<window type="dialog" style_set="normal"/>
-<window type="modal_dialog" style_set="normal"/>
-<window type="menu" style_set="normal"/>
-<window type="utility" style_set="utility"/>
-<window type="border" style_set="border"/>
-
-<menu_icon function="close" state="normal" draw_ops="close_button_icon_unfocused"/>
-<menu_icon function="maximize" state="normal" draw_ops="maximize_button_icon_unfocused"/>
-<menu_icon function="unmaximize" state="normal" draw_ops="restore_button_icon_unfocused"/>
-<menu_icon function="minimize" state="normal" draw_ops="minimize_button_icon_unfocused"/>
-
-</metacity_theme>