rename aldabra => Aldabra (as other themes)

78 files changed, 0 insertions, 11542 deletions

diff --git a/desktop-themes/aldabra/COPYING b/desktop-themes/aldabra/COPYING
deleted file mode 100644
index f8c08409..00000000
--- a/desktop-themes/aldabra/COPYING
+++ /dev/null
@@ -1,507 +0,0 @@
-    GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-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 this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser 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 Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey 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 library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/desktop-themes/aldabra/Makefile.am b/desktop-themes/aldabra/Makefile.am
deleted file mode 100644
index fe9c0b18..00000000
--- a/desktop-themes/aldabra/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-THEME_NAME=aldabra
- 
-themedir = $(datadir)/themes/$(THEME_NAME)
-
-theme_DATA = index.theme
-
-EXTRA_DIST = $(theme_DATA)
-
-SUBDIRS =		\
-	gtk-2.0		\
-	gtk-3.0		\
-	metacity-1
-
-DIST_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)/pixmaps/backgrounds/mate/abstract! \
-		< $< > $@
diff --git a/desktop-themes/aldabra/NEWS b/desktop-themes/aldabra/NEWS
deleted file mode 100644
index e10a0ab3..00000000
--- a/desktop-themes/aldabra/NEWS
+++ /dev/null
@@ -1,38 +0,0 @@
-2011-06-15 Version 0.7.5.
-Fixed Eclipse scrollbars. Thanks goes to mxt on ubuntuforums.
-
-2011-06-06 Version 0.7.4.
-Corrected the colors of radios and checks in menus. Fixed the scrollbar "invalid borders" error.
-
-2011-06-02 Version 0.7.3.
-Switched archive formats again. Attempted to allow installation via dragging archive to gnome-appearance-properties and to reduce errors in GNOME 2.
-
-2011-06-02 Version 0.7.2.
-Modified index.theme. Aldabra displays as a full theme in gnome-appearance-properties without errors/warnings about missing dependencies.
-
-2011-06-02 Version 0.7.1.
-Modified index.theme.
-
-2011-06-02 Version 0.7.
-Modified index.theme. Removed the active tab underline and replaced screengrab checkboxes/radiobuttons with the official Adwaita images. Switched back to .zip because of GNOME-look's upload filesize limit.
-
-2011-06-01 Version 0.6.2.
-Fixed gVim scrollbars.
-
-2011-06-01 Version 0.6.1.
-Modified the toolbar pixmap to work better with some applications. Added radiobuttons and checkboxes to Firefox.
-
-2011-05-31 Version 0.6.
-Added Adwaita-styled checkboxes and radiobuttons. They are not applied perfectly yet. Please comment about any regressions.
-
-2011-05-31 Version 0.5.2.
-Fixed Firefox menubar selected text color.
-
-2011-05-31 Version 0.5.1.
-Uploaded a .tar, because .tar.gz would not open. Fixed expanders.
-
-2011-05-31 Version 0.5.
-Uploaded a .tar.gz to help packagers. Contents of file have not changed, just the archive format.
-
-2011-05-31 Version 0.5.
-Initial commit to GNOME-look.org.
diff --git a/desktop-themes/aldabra/README b/desktop-themes/aldabra/README
deleted file mode 100644
index 64d86e92..00000000
--- a/desktop-themes/aldabra/README
+++ /dev/null
@@ -1,16 +0,0 @@
-Aldabra 0.7.5
-
-Author:
-ceramicm (http://gnome-look.org/usermanager/search.php?username=ceramicm)
-
-Homepage:
-http://gnome-look.org/content/show.php/Aldabra?content=142247
-http://ubuntuforums.org/showthread.php?t=1772074
-
-Description:
-Aldabra is a GTK2 theme that uses the Murrine and Pixmap engines to mimic the look of Adwaita, the default GNOME 3 theme.
-
-The goal of this theme is to provide visual consistency between GTK2 and GTK3 applications. It is a work in progress: over the next few days, I hope to add accurate buttons and to fix application-specific issues.
-
-Aldabra is available under the LGPLv2+. Anyone is welcome to rename, package, or otherwise distribute the theme (in whole or in part) as permitted by that license. Constructive feedback is greatly appreciated.
-
diff --git a/desktop-themes/aldabra/gtk-2.0/Makefile.am b/desktop-themes/aldabra/gtk-2.0/Makefile.am
deleted file mode 100644
index 2aeb20f8..00000000
--- a/desktop-themes/aldabra/gtk-2.0/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-themedir = $(datadir)/themes/aldabra/gtk-2.0
-
-theme_DATA = gtkrc
-
-EXTRA_DIST = $(theme_DATA)
-
-SUBDIRS = assets
-
-DIST_SUBDIRS = assets
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/Makefile.am b/desktop-themes/aldabra/gtk-2.0/assets/Makefile.am
deleted file mode 100644
index e15e1dd4..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-
-themedir = $(datadir)/themes/aldabra/gtk-2.0/assets
-
-theme_DATA = \
-	checkbox-checked-insensitive.svg  \
-	scroll-button-left.png \
-	checkbox-checked.svg \
-	scroll-button-right-active.png \
-	checkbox-mixed.svg \
-	scroll-button-right-disabled.png \
-	checkbox-unchecked-insensitive.svg \
-	scroll-button-right-hover.png \
-	checkbox-unchecked.svg \
-	scroll-button-right.png \
-	handle.png \
-	scroll-button-up-active.png \
-	scroll-button-up-disabled.png \
-	notebook-gap-bottom.png \
-	scroll-button-up-hover.png \
-	notebook-gap-top.png \
-	scroll-button-up.png \
-	notebook.png \
-	scroll-hhandle-active.png \
-	null.png \
-	scroll-hhandle-hover.png \
-	radio-mixed.svg \
-	scroll-hhandle.png \
-	radio-selected-insensitive.svg \
-	scroll-vhandle-active.png \
-	radio-selected.svg \
-	scroll-vhandle-hover.png \
-	radio-unselected-insensitive.svg \
-	scroll-vhandle.png \
-	radio-unselected.svg \
-	tab-bottom-active.png \
-	scroll-background.png \
-	tab-bottom.png \
-	scroll-button-down-active.png \
-	tab-left-active.png \
-	scroll-button-down-disabled.png \
-	tab-left.png \
-	scroll-button-down-hover.png \
-	tab-right-active.png \
-	scroll-button-down.png \
-	tab-right.png \
-	scroll-button-left-active.png \
-	tab-top-active.png \
-	scroll-button-left-disabled.png \
-	tab-top.png \
-	scroll-button-left-hover.png \
-	toolbar.png
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-checked-insensitive.svg b/desktop-themes/aldabra/gtk-2.0/assets/checkbox-checked-insensitive.svg
deleted file mode 100644
index 326d133a..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,175 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-unchecked.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       y2="-202.34555"
-       x2="1205.5752"
-       y1="-186.45331"
-       x1="1205.5752"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3951"
-       xlink:href="#linearGradient10354-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="248.97633"
-       x2="260.92538"
-       y1="233.77748"
-       x1="260.92538"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3953"
-       xlink:href="#linearGradient10332-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-8"
-       id="linearGradient8390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-6" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-0" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.1381674"
-     inkscape:cy="8.4772276"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="981"
-     inkscape:window-height="899"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       style="opacity:0.5;enable-background:new"
-       id="g16895"
-       transform="translate(410.00739,765.05452)">
-      <rect
-         ry="1.6105907"
-         rx="1.6105907"
-         y="-284.86218"
-         x="-409.50739"
-         height="11.023263"
-         width="11.042357"
-         id="rect16897"
-         style="color:#000000;fill:none;stroke:url(#linearGradient8390);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         transform="scale(1,-1)" />
-      <path
-         id="path16899"
-         style="fill:none;stroke:#a3a89c;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;enable-background:new"
-         d="m -406.2425,278.07061 2.7047,3.5 6.3577,-7"
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-checked.svg b/desktop-themes/aldabra/gtk-2.0/assets/checkbox-checked.svg
deleted file mode 100644
index f2492f19..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-checked.svg
+++ /dev/null
@@ -1,191 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-checked-scalable.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133"
-       id="linearGradient8394"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718" />
-    <linearGradient
-       id="linearGradient24133"
-       inkscape:collect="always">
-      <stop
-         id="stop24135"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       y2="-202.34555"
-       x2="1205.5752"
-       y1="-186.45331"
-       x1="1205.5752"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3951"
-       xlink:href="#linearGradient10354-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="248.97633"
-       x2="260.92538"
-       y1="233.77748"
-       x1="260.92538"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3953"
-       xlink:href="#linearGradient10332-5"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="9.3023818"
-     inkscape:cy="13.216234"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="894"
-     inkscape:window-height="914"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(410.00739,765.00002)"
-       id="g16853"
-       style="enable-background:new">
-      <rect
-         transform="scale(1,-1)"
-         style="color:#000000;fill:url(#linearGradient3951);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3953);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6506"
-         width="11.042357"
-         height="11.023263"
-         x="-409.50739"
-         y="-284.86218"
-         rx="1.6105907"
-         ry="1.6105907" />
-    </g>
-    <g
-       transform="translate(-1568.9928,841.00002)"
-       id="g24757"
-       style="display:inline;enable-background:new">
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccsccccsccccccccccccc"
-         id="path24115"
-         d="m 1581.484,197.57451 -5.9527,5.49523 -1.5385,-1.70756 c -0.5675,-0.68154 -1.6986,-0.0737 -2.1043,0.84246 -0.3576,0.80771 -0.263,2.10509 0.2918,2.72004 l 2.3824,2.53125 c 0.3844,0.47604 1.1988,0.53546 1.7814,-0.0313 l 6.9309,-6.67011 c 0.8412,-0.89696 0.6398,-2.23127 0.2214,-2.8846 -0.4925,-0.76903 -1.4327,-0.78265 -2.0124,-0.29546 z m 0.1111,0.94016 1.1079,1.41031 -6.922,6.4375 -0.5937,0 -2.1875,-2.1875 0.1563,-1.45312 0.5312,-0.23438 1.4687,1.21875 0.3438,0.34375 0.2002,0.25 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:url(#linearGradient8394);fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ahem;-inkscape-font-specification:Ahem" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         id="path24119"
-         d="m 1581.7056,198.35054 -6.2213,5.69077 -1.675,-1.75016 c -0.2927,-0.26248 -0.7322,1.5e-4 -0.8428,0.33163 l 0.028,1.54287 1.818,1.8656 7.9844,-7.53125 c -0.2564,-0.46127 -0.6632,-0.48234 -1.0915,-0.14946 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#a2c0dd;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ahem;-inkscape-font-specification:Ahem" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc"
-         id="path24117"
-         d="m 1582.7969,198.5 -7.3077,6.86432 -2.5348,-2.78466 c 0,0 -0.5675,0.90691 0.019,1.58656 l 2.1532,2.25362 c 0.1546,0.17678 0.4665,0.12213 0.6654,-0.0104 l 6.9002,-6.47188 c 0.5082,-0.50823 0.1094,-1.43751 0.1094,-1.43751 l 2e-4,0 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#4a8dd1;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ahem;-inkscape-font-specification:Ahem" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-mixed.svg b/desktop-themes/aldabra/gtk-2.0/assets/checkbox-mixed.svg
deleted file mode 100644
index ff8ee979..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-mixed.svg
+++ /dev/null
@@ -1,250 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-checked-pixelsharpened.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7346">
-      <stop
-         style="stop-color:#1969ba;stop-opacity:1"
-         offset="0"
-         id="stop7348" />
-      <stop
-         style="stop-color:#145393;stop-opacity:1"
-         offset="1"
-         id="stop7350" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133"
-       id="linearGradient8394"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718" />
-    <linearGradient
-       id="linearGradient24133"
-       inkscape:collect="always">
-      <stop
-         id="stop24135"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       y2="-202.34555"
-       x2="1205.5752"
-       y1="-186.45331"
-       x1="1205.5752"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3951"
-       xlink:href="#linearGradient10354-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="248.97633"
-       x2="260.92538"
-       y1="233.77748"
-       x1="260.92538"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3953"
-       xlink:href="#linearGradient10332-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133-1"
-       id="linearGradient8394-1"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718"
-       gradientTransform="translate(0,-20)" />
-    <linearGradient
-       id="linearGradient24133-1"
-       inkscape:collect="always">
-      <stop
-         id="stop24135-6"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137-2"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133-9"
-       id="linearGradient8394-11"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718" />
-    <linearGradient
-       id="linearGradient24133-9"
-       inkscape:collect="always">
-      <stop
-         id="stop24135-1"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137-3"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7346"
-       id="linearGradient7352"
-       x1="5.65625"
-       y1="6.390625"
-       x2="5.65625"
-       y2="9.828125"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="13.343981"
-     inkscape:cy="9.0341616"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1373"
-     inkscape:window-height="1035"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(410.00739,765.00002)"
-       id="g16853"
-       style="enable-background:new">
-      <rect
-         transform="scale(1,-1)"
-         style="color:#000000;fill:url(#linearGradient3951);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3953);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6506"
-         width="11.042357"
-         height="11.023263"
-         x="-409.50739"
-         y="-284.86218"
-         rx="1.6105907"
-         ry="1.6105907" />
-    </g>
-    <rect
-       style="color:#000000;fill:#4588ca;fill-opacity:0.98823529;fill-rule:nonzero;stroke:url(#linearGradient7352);stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494"
-       width="8.9375"
-       height="3.03125"
-       x="1.53125"
-       y="6.5"
-       transform="translate(0,1036.3622)"
-       rx="1.515625"
-       ry="1.515625" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;opacity:0.50431034"
-       d="m 2.53125,7.5625 6.9375,0"
-       id="path5496"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1036.3622)" />
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-unchecked-insensitive.svg b/desktop-themes/aldabra/gtk-2.0/assets/checkbox-unchecked-insensitive.svg
deleted file mode 100644
index d5a6bd60..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-unchecked-insensitive.svg
+++ /dev/null
@@ -1,149 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-checked-insensitive.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-8"
-       id="linearGradient8390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-6" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-0" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.1381674"
-     inkscape:cy="8.4772276"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="981"
-     inkscape:window-height="899"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       style="opacity:0.5;enable-background:new"
-       id="g16895"
-       transform="translate(410.00739,765.05452)">
-      <rect
-         ry="1.6105907"
-         rx="1.6105907"
-         y="-284.86218"
-         x="-409.50739"
-         height="11.023263"
-         width="11.042357"
-         id="rect16897"
-         style="color:#000000;fill:none;stroke:url(#linearGradient8390);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         transform="scale(1,-1)" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-unchecked.svg b/desktop-themes/aldabra/gtk-2.0/assets/checkbox-unchecked.svg
deleted file mode 100644
index 42760cbd..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/checkbox-unchecked.svg
+++ /dev/null
@@ -1,168 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-checked-scalable.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133"
-       id="linearGradient8394"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718" />
-    <linearGradient
-       id="linearGradient24133"
-       inkscape:collect="always">
-      <stop
-         id="stop24135"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       y2="-202.34555"
-       x2="1205.5752"
-       y1="-186.45331"
-       x1="1205.5752"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3951"
-       xlink:href="#linearGradient10354-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="248.97633"
-       x2="260.92538"
-       y1="233.77748"
-       x1="260.92538"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3953"
-       xlink:href="#linearGradient10332-5"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.1381674"
-     inkscape:cy="8.4772276"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="981"
-     inkscape:window-height="899"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(410.00739,765.00002)"
-       id="g16853"
-       style="enable-background:new">
-      <rect
-         transform="scale(1,-1)"
-         style="color:#000000;fill:url(#linearGradient3951);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3953);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6506"
-         width="11.042357"
-         height="11.023263"
-         x="-409.50739"
-         y="-284.86218"
-         rx="1.6105907"
-         ry="1.6105907" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/handle.png b/desktop-themes/aldabra/gtk-2.0/assets/handle.png
deleted file mode 100644
index 51978aed..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/handle.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/notebook-gap-bottom.png b/desktop-themes/aldabra/gtk-2.0/assets/notebook-gap-bottom.png
deleted file mode 100644
index 70fffda8..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/notebook-gap-bottom.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/notebook-gap-top.png b/desktop-themes/aldabra/gtk-2.0/assets/notebook-gap-top.png
deleted file mode 100644
index 138f1cd9..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/notebook-gap-top.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/notebook.png b/desktop-themes/aldabra/gtk-2.0/assets/notebook.png
deleted file mode 100644
index e8f03f69..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/notebook.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/null.png b/desktop-themes/aldabra/gtk-2.0/assets/null.png
deleted file mode 100644
index 079a05a2..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/null.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/radio-mixed.svg b/desktop-themes/aldabra/gtk-2.0/assets/radio-mixed.svg
deleted file mode 100644
index 5a5658f9..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/radio-mixed.svg
+++ /dev/null
@@ -1,343 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="radio-unselected.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11577-0-5-0-2"
-       id="linearGradient8358"
-       gradientUnits="userSpaceOnUse"
-       x1="662.53418"
-       y1="249.29141"
-       x2="662.53418"
-       y2="262.49979" />
-    <linearGradient
-       id="linearGradient11577-0-5-0-2"
-       inkscape:collect="always">
-      <stop
-         id="stop11579-5-6-7-4"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop11581-8-0-0-9"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5"
-       id="linearGradient8360"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11623-4-5-4"
-       id="linearGradient8362"
-       gradientUnits="userSpaceOnUse"
-       x1="661.04559"
-       y1="251.6946"
-       x2="661.04559"
-       y2="258.26358" />
-    <linearGradient
-       id="linearGradient11623-4-5-4"
-       inkscape:collect="always">
-      <stop
-         id="stop11625-5-6-0"
-         offset="0"
-         style="stop-color:#2e87e3;stop-opacity:1" />
-      <stop
-         id="stop11627-4-4-9"
-         offset="1"
-         style="stop-color:#76b0ec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12387-1-5"
-       id="linearGradient8364"
-       gradientUnits="userSpaceOnUse"
-       x1="662.26074"
-       y1="251.66537"
-       x2="662.26074"
-       y2="259.77792" />
-    <linearGradient
-       id="linearGradient12387-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12389-7-2"
-         offset="0"
-         style="stop-color:#1b6fc5;stop-opacity:1;" />
-      <stop
-         id="stop12391-1-4"
-         offset="1"
-         style="stop-color:#145393;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11553-0-7-9"
-       id="linearGradient8366"
-       gradientUnits="userSpaceOnUse"
-       x1="660.16144"
-       y1="246.69635"
-       x2="660.27411"
-       y2="260.70532" />
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12405-7"
-       id="radialGradient8368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
-       cx="660.8656"
-       cy="251.41324"
-       fx="660.8656"
-       fy="251.41324"
-       r="5.0290799" />
-    <linearGradient
-       id="linearGradient12405-7"
-       inkscape:collect="always">
-      <stop
-         id="stop12407-9"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop12409-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       r="2.3864853"
-       fy="269.82831"
-       fx="663.01904"
-       cy="269.82831"
-       cx="663.01904"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5029"
-       xlink:href="#linearGradient12692-5-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7346"
-       id="linearGradient7352"
-       x1="5.65625"
-       y1="6.390625"
-       x2="5.65625"
-       y2="9.828125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7346">
-      <stop
-         style="stop-color:#1969ba;stop-opacity:1"
-         offset="0"
-         id="stop7348" />
-      <stop
-         style="stop-color:#145393;stop-opacity:1"
-         offset="1"
-         id="stop7350" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(1033.0001,265.99998)"
-       y2="9.828125"
-       x2="5.65625"
-       y1="6.390625"
-       x1="5.65625"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient119"
-       xlink:href="#linearGradient7346"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="38.155252"
-     inkscape:cy="2.4242657"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6305"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="2306"
-     inkscape:window-y="143"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <path
-         transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         sodipodi:ry="7.2937827"
-         sodipodi:rx="4.5078058"
-         sodipodi:cy="255.0668"
-         sodipodi:cx="660.96808"
-         id="path6307"
-         style="color:#000000;fill:url(#linearGradient8358);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8360);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.12955466;fill:none;stroke:url(#radialGradient8368);stroke-width:1.04254842;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
-         id="path6313"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(1.2201064,0,0,0.75406683,232.54855,81.662583)" />
-      <rect
-         style="color:#000000;fill:#4588ca;fill-opacity:0.98823529;fill-rule:nonzero;stroke:url(#linearGradient119);stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect5494"
-         width="8.9375"
-         height="3.03125"
-         x="1034.5312"
-         y="272.5"
-         rx="1.515625"
-         ry="1.515625" />
-      <path
-         style="opacity:0.50431064;fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1035.5313,273.56248 6.9375,0"
-         id="path5496"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/radio-selected-insensitive.svg b/desktop-themes/aldabra/gtk-2.0/assets/radio-selected-insensitive.svg
deleted file mode 100644
index 09eb6930..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/radio-selected-insensitive.svg
+++ /dev/null
@@ -1,264 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="radio-unselected.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11577-0-5-0-2"
-       id="linearGradient8358"
-       gradientUnits="userSpaceOnUse"
-       x1="662.53418"
-       y1="249.29141"
-       x2="662.53418"
-       y2="262.49979" />
-    <linearGradient
-       id="linearGradient11577-0-5-0-2"
-       inkscape:collect="always">
-      <stop
-         id="stop11579-5-6-7-4"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop11581-8-0-0-9"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5"
-       id="linearGradient8360"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12405-7"
-       id="radialGradient8368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
-       cx="660.8656"
-       cy="251.41324"
-       fx="660.8656"
-       fy="251.41324"
-       r="5.0290799" />
-    <linearGradient
-       id="linearGradient12405-7"
-       inkscape:collect="always">
-      <stop
-         id="stop12407-9"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop12409-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5-2"
-       id="linearGradient8392"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5-2"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0-7"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9-3"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.2871964"
-     inkscape:cy="8.5766833"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6305"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <g
-         style="opacity:0.5;display:inline;enable-background:new"
-         id="g16917"
-         transform="translate(3.7481965e-5,-1.1707725e-5)">
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:none;stroke:url(#linearGradient8392);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-           id="path16919"
-           sodipodi:cx="660.96808"
-           sodipodi:cy="255.0668"
-           sodipodi:rx="4.5078058"
-           sodipodi:ry="7.2937827"
-           d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-           transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)" />
-        <path
-           transform="matrix(0.77479411,0,0,0.47884882,526.8858,151.86156)"
-           d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-           sodipodi:ry="7.2937827"
-           sodipodi:rx="4.5078058"
-           sodipodi:cy="255.0668"
-           sodipodi:cx="660.96808"
-           id="path16921"
-           style="color:#000000;fill:#8f9985;fill-opacity:1;fill-rule:nonzero;stroke:#8f9985;stroke-width:1.64175236;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:144.44521581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/radio-selected.svg b/desktop-themes/aldabra/gtk-2.0/assets/radio-selected.svg
deleted file mode 100644
index 178c4b31..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/radio-selected.svg
+++ /dev/null
@@ -1,350 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-unchecked-insensitive.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-8"
-       id="linearGradient8390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-6" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11577-0-5-0-2"
-       id="linearGradient8358"
-       gradientUnits="userSpaceOnUse"
-       x1="662.53418"
-       y1="249.29141"
-       x2="662.53418"
-       y2="262.49979" />
-    <linearGradient
-       id="linearGradient11577-0-5-0-2"
-       inkscape:collect="always">
-      <stop
-         id="stop11579-5-6-7-4"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop11581-8-0-0-9"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5"
-       id="linearGradient8360"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11623-4-5-4"
-       id="linearGradient8362"
-       gradientUnits="userSpaceOnUse"
-       x1="661.04559"
-       y1="251.6946"
-       x2="661.04559"
-       y2="258.26358" />
-    <linearGradient
-       id="linearGradient11623-4-5-4"
-       inkscape:collect="always">
-      <stop
-         id="stop11625-5-6-0"
-         offset="0"
-         style="stop-color:#2e87e3;stop-opacity:1" />
-      <stop
-         id="stop11627-4-4-9"
-         offset="1"
-         style="stop-color:#76b0ec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12387-1-5"
-       id="linearGradient8364"
-       gradientUnits="userSpaceOnUse"
-       x1="662.26074"
-       y1="251.66537"
-       x2="662.26074"
-       y2="259.77792" />
-    <linearGradient
-       id="linearGradient12387-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12389-7-2"
-         offset="0"
-         style="stop-color:#1b6fc5;stop-opacity:1;" />
-      <stop
-         id="stop12391-1-4"
-         offset="1"
-         style="stop-color:#145393;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11553-0-7-9"
-       id="linearGradient8366"
-       gradientUnits="userSpaceOnUse"
-       x1="660.16144"
-       y1="246.69635"
-       x2="660.27411"
-       y2="260.70532" />
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12405-7"
-       id="radialGradient8368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
-       cx="660.8656"
-       cy="251.41324"
-       fx="660.8656"
-       fy="251.41324"
-       r="5.0290799" />
-    <linearGradient
-       id="linearGradient12405-7"
-       inkscape:collect="always">
-      <stop
-         id="stop12407-9"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop12409-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       r="2.3864853"
-       fy="269.82831"
-       fx="663.01904"
-       cy="269.82831"
-       cx="663.01904"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5029"
-       xlink:href="#linearGradient12692-5-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="8.7319174"
-     inkscape:cy="7.9147276"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <path
-         transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         sodipodi:ry="7.2937827"
-         sodipodi:rx="4.5078058"
-         sodipodi:cy="255.0668"
-         sodipodi:cx="660.96808"
-         id="path6307"
-         style="color:#000000;fill:url(#linearGradient8358);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8360);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient8362);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8364);stroke-width:1.27423298;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:144.44521581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path6309"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(0.99826332,0,0,0.61696032,379.17979,116.6339)" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.55465585;fill:none;stroke:url(#linearGradient8366);stroke-width:1.63832664;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
-         id="path6311"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(0.77641414,0,0,-0.47985006,525.81496,396.39382)" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.12955466;fill:none;stroke:url(#radialGradient8368);stroke-width:1.04254842;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
-         id="path6313"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(1.2201064,0,0,0.75406683,232.54855,81.662583)" />
-      <path
-         transform="matrix(1.2570829,0,0,1.1611638,205.4417,-43.52207)"
-         d="m 665.47584,271.75009 c 0,0.9397 -1.06847,1.70148 -2.38648,1.70148 -1.31802,0 -2.38649,-0.76178 -2.38649,-1.70148 0,-0.9397 1.06847,-1.70147 2.38649,-1.70147 1.31801,0 2.38648,0.76177 2.38648,1.70147 z"
-         sodipodi:ry="1.7014757"
-         sodipodi:rx="2.3864853"
-         sodipodi:cy="271.75009"
-         sodipodi:cx="663.08936"
-         id="path6315"
-         style="opacity:0.7854251;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/radio-unselected-insensitive.svg b/desktop-themes/aldabra/gtk-2.0/assets/radio-unselected-insensitive.svg
deleted file mode 100644
index 2c7c6063..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/radio-unselected-insensitive.svg
+++ /dev/null
@@ -1,189 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="radio-selected-insensitive.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5-2"
-       id="linearGradient8392"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5-2"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0-7"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9-3"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.2871964"
-     inkscape:cy="8.5324892"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6305"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <g
-         style="opacity:0.5;display:inline;enable-background:new"
-         id="g16917"
-         transform="translate(3.7481965e-5,-1.1707725e-5)">
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:none;stroke:url(#linearGradient8392);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-           id="path16919"
-           sodipodi:cx="660.96808"
-           sodipodi:cy="255.0668"
-           sodipodi:rx="4.5078058"
-           sodipodi:ry="7.2937827"
-           d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-           transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/radio-unselected.svg b/desktop-themes/aldabra/gtk-2.0/assets/radio-unselected.svg
deleted file mode 100644
index 7cf1539d..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/radio-unselected.svg
+++ /dev/null
@@ -1,298 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="radio-selected.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11577-0-5-0-2"
-       id="linearGradient8358"
-       gradientUnits="userSpaceOnUse"
-       x1="662.53418"
-       y1="249.29141"
-       x2="662.53418"
-       y2="262.49979" />
-    <linearGradient
-       id="linearGradient11577-0-5-0-2"
-       inkscape:collect="always">
-      <stop
-         id="stop11579-5-6-7-4"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop11581-8-0-0-9"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5"
-       id="linearGradient8360"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11623-4-5-4"
-       id="linearGradient8362"
-       gradientUnits="userSpaceOnUse"
-       x1="661.04559"
-       y1="251.6946"
-       x2="661.04559"
-       y2="258.26358" />
-    <linearGradient
-       id="linearGradient11623-4-5-4"
-       inkscape:collect="always">
-      <stop
-         id="stop11625-5-6-0"
-         offset="0"
-         style="stop-color:#2e87e3;stop-opacity:1" />
-      <stop
-         id="stop11627-4-4-9"
-         offset="1"
-         style="stop-color:#76b0ec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12387-1-5"
-       id="linearGradient8364"
-       gradientUnits="userSpaceOnUse"
-       x1="662.26074"
-       y1="251.66537"
-       x2="662.26074"
-       y2="259.77792" />
-    <linearGradient
-       id="linearGradient12387-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12389-7-2"
-         offset="0"
-         style="stop-color:#1b6fc5;stop-opacity:1;" />
-      <stop
-         id="stop12391-1-4"
-         offset="1"
-         style="stop-color:#145393;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11553-0-7-9"
-       id="linearGradient8366"
-       gradientUnits="userSpaceOnUse"
-       x1="660.16144"
-       y1="246.69635"
-       x2="660.27411"
-       y2="260.70532" />
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12405-7"
-       id="radialGradient8368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
-       cx="660.8656"
-       cy="251.41324"
-       fx="660.8656"
-       fy="251.41324"
-       r="5.0290799" />
-    <linearGradient
-       id="linearGradient12405-7"
-       inkscape:collect="always">
-      <stop
-         id="stop12407-9"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop12409-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       r="2.3864853"
-       fy="269.82831"
-       fx="663.01904"
-       cy="269.82831"
-       cx="663.01904"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5029"
-       xlink:href="#linearGradient12692-5-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="8.7319174"
-     inkscape:cy="7.9147276"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6305"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <path
-         transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         sodipodi:ry="7.2937827"
-         sodipodi:rx="4.5078058"
-         sodipodi:cy="255.0668"
-         sodipodi:cx="660.96808"
-         id="path6307"
-         style="color:#000000;fill:url(#linearGradient8358);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8360);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.12955466;fill:none;stroke:url(#radialGradient8368);stroke-width:1.04254842;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
-         id="path6313"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(1.2201064,0,0,0.75406683,232.54855,81.662583)" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-background.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-background.png
deleted file mode 100644
index dbe3655a..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-background.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down-active.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down-active.png
deleted file mode 100644
index cc46cdb4..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down-disabled.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down-disabled.png
deleted file mode 100644
index dffd7b42..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down-disabled.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down-hover.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down-hover.png
deleted file mode 100644
index d12ad682..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down-hover.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down.png
deleted file mode 100644
index 84860d01..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-down.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left-active.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left-active.png
deleted file mode 100644
index dfd6e964..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left-disabled.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left-disabled.png
deleted file mode 100644
index 084aab94..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left-disabled.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left-hover.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left-hover.png
deleted file mode 100644
index 4841d77c..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left-hover.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left.png
deleted file mode 100644
index d52c8019..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-left.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right-active.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right-active.png
deleted file mode 100644
index d2a7df7f..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right-disabled.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right-disabled.png
deleted file mode 100644
index 097d6dc2..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right-disabled.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right-hover.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right-hover.png
deleted file mode 100644
index 36ef96cb..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right-hover.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right.png
deleted file mode 100644
index cc12ec9e..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-right.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up-active.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up-active.png
deleted file mode 100644
index 9168acb8..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up-disabled.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up-disabled.png
deleted file mode 100644
index 9d4390f6..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up-disabled.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up-hover.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up-hover.png
deleted file mode 100644
index 2452e167..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up-hover.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up.png
deleted file mode 100644
index 46e6c367..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-button-up.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-hhandle-active.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-hhandle-active.png
deleted file mode 100644
index 9f59e9a8..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-hhandle-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-hhandle-hover.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-hhandle-hover.png
deleted file mode 100644
index ff572f4c..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-hhandle-hover.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-hhandle.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-hhandle.png
deleted file mode 100644
index aea91b0c..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-hhandle.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-vhandle-active.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-vhandle-active.png
deleted file mode 100644
index ca90ca2c..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-vhandle-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-vhandle-hover.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-vhandle-hover.png
deleted file mode 100644
index aa7b4df7..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-vhandle-hover.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/scroll-vhandle.png b/desktop-themes/aldabra/gtk-2.0/assets/scroll-vhandle.png
deleted file mode 100644
index 38c419b2..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/scroll-vhandle.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/tab-bottom-active.png b/desktop-themes/aldabra/gtk-2.0/assets/tab-bottom-active.png
deleted file mode 100644
index 775d5509..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/tab-bottom-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/tab-bottom.png b/desktop-themes/aldabra/gtk-2.0/assets/tab-bottom.png
deleted file mode 100644
index 4d0d72fb..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/tab-bottom.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/tab-left-active.png b/desktop-themes/aldabra/gtk-2.0/assets/tab-left-active.png
deleted file mode 100644
index 096d6051..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/tab-left-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/tab-left.png b/desktop-themes/aldabra/gtk-2.0/assets/tab-left.png
deleted file mode 100644
index 4841bbab..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/tab-left.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/tab-right-active.png b/desktop-themes/aldabra/gtk-2.0/assets/tab-right-active.png
deleted file mode 100644
index fedb8ebe..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/tab-right-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/tab-right.png b/desktop-themes/aldabra/gtk-2.0/assets/tab-right.png
deleted file mode 100644
index c82bee84..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/tab-right.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/tab-top-active.png b/desktop-themes/aldabra/gtk-2.0/assets/tab-top-active.png
deleted file mode 100644
index 48b2577f..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/tab-top-active.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/tab-top.png b/desktop-themes/aldabra/gtk-2.0/assets/tab-top.png
deleted file mode 100644
index e01f001b..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/tab-top.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/assets/toolbar.png b/desktop-themes/aldabra/gtk-2.0/assets/toolbar.png
deleted file mode 100644
index 364f8962..00000000
--- a/desktop-themes/aldabra/gtk-2.0/assets/toolbar.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/gtk-2.0/gtkrc b/desktop-themes/aldabra/gtk-2.0/gtkrc
deleted file mode 100644
index 0a97f3fb..00000000
--- a/desktop-themes/aldabra/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,928 +0,0 @@
-gtk-color-scheme	= "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#4A90D9\nselected_fg_color:#ffffff\ntext_color:#313739\nbg_color:#EDEDED\ntooltip_bg_color:#343434"
-
-gtk-auto-mnemonics	= 1
-
-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
-
-	GtkEntry	::honors-transparent-bg-hint = 1
-	GtkEntry	::invisible-char	= 0x2022
-	GtkEntry	::progress-border	= {2, 2, 2, 2}
-
-	GtkExpander	::expander-size		= 14
-
-	GtkMenuBar	::internal-padding	= 2
-	GtkMenuBar	::shadow-type		= GTK_SHADOW_NONE
-	GtkMenu		::horizontal-padding	= 0
-	GtkMenu		::vertical-padding	= 0
-	GtkSeparatorMenuItem	::horizontal-padding = 7
-
-	GtkNotebook	::tab-overlap		= 7
-	GtkNotebook	::tab-curvature		= 14
-
-	GtkPaned	::handle-size		= 6
-
-	GtkRange	::trough-border		= 0
-	GtkRange	::slider-width		= 15
-	GtkRange	::stepper-size		= 15
-
-	GtkScale	::slider-length		= 14
-	GtkScale	::slider-width		= 14
-	GtkScale	::trough-side-details	= 0
-
-	GtkScrollbar	::slider_width		= 22
-	GtkScrollbar	::slider_height		= 24
-	GtkScrollbar	::stepper_size		= 22
-	GtkScrollbar	::min-slider-length	= 32
-
-	GtkToolbar	::internal-padding	= 5
-
-	GtkTreeView	::expander-size		= 14
-	GtkTreeView	::odd_row_color		= "#FFF"
-	GtkTreeView	::even_row_color	= "#FFF"
-
-	WnckTasklist	::fade-overlay-rect	= 0
-
-	####################
-	# 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]		= @text_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 "murrine" {
-		animation		= FALSE
-		arrowstyle		= 0
-		colorize_scrollbar	= FALSE
-		contrast		= 1.0
-		default_button_color	= @bg_color
-		expanderstyle		= 2
-		focusstyle		= 1
-		glazestyle		= 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-		glowstyle		= 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = horizontal, 4 = centered glow
-		gradient_shades		= {1.18, 1.09, 1.08, 0.9}
-		highlight_shade		= 1.0
-		lightborder_shade	= 1.18
-		lightborderstyle	= 0 # 0 = top side, 1 = all sides
-		listviewstyle		= 0 # 0 = nothing, 1 = dotted, 2 = line
-		menubaritemstyle	= 1 # 0 = menuitem look, 1 = button look
-		menubarstyle		= 2 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle		= 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle		= 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
-		progressbarstyle	= 1
-		reliefstyle		= 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		rgba			= FALSE	# alpha transparency
-		roundness		= 2 # 0 = square
-		scrollbarstyle		= 0 # 0 = nothing
-		separatorstyle		= 0
-		shadow_shades		= {2.0, 1.0}
-		sliderstyle		= 0 # 0 = nothing added
-		stepperstyle		= 1 # 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		toolbarstyle		= 0 # 0 = flat, 1 = glassy, 2 = gradient
-		trough_shades		= {0.85, 1.0}
-	}
-}
-
-style "wide" {
-	xthickness	= 2
-	ythickness	= 2
-}
-
-style "wider" {
-	xthickness	= 3
-	ythickness	= 3
-}
-
-style "button" {
-	xthickness	= 3
-	ythickness	= 3
-
-	engine "murrine" {
-		gradient_shades		= {1.05, 0.99, 0.99, 0.89}
-		reliefstyle		= 3 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-	}
-}
-
-style "checkbutton" {
-	engine "pixmap" {
-		image {
-			function = CHECK
-			recolorable = TRUE
-			state = NORMAL
-			shadow = OUT
-			overlay_file = "assets/checkbox-unchecked.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = CHECK
-			recolorable = TRUE
-			state = PRELIGHT
-			shadow = OUT
-			overlay_file = "assets/checkbox-unchecked.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = CHECK
-			recolorable = TRUE
-			state = ACTIVE
-			shadow = OUT
-			overlay_file = "assets/checkbox-unchecked.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = CHECK
-			recolorable = TRUE
-			state = INSENSITIVE
-			shadow = OUT
-			overlay_file = "assets/checkbox-unchecked-insensitive.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = CHECK
-			recolorable = TRUE
-			state = NORMAL
-			shadow = IN
-			overlay_file = "assets/checkbox-checked.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = CHECK
-			recolorable = TRUE
-			state = PRELIGHT
-			shadow = IN
-			overlay_file = "assets/checkbox-checked.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = CHECK
-			recolorable = TRUE
-			state = ACTIVE
-			shadow = IN
-			overlay_file = "assets/checkbox-checked.svg"
-			overlay_stretch = FALSE
-		}
-
-
-		image {
-			function = CHECK
-			recolorable = TRUE
-			state = INSENSITIVE
-			shadow = IN
-			overlay_file = "assets/checkbox-checked-insensitive.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = FLAT_BOX
-			recolorable = TRUE
-			stretch = TRUE
-			file = "assets/null.png"
-			border = {2, 2, 2, 2}
-		}
-	}
-}
-
-style "entry" { # text
-	xthickness	= 3
-	ythickness	= 3
-
-	bg[SELECTED]	= mix (0.4, @selected_bg_color, @base_color)
-	fg[SELECTED]	= @text_color
-
-	engine "murrine" {
-		contrast	= 0.4
-		roundness	= 3
-	}
-}
-
-style "expander" {
-	bg[NORMAL]		= "#FFF"
-	fg[NORMAL]		= shade (2.0, @text_color)
-	fg[PRELIGHT]		= shade (2.0, @text_color)
-
-	engine "murrine" {
-		contrast	= 1.2
-		gradient_shades	= {1.0, 1.0, 1.0, 1.0}
-	}
-}
-
-style "frame_title" {
-	fg[NORMAL]	= lighter (@fg_color)
-}
-
-style "handle" {
-	engine "pixmap" {
-		image {
-			function	= HANDLE
-			overlay_file	= "assets/handle.png"
-			overlay_border	= {0, 0, 0, 0}
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-			file		= "assets/null.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-    		}
-
-  		image {
-			function	= HANDLE
-			overlay_file	= "assets/handle.png"
-			overlay_border	= {0, 0, 0, 0}
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-			file		= "assets/null.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-		}
-	}
-}
-class "GtkPaned"	style "handle"
-
-style "menubar" {
-	bg[PRELIGHT]	= "#FFF"
-	fg[SELECTED]	= @text_color
-
-	GtkWidget::window-dragging	= 1
-
-	engine "murrine" {
-		gradient_shades		= {1.0, 1.0, 1.0, 1.0}
-		roundness		= 3 # 0 = squared
-	}
-}
-
-style "menu" {
-	xthickness	= 3
-	ythickness	= 3
-
-	bg[NORMAL]	= shade (1.08, @bg_color)
-
-	GtkMenuItem::arrow-scaling	= 0.4
-
-	engine "murrine" {
-		gradient_shades		= {1.0, 1.0, 1.0, 1.0}
-		roundness		= 1 # 0 = squared
-	}
-}
-
-style "menu_item_white" {
-	xthickness	= 2
-	ythickness	= 3
-
-	fg[PRELIGHT]	= @selected_fg_color
-	text[PRELIGHT]	= @selected_fg_color
-}
-
-style "menu_item_black" {
-	xthickness	= 2
-	ythickness	= 3
-
-	fg[PRELIGHT]	= @text_color
-}
-
-style "notebook" { # tab
-	xthickness	= 3
-	ythickness	= 3
-
-	engine "pixmap" {
-		image {
-			function	= EXTENSION
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "assets/tab-bottom.png"
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_side	= TOP
-		}
-
-		image {
-			function	= EXTENSION
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "assets/tab-top.png"
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_side	= BOTTOM
-		}
-
-		image {
-			function	= EXTENSION
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "assets/tab-left.png"
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_side	= RIGHT
-		}
-
-		image {
-			function	= EXTENSION
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "assets/tab-right.png"
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_side	= LEFT
-		}
-
-		image {
-			function	= EXTENSION
-			recolorable	= TRUE
-			file		= "assets/tab-top-active.png"
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_side	= BOTTOM
-		}
-
-		image {
-			function	= EXTENSION
-			recolorable	= TRUE
-			file		= "assets/tab-bottom-active.png"
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_side	= TOP
-		}
-
-		image {
-			function	= EXTENSION
-			recolorable	= TRUE
-			file		= "assets/tab-left-active.png"
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_side	= RIGHT
-		}
-
-		image {
-			function	= EXTENSION
-			recolorable	= TRUE
-			file		= "assets/tab-right-active.png"
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_side	= LEFT
-		}
-
-		image {
-			function	= BOX_GAP
-			recolorable	= TRUE
-			file		= "assets/notebook.png" 
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_file	= "assets/notebook-gap-top.png"
-			gap_border     	= {4, 7, 2, 0}
-			gap_side	= TOP
-		}
-
-		image {
-			function	= BOX_GAP
-			recolorable	= TRUE
-			file		= "assets/notebook.png" 
-			border		= {4, 4, 4, 4}
-			stretch		= TRUE
-			gap_file	= "assets/notebook-gap-bottom.png"
-			gap_border     	= {4, 7, 0, 2}
-			gap_side	= BOTTOM
-		}
-
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			file		= "assets/notebook.png"
-			border		= {6, 6, 6, 6}
-			stretch		= TRUE
-		}
-	}
-}
-
-style "progressbar" {
-	xthickness	= 1
-	ythickness	= 1
-
-	fg[PRELIGHT]	= @selected_fg_color
-
-	engine "murrine" {
-		gradient_shades		= {1.0, 1.0, 1.0, 1.0}
-	}
-}
-
-style "radiobutton" {
-	engine "pixmap" {
-		image {
-			function = OPTION
-			recolorable = TRUE
-			state = NORMAL
-			shadow = OUT
-			overlay_file = "assets/radio-unselected.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = OPTION
-			recolorable = TRUE
-			state = PRELIGHT
-			shadow = OUT
-			overlay_file = "assets/radio-unselected.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = OPTION
-			recolorable = TRUE
-			state = ACTIVE
-			shadow = OUT
-			overlay_file = "assets/radio-unselected.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = OPTION
-			recolorable = TRUE
-			state = INSENSITIVE
-			shadow = OUT
-			overlay_file = "assets/radio-unselected-insensitive.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = OPTION
-			recolorable = TRUE
-			state = NORMAL
-			shadow = IN
-			overlay_file = "assets/radio-selected.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = OPTION
-			recolorable = TRUE
-			state = PRELIGHT
-			shadow = IN
-			overlay_file = "assets/radio-selected.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = OPTION
-			recolorable = TRUE
-			state = ACTIVE
-			shadow = IN
-			overlay_file = "assets/radio-selected.svg"
-			overlay_stretch = FALSE
-		}
-
-
-		image {
-			function = OPTION
-			recolorable = TRUE
-			state = INSENSITIVE
-			shadow = IN
-			overlay_file = "assets/radio-selected-insensitive.svg"
-			overlay_stretch = FALSE
-		}
-
-		image {
-			function = FLAT_BOX
-			recolorable = TRUE
-			stretch = TRUE
-			file = "assets/null.png"
-			border = {2, 2, 2, 2}
-		}
-	}
-}
-
-style "scale" { # slider
-	xthickness	= 0
-	ythickness	= 0
-
-	bg[ACTIVE]	= shade (0.95, @bg_color)
-
-	engine "murrine" {
-		gradient_shades		= {1.08, 1.04, 1.04, 1.02}
-		roundness		= 15
-	}
-}
-
-style "scrollbar" {
-	engine "pixmap" {
-		image {
-			function	= SLIDER
-			orientation	= VERTICAL
-			state		= NORMAL
-			recolorable	= TRUE
-			file		= "assets/scroll-vhandle.png"
-			border		= {5, 5, 15, 22}
-			stretch		= TRUE
-		}
-
-		image {
-			function	= SLIDER
-			orientation	= VERTICAL
-			state		= PRELIGHT
-			recolorable	= TRUE
-			file		= "assets/scroll-vhandle-hover.png"
-			border		= {5, 5, 15, 22}
-			stretch		= TRUE
-		}
-
-		image {
-			function	= BOX
-			orientation	= VERTICAL
-			file		= "assets/scroll-background.png"
-		}
-
-		image {
-			function	= BOX
-			detail		= "hscrollbar"
-		}
-
-		image {
-			function	= SLIDER
-			orientation	= HORIZONTAL
-			state		= NORMAL
-			recolorable	= TRUE
-			file		= "assets/scroll-hhandle.png"
-			border		= {15, 22, 5, 5}
-			stretch		= TRUE
-		}
-
-		image {
-			function	= SLIDER
-			orientation	= HORIZONTAL
-			state		= PRELIGHT
-			recolorable	= TRUE
-			file		= "assets/scroll-hhandle-hover.png"
-			border		= {15, 22, 5, 5}
-			stretch		= TRUE
-		}
-
-		image {
-			function	= BOX
-			orientation	= HORIZONTAL
-			file		= "assets/scroll-background.png"
-		}
-
-		image {
-			function	= BOX
-			detail		= "vscrollbar"
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= NORMAL
-			file		= "assets/scroll-button-up.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= UP
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "assets/scroll-button-up-hover.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= UP
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "assets/scroll-button-up-active.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= UP
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= INSENSITIVE
-			file		= "assets/scroll-button-up-disabled.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= UP
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= NORMAL
-			file		= "assets/scroll-button-down.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= DOWN
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "assets/scroll-button-down-hover.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= DOWN
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "assets/scroll-button-down-active.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= DOWN
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= INSENSITIVE
-			file		= "assets/scroll-button-down-disabled.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= DOWN
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= NORMAL
-			file		= "assets/scroll-button-right.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= RIGHT
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "assets/scroll-button-right-hover.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= RIGHT
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "assets/scroll-button-right-active.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= RIGHT
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= INSENSITIVE
-			file		= "assets/scroll-button-right-disabled.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= RIGHT
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= NORMAL
-			file		= "assets/scroll-button-left.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= LEFT
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "assets/scroll-button-left-hover.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= LEFT
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "assets/scroll-button-left-active.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= LEFT
-		}
-
-		image {
-			function	= STEPPER
-			recolorable	= TRUE
-			state		= INSENSITIVE
-			file		= "assets/scroll-button-left-disabled.png"
-			border		= {0, 0, 0, 0}
-			stretch		= TRUE
-			arrow_direction	= LEFT
-		}
-	}
-}
-
-style "spinbutton" { # input/stepper 
-	bg[NORMAL]		= "#FFF"
-
-	engine "murrine" {
-		contrast		= 0.4
-		gradient_shades		= {1.0, 1.0, 1.0, 1.0}
-	}
-}
-
-style "toolbar" {
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= FALSE
-			file		= "assets/toolbar.png"
-			border		= {0, 0, 1, 1}
-			stretch		= TRUE
-		}
-	}
-}
-widget_class "*<GtkToolbar>" style "toolbar"
-
-style "tooltips" {
-	xthickness	= 8
-	ythickness	= 4
-
-	bg[NORMAL]	= @tooltip_bg_color
-	fg[NORMAL]	= @tooltip_fg_color
-
-	GtkWidget::new-tooltip-style	= 0
-}
-
-style "treeview" {
-	engine "murrine" {
-		gradient_shades		= {1.0, 1.0, 1.0, 1.0}
-	}
-}
-
-style "treeview_header" = "button" {
-	xthickness	= 2
-	ythickness	= 1
-
-	engine "murrine" {
-		gradient_shades		= {1.05, 0.99, 0.99, 0.89}
-		reliefstyle		= 3 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-	}
-}
-
-###############################################################################
-# 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 "scale"
-class "GtkHScale"				style "scale"
-class "GtkScrollbar"				style "scrollbar"
-
-# 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 "*<GtkButton>"			style "button"
-widget_class "*<GtkNotebook>"			style "notebook"
-
-widget_class "*<GtkMenuBar>*"			style "menubar"
-widget_class "*<GtkMenu>*"			style "menu"
-widget_class "*<GtkMenuItem>*"			style "menu_item_white"
-widget_class "*<GtkMenuBar>.<GtkMenuItem>*"	style "menu_item_black"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"		style "frame_title"
-widget_class "*.<GtkTreeView>*"			style "treeview"
-
-class "*GtkExpander*"  				style "expander"
-
-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"
-widget "gtk-tooltip*"				style "tooltips"
-
-widget_class "*CheckButton*"			style:highest "checkbutton"
-widget_class "*<GtkDialog>*<GtkRadioButton>*"	style:highest "radiobutton"
-widget_class "*<GtkFrame>*<GtkRadioButton>*"	style:highest "radiobutton"
-widget "MozillaGtkWidget*GtkCheck*"		style:highest "checkbutton"
-widget "MozillaGtkWidget*GtkRadio*"		style:highest "radiobutton"
-
-##########################################################################
-# Following are special cases and workarounds for issues in applications.
-##########################################################################
-# For Google Chrome/Chromium integration.
-style "chrome-gtk-frame" {
-	ChromeGtkFrame	::frame-color				= @bg_color
-	ChromeGtkFrame	::inactive-frame-color			= "#EAEAEA"
-
-	ChromeGtkFrame	::frame-gradient-size			= 128
-	ChromeGtkFrame	::frame-gradient-color			= @bg_color
-
-	ChromeGtkFrame	::scrollbar-trough-color		= @bg_color
-	ChromeGtkFrame	::scrollbar-slider-prelight-color	= @base_color
-	ChromeGtkFrame	::scrollbar-slider-normal-color		= @base_color
-}
-class "ChromeGtkFrame"	style "chrome-gtk-frame"
-
-# 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)
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>"	style "text_is_fg_color_workaround"
-
-# 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)
-}
-widget "*.gtk-combobox-popup-menu.*"	style "menuitem_text_is_fg_color_workaround"
-
-# 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)
-}
-widget_class "*<GtkListItem>*"		style "fg_is_text_color_workaround"
-widget_class "*<GtkCList>"		style "fg_is_text_color_workaround"
-widget_class "*<EelEditableLabel>"	style "fg_is_text_color_workaround"
-
-# For gvim scrollbars.
-style "vim-scrollbar" = "scrollbar" {
-	GtkScrollbar	::slider_width		= 16
-	GtkScrollbar	::stepper_size		= 16
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			orientation	= VERTICAL
-			file		= "assets/scroll-background.png"
-		}
-	}
-}
-widget "vim-main-window.*Scrollbar*"	style "vim-scrollbar"
-
-# For Eclipse (swt) toolbars.
-widget "*swt*toolbar*"			style "default"
diff --git a/desktop-themes/aldabra/gtk-3.0/Makefile.am b/desktop-themes/aldabra/gtk-3.0/Makefile.am
deleted file mode 100644
index 14f84acd..00000000
--- a/desktop-themes/aldabra/gtk-3.0/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-
-themedir = $(datadir)/themes/aldabra/gtk-3.0
-
-theme_DATA = \
-	settings.ini \
-	gtk.css \
-	gtk-widgets.css
-
-EXTRA_DIST = $(theme_DATA)
-
-SUBDIRS = assets
-
-DIST_SUBDIRS = assets
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/Makefile.am b/desktop-themes/aldabra/gtk-3.0/assets/Makefile.am
deleted file mode 100644
index e5b455d5..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-
-themedir = $(datadir)/themes/aldabra/gtk-3.0/assets
-
-theme_DATA = \
-	checkbox-checked-insensitive.svg \
-	radio-mixed.svg \
-	checkbox-checked.svg \
-	radio-selected-insensitive.svg \
-	checkbox-mixed.svg \
-	radio-selected.svg \
-	checkbox-unchecked-insensitive.svg \
-	radio-unselected-insensitive.svg \
-	checkbox-unchecked.svg \
-	radio-unselected.svg
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-checked-insensitive.svg b/desktop-themes/aldabra/gtk-3.0/assets/checkbox-checked-insensitive.svg
deleted file mode 100644
index 326d133a..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,175 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-unchecked.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       y2="-202.34555"
-       x2="1205.5752"
-       y1="-186.45331"
-       x1="1205.5752"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3951"
-       xlink:href="#linearGradient10354-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="248.97633"
-       x2="260.92538"
-       y1="233.77748"
-       x1="260.92538"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3953"
-       xlink:href="#linearGradient10332-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-8"
-       id="linearGradient8390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-6" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-0" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.1381674"
-     inkscape:cy="8.4772276"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="981"
-     inkscape:window-height="899"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       style="opacity:0.5;enable-background:new"
-       id="g16895"
-       transform="translate(410.00739,765.05452)">
-      <rect
-         ry="1.6105907"
-         rx="1.6105907"
-         y="-284.86218"
-         x="-409.50739"
-         height="11.023263"
-         width="11.042357"
-         id="rect16897"
-         style="color:#000000;fill:none;stroke:url(#linearGradient8390);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         transform="scale(1,-1)" />
-      <path
-         id="path16899"
-         style="fill:none;stroke:#a3a89c;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;enable-background:new"
-         d="m -406.2425,278.07061 2.7047,3.5 6.3577,-7"
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-checked.svg b/desktop-themes/aldabra/gtk-3.0/assets/checkbox-checked.svg
deleted file mode 100644
index f2492f19..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-checked.svg
+++ /dev/null
@@ -1,191 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-checked-scalable.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133"
-       id="linearGradient8394"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718" />
-    <linearGradient
-       id="linearGradient24133"
-       inkscape:collect="always">
-      <stop
-         id="stop24135"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       y2="-202.34555"
-       x2="1205.5752"
-       y1="-186.45331"
-       x1="1205.5752"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3951"
-       xlink:href="#linearGradient10354-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="248.97633"
-       x2="260.92538"
-       y1="233.77748"
-       x1="260.92538"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3953"
-       xlink:href="#linearGradient10332-5"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="9.3023818"
-     inkscape:cy="13.216234"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="894"
-     inkscape:window-height="914"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(410.00739,765.00002)"
-       id="g16853"
-       style="enable-background:new">
-      <rect
-         transform="scale(1,-1)"
-         style="color:#000000;fill:url(#linearGradient3951);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3953);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6506"
-         width="11.042357"
-         height="11.023263"
-         x="-409.50739"
-         y="-284.86218"
-         rx="1.6105907"
-         ry="1.6105907" />
-    </g>
-    <g
-       transform="translate(-1568.9928,841.00002)"
-       id="g24757"
-       style="display:inline;enable-background:new">
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccsccccsccccccccccccc"
-         id="path24115"
-         d="m 1581.484,197.57451 -5.9527,5.49523 -1.5385,-1.70756 c -0.5675,-0.68154 -1.6986,-0.0737 -2.1043,0.84246 -0.3576,0.80771 -0.263,2.10509 0.2918,2.72004 l 2.3824,2.53125 c 0.3844,0.47604 1.1988,0.53546 1.7814,-0.0313 l 6.9309,-6.67011 c 0.8412,-0.89696 0.6398,-2.23127 0.2214,-2.8846 -0.4925,-0.76903 -1.4327,-0.78265 -2.0124,-0.29546 z m 0.1111,0.94016 1.1079,1.41031 -6.922,6.4375 -0.5937,0 -2.1875,-2.1875 0.1563,-1.45312 0.5312,-0.23438 1.4687,1.21875 0.3438,0.34375 0.2002,0.25 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:url(#linearGradient8394);fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ahem;-inkscape-font-specification:Ahem" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         id="path24119"
-         d="m 1581.7056,198.35054 -6.2213,5.69077 -1.675,-1.75016 c -0.2927,-0.26248 -0.7322,1.5e-4 -0.8428,0.33163 l 0.028,1.54287 1.818,1.8656 7.9844,-7.53125 c -0.2564,-0.46127 -0.6632,-0.48234 -1.0915,-0.14946 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#a2c0dd;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ahem;-inkscape-font-specification:Ahem" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc"
-         id="path24117"
-         d="m 1582.7969,198.5 -7.3077,6.86432 -2.5348,-2.78466 c 0,0 -0.5675,0.90691 0.019,1.58656 l 2.1532,2.25362 c 0.1546,0.17678 0.4665,0.12213 0.6654,-0.0104 l 6.9002,-6.47188 c 0.5082,-0.50823 0.1094,-1.43751 0.1094,-1.43751 l 2e-4,0 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#4a8dd1;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ahem;-inkscape-font-specification:Ahem" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-mixed.svg b/desktop-themes/aldabra/gtk-3.0/assets/checkbox-mixed.svg
deleted file mode 100644
index ff8ee979..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-mixed.svg
+++ /dev/null
@@ -1,250 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-checked-pixelsharpened.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7346">
-      <stop
-         style="stop-color:#1969ba;stop-opacity:1"
-         offset="0"
-         id="stop7348" />
-      <stop
-         style="stop-color:#145393;stop-opacity:1"
-         offset="1"
-         id="stop7350" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133"
-       id="linearGradient8394"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718" />
-    <linearGradient
-       id="linearGradient24133"
-       inkscape:collect="always">
-      <stop
-         id="stop24135"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       y2="-202.34555"
-       x2="1205.5752"
-       y1="-186.45331"
-       x1="1205.5752"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3951"
-       xlink:href="#linearGradient10354-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="248.97633"
-       x2="260.92538"
-       y1="233.77748"
-       x1="260.92538"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3953"
-       xlink:href="#linearGradient10332-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133-1"
-       id="linearGradient8394-1"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718"
-       gradientTransform="translate(0,-20)" />
-    <linearGradient
-       id="linearGradient24133-1"
-       inkscape:collect="always">
-      <stop
-         id="stop24135-6"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137-2"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133-9"
-       id="linearGradient8394-11"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718" />
-    <linearGradient
-       id="linearGradient24133-9"
-       inkscape:collect="always">
-      <stop
-         id="stop24135-1"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137-3"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7346"
-       id="linearGradient7352"
-       x1="5.65625"
-       y1="6.390625"
-       x2="5.65625"
-       y2="9.828125"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="13.343981"
-     inkscape:cy="9.0341616"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1373"
-     inkscape:window-height="1035"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(410.00739,765.00002)"
-       id="g16853"
-       style="enable-background:new">
-      <rect
-         transform="scale(1,-1)"
-         style="color:#000000;fill:url(#linearGradient3951);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3953);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6506"
-         width="11.042357"
-         height="11.023263"
-         x="-409.50739"
-         y="-284.86218"
-         rx="1.6105907"
-         ry="1.6105907" />
-    </g>
-    <rect
-       style="color:#000000;fill:#4588ca;fill-opacity:0.98823529;fill-rule:nonzero;stroke:url(#linearGradient7352);stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494"
-       width="8.9375"
-       height="3.03125"
-       x="1.53125"
-       y="6.5"
-       transform="translate(0,1036.3622)"
-       rx="1.515625"
-       ry="1.515625" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;opacity:0.50431034"
-       d="m 2.53125,7.5625 6.9375,0"
-       id="path5496"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1036.3622)" />
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-unchecked-insensitive.svg b/desktop-themes/aldabra/gtk-3.0/assets/checkbox-unchecked-insensitive.svg
deleted file mode 100644
index d5a6bd60..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-unchecked-insensitive.svg
+++ /dev/null
@@ -1,149 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-checked-insensitive.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-8"
-       id="linearGradient8390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-6" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-0" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.1381674"
-     inkscape:cy="8.4772276"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="981"
-     inkscape:window-height="899"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       style="opacity:0.5;enable-background:new"
-       id="g16895"
-       transform="translate(410.00739,765.05452)">
-      <rect
-         ry="1.6105907"
-         rx="1.6105907"
-         y="-284.86218"
-         x="-409.50739"
-         height="11.023263"
-         width="11.042357"
-         id="rect16897"
-         style="color:#000000;fill:none;stroke:url(#linearGradient8390);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         transform="scale(1,-1)" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-unchecked.svg b/desktop-themes/aldabra/gtk-3.0/assets/checkbox-unchecked.svg
deleted file mode 100644
index 42760cbd..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/checkbox-unchecked.svg
+++ /dev/null
@@ -1,168 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-checked-scalable.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24133"
-       id="linearGradient8394"
-       gradientUnits="userSpaceOnUse"
-       x1="1582.125"
-       y1="201.98718"
-       x2="1580.5312"
-       y2="197.98718" />
-    <linearGradient
-       id="linearGradient24133"
-       inkscape:collect="always">
-      <stop
-         id="stop24135"
-         offset="0"
-         style="stop-color:#145393;stop-opacity:1;" />
-      <stop
-         id="stop24137"
-         offset="1"
-         style="stop-color:#1b6fc5;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       y2="-202.34555"
-       x2="1205.5752"
-       y1="-186.45331"
-       x1="1205.5752"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3951"
-       xlink:href="#linearGradient10354-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="248.97633"
-       x2="260.92538"
-       y1="233.77748"
-       x1="260.92538"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3953"
-       xlink:href="#linearGradient10332-5"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.1381674"
-     inkscape:cy="8.4772276"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="981"
-     inkscape:window-height="899"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(410.00739,765.00002)"
-       id="g16853"
-       style="enable-background:new">
-      <rect
-         transform="scale(1,-1)"
-         style="color:#000000;fill:url(#linearGradient3951);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3953);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6506"
-         width="11.042357"
-         height="11.023263"
-         x="-409.50739"
-         y="-284.86218"
-         rx="1.6105907"
-         ry="1.6105907" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/radio-mixed.svg b/desktop-themes/aldabra/gtk-3.0/assets/radio-mixed.svg
deleted file mode 100644
index 5a5658f9..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/radio-mixed.svg
+++ /dev/null
@@ -1,343 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="radio-unselected.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11577-0-5-0-2"
-       id="linearGradient8358"
-       gradientUnits="userSpaceOnUse"
-       x1="662.53418"
-       y1="249.29141"
-       x2="662.53418"
-       y2="262.49979" />
-    <linearGradient
-       id="linearGradient11577-0-5-0-2"
-       inkscape:collect="always">
-      <stop
-         id="stop11579-5-6-7-4"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop11581-8-0-0-9"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5"
-       id="linearGradient8360"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11623-4-5-4"
-       id="linearGradient8362"
-       gradientUnits="userSpaceOnUse"
-       x1="661.04559"
-       y1="251.6946"
-       x2="661.04559"
-       y2="258.26358" />
-    <linearGradient
-       id="linearGradient11623-4-5-4"
-       inkscape:collect="always">
-      <stop
-         id="stop11625-5-6-0"
-         offset="0"
-         style="stop-color:#2e87e3;stop-opacity:1" />
-      <stop
-         id="stop11627-4-4-9"
-         offset="1"
-         style="stop-color:#76b0ec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12387-1-5"
-       id="linearGradient8364"
-       gradientUnits="userSpaceOnUse"
-       x1="662.26074"
-       y1="251.66537"
-       x2="662.26074"
-       y2="259.77792" />
-    <linearGradient
-       id="linearGradient12387-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12389-7-2"
-         offset="0"
-         style="stop-color:#1b6fc5;stop-opacity:1;" />
-      <stop
-         id="stop12391-1-4"
-         offset="1"
-         style="stop-color:#145393;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11553-0-7-9"
-       id="linearGradient8366"
-       gradientUnits="userSpaceOnUse"
-       x1="660.16144"
-       y1="246.69635"
-       x2="660.27411"
-       y2="260.70532" />
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12405-7"
-       id="radialGradient8368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
-       cx="660.8656"
-       cy="251.41324"
-       fx="660.8656"
-       fy="251.41324"
-       r="5.0290799" />
-    <linearGradient
-       id="linearGradient12405-7"
-       inkscape:collect="always">
-      <stop
-         id="stop12407-9"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop12409-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       r="2.3864853"
-       fy="269.82831"
-       fx="663.01904"
-       cy="269.82831"
-       cx="663.01904"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5029"
-       xlink:href="#linearGradient12692-5-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7346"
-       id="linearGradient7352"
-       x1="5.65625"
-       y1="6.390625"
-       x2="5.65625"
-       y2="9.828125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7346">
-      <stop
-         style="stop-color:#1969ba;stop-opacity:1"
-         offset="0"
-         id="stop7348" />
-      <stop
-         style="stop-color:#145393;stop-opacity:1"
-         offset="1"
-         id="stop7350" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(1033.0001,265.99998)"
-       y2="9.828125"
-       x2="5.65625"
-       y1="6.390625"
-       x1="5.65625"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient119"
-       xlink:href="#linearGradient7346"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="38.155252"
-     inkscape:cy="2.4242657"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6305"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="2306"
-     inkscape:window-y="143"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <path
-         transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         sodipodi:ry="7.2937827"
-         sodipodi:rx="4.5078058"
-         sodipodi:cy="255.0668"
-         sodipodi:cx="660.96808"
-         id="path6307"
-         style="color:#000000;fill:url(#linearGradient8358);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8360);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.12955466;fill:none;stroke:url(#radialGradient8368);stroke-width:1.04254842;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
-         id="path6313"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(1.2201064,0,0,0.75406683,232.54855,81.662583)" />
-      <rect
-         style="color:#000000;fill:#4588ca;fill-opacity:0.98823529;fill-rule:nonzero;stroke:url(#linearGradient119);stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect5494"
-         width="8.9375"
-         height="3.03125"
-         x="1034.5312"
-         y="272.5"
-         rx="1.515625"
-         ry="1.515625" />
-      <path
-         style="opacity:0.50431064;fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1035.5313,273.56248 6.9375,0"
-         id="path5496"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/radio-selected-insensitive.svg b/desktop-themes/aldabra/gtk-3.0/assets/radio-selected-insensitive.svg
deleted file mode 100644
index 09eb6930..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/radio-selected-insensitive.svg
+++ /dev/null
@@ -1,264 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="radio-unselected.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11577-0-5-0-2"
-       id="linearGradient8358"
-       gradientUnits="userSpaceOnUse"
-       x1="662.53418"
-       y1="249.29141"
-       x2="662.53418"
-       y2="262.49979" />
-    <linearGradient
-       id="linearGradient11577-0-5-0-2"
-       inkscape:collect="always">
-      <stop
-         id="stop11579-5-6-7-4"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop11581-8-0-0-9"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5"
-       id="linearGradient8360"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12405-7"
-       id="radialGradient8368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
-       cx="660.8656"
-       cy="251.41324"
-       fx="660.8656"
-       fy="251.41324"
-       r="5.0290799" />
-    <linearGradient
-       id="linearGradient12405-7"
-       inkscape:collect="always">
-      <stop
-         id="stop12407-9"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop12409-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5-2"
-       id="linearGradient8392"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5-2"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0-7"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9-3"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.2871964"
-     inkscape:cy="8.5766833"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6305"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <g
-         style="opacity:0.5;display:inline;enable-background:new"
-         id="g16917"
-         transform="translate(3.7481965e-5,-1.1707725e-5)">
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:none;stroke:url(#linearGradient8392);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-           id="path16919"
-           sodipodi:cx="660.96808"
-           sodipodi:cy="255.0668"
-           sodipodi:rx="4.5078058"
-           sodipodi:ry="7.2937827"
-           d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-           transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)" />
-        <path
-           transform="matrix(0.77479411,0,0,0.47884882,526.8858,151.86156)"
-           d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-           sodipodi:ry="7.2937827"
-           sodipodi:rx="4.5078058"
-           sodipodi:cy="255.0668"
-           sodipodi:cx="660.96808"
-           id="path16921"
-           style="color:#000000;fill:#8f9985;fill-opacity:1;fill-rule:nonzero;stroke:#8f9985;stroke-width:1.64175236;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:144.44521581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/radio-selected.svg b/desktop-themes/aldabra/gtk-3.0/assets/radio-selected.svg
deleted file mode 100644
index 178c4b31..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/radio-selected.svg
+++ /dev/null
@@ -1,350 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="checkbox-unchecked-insensitive.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-8"
-       id="linearGradient8390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-6" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11577-0-5-0-2"
-       id="linearGradient8358"
-       gradientUnits="userSpaceOnUse"
-       x1="662.53418"
-       y1="249.29141"
-       x2="662.53418"
-       y2="262.49979" />
-    <linearGradient
-       id="linearGradient11577-0-5-0-2"
-       inkscape:collect="always">
-      <stop
-         id="stop11579-5-6-7-4"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop11581-8-0-0-9"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5"
-       id="linearGradient8360"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11623-4-5-4"
-       id="linearGradient8362"
-       gradientUnits="userSpaceOnUse"
-       x1="661.04559"
-       y1="251.6946"
-       x2="661.04559"
-       y2="258.26358" />
-    <linearGradient
-       id="linearGradient11623-4-5-4"
-       inkscape:collect="always">
-      <stop
-         id="stop11625-5-6-0"
-         offset="0"
-         style="stop-color:#2e87e3;stop-opacity:1" />
-      <stop
-         id="stop11627-4-4-9"
-         offset="1"
-         style="stop-color:#76b0ec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12387-1-5"
-       id="linearGradient8364"
-       gradientUnits="userSpaceOnUse"
-       x1="662.26074"
-       y1="251.66537"
-       x2="662.26074"
-       y2="259.77792" />
-    <linearGradient
-       id="linearGradient12387-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12389-7-2"
-         offset="0"
-         style="stop-color:#1b6fc5;stop-opacity:1;" />
-      <stop
-         id="stop12391-1-4"
-         offset="1"
-         style="stop-color:#145393;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11553-0-7-9"
-       id="linearGradient8366"
-       gradientUnits="userSpaceOnUse"
-       x1="660.16144"
-       y1="246.69635"
-       x2="660.27411"
-       y2="260.70532" />
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12405-7"
-       id="radialGradient8368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
-       cx="660.8656"
-       cy="251.41324"
-       fx="660.8656"
-       fy="251.41324"
-       r="5.0290799" />
-    <linearGradient
-       id="linearGradient12405-7"
-       inkscape:collect="always">
-      <stop
-         id="stop12407-9"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop12409-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       r="2.3864853"
-       fy="269.82831"
-       fx="663.01904"
-       cy="269.82831"
-       cx="663.01904"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5029"
-       xlink:href="#linearGradient12692-5-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="8.7319174"
-     inkscape:cy="7.9147276"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <path
-         transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         sodipodi:ry="7.2937827"
-         sodipodi:rx="4.5078058"
-         sodipodi:cy="255.0668"
-         sodipodi:cx="660.96808"
-         id="path6307"
-         style="color:#000000;fill:url(#linearGradient8358);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8360);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient8362);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8364);stroke-width:1.27423298;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:144.44521581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path6309"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(0.99826332,0,0,0.61696032,379.17979,116.6339)" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.55465585;fill:none;stroke:url(#linearGradient8366);stroke-width:1.63832664;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
-         id="path6311"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(0.77641414,0,0,-0.47985006,525.81496,396.39382)" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.12955466;fill:none;stroke:url(#radialGradient8368);stroke-width:1.04254842;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
-         id="path6313"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(1.2201064,0,0,0.75406683,232.54855,81.662583)" />
-      <path
-         transform="matrix(1.2570829,0,0,1.1611638,205.4417,-43.52207)"
-         d="m 665.47584,271.75009 c 0,0.9397 -1.06847,1.70148 -2.38648,1.70148 -1.31802,0 -2.38649,-0.76178 -2.38649,-1.70148 0,-0.9397 1.06847,-1.70147 2.38649,-1.70147 1.31801,0 2.38648,0.76177 2.38648,1.70147 z"
-         sodipodi:ry="1.7014757"
-         sodipodi:rx="2.3864853"
-         sodipodi:cy="271.75009"
-         sodipodi:cx="663.08936"
-         id="path6315"
-         style="opacity:0.7854251;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/radio-unselected-insensitive.svg b/desktop-themes/aldabra/gtk-3.0/assets/radio-unselected-insensitive.svg
deleted file mode 100644
index 2c7c6063..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/radio-unselected-insensitive.svg
+++ /dev/null
@@ -1,189 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="radio-selected-insensitive.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5-2"
-       id="linearGradient8392"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5-2"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0-7"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9-3"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="7.2871964"
-     inkscape:cy="8.5324892"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6305"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <g
-         style="opacity:0.5;display:inline;enable-background:new"
-         id="g16917"
-         transform="translate(3.7481965e-5,-1.1707725e-5)">
-        <path
-           sodipodi:type="arc"
-           style="color:#000000;fill:none;stroke:url(#linearGradient8392);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-           id="path16919"
-           sodipodi:cx="660.96808"
-           sodipodi:cy="255.0668"
-           sodipodi:rx="4.5078058"
-           sodipodi:ry="7.2937827"
-           d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-           transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/assets/radio-unselected.svg b/desktop-themes/aldabra/gtk-3.0/assets/radio-unselected.svg
deleted file mode 100644
index 7cf1539d..00000000
--- a/desktop-themes/aldabra/gtk-3.0/assets/radio-unselected.svg
+++ /dev/null
@@ -1,298 +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="16"
-   height="16"
-   id="svg814"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   sodipodi:docname="radio-selected.svg">
-  <defs
-     id="defs816">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2"
-       id="linearGradient8378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5"
-       id="linearGradient8380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11577-0-5-0-2"
-       id="linearGradient8358"
-       gradientUnits="userSpaceOnUse"
-       x1="662.53418"
-       y1="249.29141"
-       x2="662.53418"
-       y2="262.49979" />
-    <linearGradient
-       id="linearGradient11577-0-5-0-2"
-       inkscape:collect="always">
-      <stop
-         id="stop11579-5-6-7-4"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop11581-8-0-0-9"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12415-4-1-5"
-       id="linearGradient8360"
-       gradientUnits="userSpaceOnUse"
-       x1="664.26984"
-       y1="261.44751"
-       x2="664.26984"
-       y2="248.05356" />
-    <linearGradient
-       id="linearGradient12415-4-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12417-2-8-0"
-         offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1;" />
-      <stop
-         id="stop12419-5-0-9"
-         offset="1"
-         style="stop-color:#8f9985;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11623-4-5-4"
-       id="linearGradient8362"
-       gradientUnits="userSpaceOnUse"
-       x1="661.04559"
-       y1="251.6946"
-       x2="661.04559"
-       y2="258.26358" />
-    <linearGradient
-       id="linearGradient11623-4-5-4"
-       inkscape:collect="always">
-      <stop
-         id="stop11625-5-6-0"
-         offset="0"
-         style="stop-color:#2e87e3;stop-opacity:1" />
-      <stop
-         id="stop11627-4-4-9"
-         offset="1"
-         style="stop-color:#76b0ec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12387-1-5"
-       id="linearGradient8364"
-       gradientUnits="userSpaceOnUse"
-       x1="662.26074"
-       y1="251.66537"
-       x2="662.26074"
-       y2="259.77792" />
-    <linearGradient
-       id="linearGradient12387-1-5"
-       inkscape:collect="always">
-      <stop
-         id="stop12389-7-2"
-         offset="0"
-         style="stop-color:#1b6fc5;stop-opacity:1;" />
-      <stop
-         id="stop12391-1-4"
-         offset="1"
-         style="stop-color:#145393;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11553-0-7-9"
-       id="linearGradient8366"
-       gradientUnits="userSpaceOnUse"
-       x1="660.16144"
-       y1="246.69635"
-       x2="660.27411"
-       y2="260.70532" />
-    <linearGradient
-       id="linearGradient11553-0-7-9">
-      <stop
-         id="stop11555-5-9-8"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop11557-1-9-0"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12405-7"
-       id="radialGradient8368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4685542,0,0,2.2820942,-309.65132,-324.35943)"
-       cx="660.8656"
-       cy="251.41324"
-       fx="660.8656"
-       fy="251.41324"
-       r="5.0290799" />
-    <linearGradient
-       id="linearGradient12405-7"
-       inkscape:collect="always">
-      <stop
-         id="stop12407-9"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop12409-7"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12692-5-0"
-       id="radialGradient8370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       cx="663.01904"
-       cy="269.82831"
-       fx="663.01904"
-       fy="269.82831"
-       r="2.3864853" />
-    <linearGradient
-       id="linearGradient12692-5-0"
-       inkscape:collect="always">
-      <stop
-         id="stop12694-4-1"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop12696-5-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       r="2.3864853"
-       fy="269.82831"
-       fx="663.01904"
-       cy="269.82831"
-       cx="663.01904"
-       gradientTransform="matrix(2.4143887,0,0,1.7213698,-937.76662,-194.09437)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5029"
-       xlink:href="#linearGradient12692-5-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="8.7319174"
-     inkscape:cy="7.9147276"
-     inkscape:document-units="px"
-     inkscape:current-layer="g6305"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1180"
-     inkscape:window-height="950"
-     inkscape:window-x="1600"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4084"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata819">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       transform="translate(-1031,770.36221)"
-       id="g6305"
-       style="display:inline;enable-background:new">
-      <path
-         transform="matrix(1.4419436,0,0,0.89116967,85.92127,46.692201)"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         sodipodi:ry="7.2937827"
-         sodipodi:rx="4.5078058"
-         sodipodi:cy="255.0668"
-         sodipodi:cx="660.96808"
-         id="path6307"
-         style="color:#000000;fill:url(#linearGradient8358);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8360);stroke-width:0.88215655;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.12955466;fill:none;stroke:url(#radialGradient8368);stroke-width:1.04254842;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:100"
-         id="path6313"
-         sodipodi:cx="660.96808"
-         sodipodi:cy="255.0668"
-         sodipodi:rx="4.5078058"
-         sodipodi:ry="7.2937827"
-         d="m 665.47588,255.0668 c 0,4.02825 -2.01821,7.29379 -4.5078,7.29379 -2.48959,0 -4.50781,-3.26554 -4.50781,-7.29379 0,-4.02824 2.01822,-7.29378 4.50781,-7.29378 2.48959,0 4.5078,3.26554 4.5078,7.29378 z"
-         transform="matrix(1.2201064,0,0,0.75406683,232.54855,81.662583)" />
-    </g>
-  </g>
-</svg>
diff --git a/desktop-themes/aldabra/gtk-3.0/gtk-widgets.css b/desktop-themes/aldabra/gtk-3.0/gtk-widgets.css
deleted file mode 100644
index ae5444da..00000000
--- a/desktop-themes/aldabra/gtk-3.0/gtk-widgets.css
+++ /dev/null
@@ -1,1219 +0,0 @@
-* {
-    engine: adwaita;
-    padding: 1;
-
-    /* Style properties */
-    -GtkToolButton-icon-spacing: 4;
-
-    -GtkTextView-error-underline-color: @error_color;
-
-    -GtkPaned-handle-size: 5;
-
-    -GtkCheckButton-indicator-size: 16;
-    -GtkCheckMenuItem-indicator-size: 12;
-
-    /* The size for scrollbars. The slider is 2px smaller, but we keep it
-     * up so that the whole area is sensitive to button presses for the
-     * slider. The stepper button is larger in both directions, the slider
-     * only in the width
-     */
-
-    -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 1;
-
-    -GtkToolItemGroup-expander-size: 12;
-    -GtkExpander-expander-size: 12;
-    -GtkToolbar-internal-padding: 4;     /* ??? */
-
-    -GtkMenu-horizontal-padding: 0;
-    -GtkMenu-vertical-padding: 0;
-
-    -GtkWidget-link-color: @link_color;
-    -GtkWidget-visited-link-color: @link_color;
-    -GtkIMHtml-hyperlink-color: @link_color;
-    -GtkHTML-link-color: @link_color;
-
-    -GtkWidget-wide-separators: 1;
-
-    -WnckTasklist-fade-overlay-rect: 0;
-
-    -GtkEntry-inner-border: 2;
-    -GtkEntry-progress-border: 0;
-
-    /* Style */
-    background-color: @theme_bg_color;
-    color: @theme_fg_color;
-    border-radius: 3;
-
-    -GtkWidget-focus-padding: 2;
-    -GtkWidget-focus-line-width: 1;
-    -adwaita-focus-border-color: alpha (@theme_text_color, 0.4);
-    -adwaita-focus-border-radius: 2;
-    -adwaita-focus-fill-color: none;
-    -adwaita-focus-border-gradient: none;
-    -adwaita-focus-border-dashes: 1;
-}
-
-/***************
- * Base States *
- ***************/
-*:hover {
-    background-color: shade (@theme_bg_color, 1.02);
-    color: @theme_fg_color;
-}
-
-*:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-*:selected:focused {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-*:insensitive {
-    background-color: @insensitive_bg_color;
-    color: @insensitive_fg_color;
-}
-
-*:active {
-    background-color: shade (@theme_bg_color, 0.915);
-}
-
-.background {
-    border-style: none;
-    border-width: 0;
-    border-radius: 0;
-}
-
-.tooltip {
-    padding: 4 4;
-    border-style: none;
-    background-color: @theme_tooltip_bg_color;
-    color: @theme_tooltip_fg_color;
-}
-
-.grip {
-    background-color: shade (@inactive_frame_color, 0.93);
-}
-
-.pane-separator {
-    background-color: @theme_bg_color;
-    color: shade (@inactive_frame_color, 0.80);
-}
-
-.pane-separator:prelight,
-.pane-separator:selected {
-    background-color: @theme_bg_color;
-    border-color: shade (@highlighted_border, 0.964);
-}
-
-/****************
- * Text Entries *
- ****************/
-.entry,
-.toolbar.entry {
-    background-color: @theme_base_color;
-    background-image: none;
-
-    border-radius: 2;
-    border-width: 1;
-    border-style: solid;
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (shade (@internal_element_color, 1.14)),
-                                             to (shade (@internal_element_color, 1.37)));
-
-    padding: 3;
-}
-
-.entry:focused {
-    border-color: @focused_entry_border;
-    -adwaita-border-gradient: none;
-}
-
-.entry:insensitive {
-    background-color: @insensitive_bg_color;
-    border-color: shade (@inactive_frame_color, 0.945);
-    -adwaita-border-gradient: none;
-}
-
-.entry.progressbar {
-    /* FIXME: need correct colors/gradient */
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-
-    border-width: 1;
-    border-radius: 1;
-    border-color: @progressbar_border;
-}
-
-/*****************
- * GtkSpinButton *
- *****************/
-.spinbutton.button,
-.spinbutton.button:insensitive,
-.spinbutton.button:prelight,
-.spinbutton.button:active {
-    background-image: none;
-    background-color: @theme_base_color;
-    border-width: 1;
-    border-style: none;
-}
-
-.spinbutton {
-    padding: 3 2;
-}
-
-/****************
- * Progress bar *
- ****************/
-GtkProgressBar.progressbar {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@progressbar_background_a),
-                                     to (@progressbar_background_b));
-
-    border-radius: 3;
-    border-style: solid;
-    border-color: @progressbar_border;
-}
-
-GtkProgressBar.trough {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@trough_bg_color_a),
-                                     to (@trough_bg_color_b));
-
-    border-width: 1;
-    border-style: solid;
-    border-radius: 3;
-    border-color: shade (@inactive_frame_color, 0.925);
-}
-
-/************
- * GtkScale *
- ************/
-GtkScale {
-    -GtkScale-slider-length: 16;
-    -GtkRange-slider-width: 22;
-    -GtkRange-trough-border: 0;
-}
-
-GtkScale.slider {
-    border-width: 1;
-    border-radius: 3;
-
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@theme_base_color),
-                                     to (@switch_slider_color));
-
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (shade (@internal_element_color, 0.90)),
-                                             to (shade (@internal_element_color, 1.35)));
-}
-
-GtkScale.slider:insensitive {
-    background-image: none;
-    -adwaita-border-gradient: none;
-}
-
-GtkScale.scale-has-marks-below.slider.horizontal {
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (shade (@internal_element_color, 0.90)),
-                                             to (shade (@internal_element_color, 1.35)));
-}
-
-GtkScale.scale-has-marks-below.slider.vertical {
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, right top,
-                                             from (shade (@internal_element_color, 0.90)),
-                                             to (shade (@internal_element_color, 1.35)));
-}
-
-GtkScale.scale-has-marks-above.slider.horizontal {
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left bottom, left top,
-                                             from (shade (@internal_element_color, 0.90)),
-                                             to (shade (@internal_element_color, 1.35)));
-}
-
-GtkScale.scale-has-marks-above.slider.vertical {
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             right top, left top,
-                                             from (shade (@internal_element_color, 0.90)),
-                                             to (shade (@internal_element_color, 1.35)));
-}
-
-GtkScale.trough {
-    border-width: 1;
-    border-radius: 2;
-    border-style: solid;
-    border-color: @internal_element_color;
-}
-
-GtkScale.trough:insensitive {
-    background-color: shade (@theme_bg_color, 1.20);
-    border-color: shade (@inactive_frame_color, 0.845);
-}
-
-GtkScale.trough.horizontal {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@trough_bg_color_a),
-                                     to (shade (@trough_bg_color_b, 1.20)));
-}
-
-GtkScale.trough.vertical {
-    background-image: -gtk-gradient (linear,
-                                     left top, right top,
-                                     from (@trough_bg_color_a),
-                                     to (shade (@trough_bg_color_b, 1.20)));
-}
-
-GtkScale.progressbar {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@scale_fill_a),
-                                     to (@scale_fill_b));
-
-    border-color: #1864b2;
-    border-width: 1;
-    border-radius: 3;
-    border-style: solid;
-}
-
-GtkScale.mark {
-    background-color: shade (@theme_bg_color, 0.56);
-}
-
-GtkFrame,
-GtkCalendar {
-    padding: 2;
-}
-
-.frame {
-    color: lighter (@theme_fg_color);
-    border-style: none;
-    border-width: 0;
-}
-
-/*****************
- * Notebooks and *
- * tabs          *
- *****************/
-.notebook {
-    padding: 2;
-
-    border-color: @notebook_border;
-    border-style: solid;
-    border-width: 1;
-    border-radius: 0;
-
-    background-color: @theme_base_color;
-
-    -GtkNotebook-tab-overlap: 8;
-    -GtkNotebook-tab-curvature: 6;
-}
-
-.notebook tab {
-    padding: 3 8 0;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@notebook_tab_gradient_a),
-                                     to (@notebook_tab_gradient_b));
-
-    -adwaita-focus-border-radius: 2;
-}
-
-.notebook tab:active {
-    border-width: 1;
-
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (@notebook_active_tab_border),
-                                             to (@notebook_border));
-
-    -adwaita-selected-tab-color: @notebook_selected_tab_color;
-    background-color: @theme_base_color;
-    background-image: none;
-}
-
-.notebook tab .button,
-.notebook tab .button:hover,
-.notebook tab .button:hover:active {
-    border-style: none;
-    background-color: alpha (@theme_bg_color, 0.0);
-    background-image: none;
-}
-
-/**************
- * ComboBoxes *
- **************/
-
-GtkComboBox {
-    padding: 1 2;
-
-    -GtkWidget-focus-padding: 0;
-    -GtkWidget-focus-line-width: 0;
-
-    -GtkComboBox-arrow-scaling: 0.5;
-    -GtkComboBox-shadow-type: 2;
-}
-
-GtkComboBox .button {
-    color: @internal_element_color;
-    padding: 1;
-}
-
-GtkComboBox .button:prelight {
-    color: shade (@internal_element_color, 0.66);
-}
-
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-    background-image: none;
-    border-style: solid;
-    -GtkRange-trough-border: 2;
-    -GtkRange-arrow-scaling: 0.444;
-    -GtkRange-slider-width: 18;
-    -GtkRange-stepper-size: 18;
-    -GtkScrollbar-min-slider-length: 30; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-
-    -GtkRange-stepper-spacing: 1;
-    -GtkRange-trough-under-steppers: 1;
-}
-
-.scrollbar.trough {
-    background-image: none;
-    background-color: shade (@theme_bg_color, 0.882);
-    border-width: 0;
-    border-radius: 0;
-}
-
-.scrollbar.slider,
-.scrollbar.button {
-    background-image: none;
-    background-color: @theme_base_color;
-    border-color: @button_border;
-    border-radius: 3;
-    border-width: 1;
-}
-
-.scrollbar.slider:prelight {
-    background-image: none;
-    background-color: @theme_base_color;
-    border-color: shade (@highlighted_border, 0.964);
-}
-
-.scrollbar.slider:prelight:active {
-    background-image: none;
-    background-color: @theme_base_color;
-    border-color: @theme_selected_bg_color;
-}
-
-.scrollbar.button {
-    color: @internal_element_color;
-}
-
-.scrollbar.button:prelight {
-    background-image: none;
-    background-color: @theme_base_color;
-    border-color: shade (@highlighted_border, 0.964)
-}
-
-.scrollbar.button:prelight:active {
-    background-image: none;
-    background-color: @theme_base_color;
-    border-color: shade (@highlighted_border, 0.964)
-}
-
-.scrollbar.button:insensitive {
-    color: lighter (@internal_element_color);
-    background-color: @theme_base_color;
-}
-
-.scrollbar.slider:insensitive {
-    background-color: @theme_base_color;
-}
-
-.scrollbar.trough:insensitive {
-    background-color: shade (@theme_bg_color, 0.882);
-}
-
-/***********
- * Buttons *
- ***********/
-.button {
-    padding: 1 4;
-
-    -adwaita-focus-fill-color: alpha (@theme_base_color, 0.35);
-    -adwaita-focus-border-gradient: -gtk-gradient (linear,
-                                                   left top, left bottom,
-                                                   from (alpha (@keyboard_focus_border_a, 0.62)),
-                                                   to (alpha (@keyboard_focus_border_b, 0.62)));
-    -adwaita-focus-border-radius: 1;
-    -adwaita-focus-border-dashes: 0;
-    -GtkWidget-focus-line-width: 2;
-
-    -GtkButton-child-displacement-x: 1;
-    -GtkButton-child-displacement-y: 1;
-    -GtkButton-image-spacing: 4;
-    -GtkButton-interior-focus: true;
-    -GtkButton-default-border: 0;
-    -GtkButton-inner-border: 0;
-
-    border-radius: 2;
-    border-width: 1;
-    border-color: @button_border;
-    border-style: solid;
-
-    background-image: -gtk-gradient (linear,
-				     left top, left bottom,
-                                     from (@button_gradient_color_a),
-                                     to (@button_gradient_color_b));
-}
-
-.button:hover,
-.toolbar.button:hover {
-    border-color: @button_border;
-    background-image: -gtk-gradient (linear,
-				     left top, left bottom,
-				     from (@button_hover_gradient_color_a),
-				     to (@button_hover_gradient_color_b));
-}
-
-.button:active,
-.toolbar .button:active,
-.button:hover:active,
-.toolbar.button:hover:active {
-    background-image: -gtk-gradient (linear,
-    				     left top, left bottom,
-                                     from (@button_active_gradient_color_a),
-				     to (alpha (@button_active_gradient_color_b, 0.13)));
-    border-color: @highlighted_border;
-}
-
-.button:insensitive {
-    background-image: none;
-    background-color: @insensitive_bg_color;
-    color: @insensitive_fg_color;
-}
-
-.button.default {
-    border-width: 2;
-    border-color: shade (@button_border, 1.10);
-}
-
-/*********
- * Menus *
- *********/
-
-/* this controls the general appearance of the menubar */
-.menubar {
-    background-image: -gtk-gradient (linear,
-				     left top, left bottom,
-				     from (@theme_bg_color),
-				     color-stop (0.45, shade (@theme_bg_color, 0.97)),
-				     to (shade (@theme_bg_color, 0.99)));
-    border-width: 0;
-    border-style: none;
-    padding: 4;
-    color: @theme_text_color;
-
-    -GtkWidget-window-dragging: true;
-    -GtkMenuBar-internal-padding: 0;
-}
-
-/* remove the image from the prelight areas */
-.menubar.menuitem:prelight {
-    background-image: none;
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-
-    border-style: solid;
-    border-radius: 3;
-    border-width: 1;
-    border-color: @inactive_frame_color;
-}
-
-.menubar.menuitem {
-    border-width: 1;
-    border-style: none;
-}
-
-.menu {
-    padding: 2;
-
-    background-color: @theme_base_color;
-
-    border-style: solid;
-    border-width: 1;
-    border-radius: 0;
-    border-color: @inactive_frame_color;
-
-    -GtkMenuItem-arrow-scaling: 0.4;
-}
-
-.menuitem {
-    -adwaita-menuitem-arrow-color: @menu_controls_color;
-}
-
-.menuitem.accelerator {
-    color: alpha (@theme_text_color, 0.66);
-}
-
-.menuitem.accelerator:prelight,
-.menuitem.accelerator:active {
-    color: alpha (@theme_base_color, 0.49);
-}
-
-.menuitem:active,
-.menuitem:prelight {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-    border-style: solid;
-    border-width: 1;
-    border-radius: 1;
-    border-color: darker (@theme_selected_bg_color);
-}
-
-.menu.separator {
-    border-color: @inactive_frame_color;
-
-    -GtkSeparatorMenuItem-horizontal-padding: 0;
-    -GtkWidget-separator-height: 1;
-}
-
-/* menu radio and check items are drawn differently */
-.menu.check:active {
-    color: @menu_controls_color;
-}
-
-.menu.radio:active {
-    color: @menu_controls_color;
-}
-
-.menu.check:prelight {
-    color: @theme_selected_fg_color;
-}
-
-.menu.radio:prelight {
-    color: @theme_selected_fg_color;
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-/* draw regular check and radio items using our SVG assets */
-.check,
-.check row:selected,
-.check row:selected:focused {
-    background-image: url ("assets/checkbox-unchecked.svg");
-}
-
-.check:insensitive,
-.check row:selected:insensitive,
-.check row:selected:focused:insensitive {
-    background-image: url ("assets/checkbox-unchecked-insensitive.svg");
-}
-
-.check:active,
-.check row:selected:active,
-.check row:selected:focused:active {
-    background-image: url ("assets/checkbox-checked.svg");
-}
-
-.check:active:insensitive,
-.check row:selected:active:insensitive,
-.check row:selected:focused:active:insensitive
-{
-    background-image: url ("assets/checkbox-checked-insensitive.svg");
-}
-
-.check:inconsistent,
-.check row:selected:inconsistent,
-.check row:selected:focused:inconsistent {
-    background-image: url ("assets/checkbox-mixed.svg");
-}
-
-.radio,
-.radio row:selected,
-.radio row:selected:focused {
-    background-image: url ("assets/radio-unselected.svg");
-}
-
-.radio:insensitive,
-.radio row:selected:insensitive,
-.radio row:selected:focused:insensitive {
-    background-image: url ("assets/radio-unselected-insensitive.svg");
-}
-
-.radio:active,
-.radio row:selected:active,
-.radio row:selected:focused:active {
-    background-image: url ("assets/radio-selected.svg");
-}
-
-.radio:active:insensitive,
-.radio row:selected:active:insensitive,
-.radio row:selected:focused:active:insensitive {
-    background-image: url ("assets/radio-selected-insensitive.svg");
-}
-
-.radio:inconsistent,
-.radio row:selected:inconsistent,
-.radio row:selected:focused:inconsistent {
-    background-image: url ("assets/radio-mixed.svg");
-}
-
-/************
- * Toolbars *
- ************/
-.toolbar {
-    border-style: solid;
-    border-color: darker (@theme_bg_color);
-    border-width: 1;
-    border-radius: 0;
-    padding: 1;
-}
-
-.toolbar:insensitive {
-    color: alpha (@theme_fg_color, 0.6);
-}
-
-/********************
- * Primary Toolbars *
- ********************/
-
-.primary-toolbar.toolbar {
-    background-image: -gtk-gradient (linear,
-				     left top,
-				     left bottom,
-				     from (@toolbar_gradient_base),
-                                     color-stop (0.01, shade (@theme_bg_color, 0.56)),
-                                     color-stop (0.02, @toolbar_gradient_base),
-				     color-stop (0.16, @toolbar_gradient_step1),
-				     color-stop (0.90, @toolbar_gradient_step2),
-				     color-stop (0.98, @toolbar_gradient_final),
-                                     color-stop (0.99, shade (@theme_bg_color, 0.83)),
-				     to (shade (@theme_bg_color, 0.83)));
-    border-width: 0;
-    border-radius: 0;
-    border-style: none;
-
-    padding: 2;
-
-    -GtkWidget-window-dragging: true;
-    -GtkToolbar-button-relief: 0;
-}
-
-.primary-toolbar.toolbar:insensitive {
-    background-image: none;
-    background-color: shade (@theme_bg_color, 0.97);
-
-    border-style: solid;
-    border-width: 1;
-    border-color: shade (@theme_bg_color, 0.91);
-}
-
-/* primary toolbar buttons */
-.primary-toolbar.toolbar.button {
-    border-style: none;
-    border-width: 1;
-    background-image: none;
-    background-color: alpha (@theme_base_color, 0.0);
-
-    -adwaita-focus-border-radius: 2;
-    -adwaita-focus-fill-color: alpha (@theme_base_color, 0.20);
-    -adwaita-focus-border-gradient: -gtk-gradient (linear,
-                                                   left top, left bottom,
-                                                   from (alpha (shade (@toolbar_active_button_color, 1.25), 0.90)),
-                                                   to (alpha (@toolbar_active_button_color, 0.62)));
-}
-
-.primary-toolbar.toolbar.button:insensitive {
-    border-style: none;
-    background-image: none;
-    background-color: alpha (@theme_base_color, 0.0);
-    -GtkWidget-focus-line-width: 0;
-}
-
-.primary-toolbar.toolbar.button:hover {
-    border-style: none;
-    background-image: -gtk-gradient (linear,
-				     left top, left bottom,
-				     from (alpha (@theme_base_color, 0.0)),
-				     color-stop (0.54, alpha (shade (@theme_base_color, 0.92), 0.49)),
-			             to (alpha (@theme_base_color, 0.0)));
-}
-
-.primary-toolbar.toolbar.button:active {
-    border-style: solid;
-    border-radius: 4;
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (@toolbar_active_button_color),
-                                             to (shade (@toolbar_active_button_color, 1.83)));
-
-    background-image: -gtk-gradient (linear,
-				     left top, left bottom,
-				     from (shade (@toolbar_gradient_base, 0.85)),
-			             to (alpha (shade (@toolbar_gradient_base, 0.85), 0.0)));
-
-    color: @theme_base_color;
-}
-
-.primary-toolbar.toolbar.button:active:prelight {
-    border-style: solid;
-    border-radius: 3;
-    background-image: -gtk-gradient (linear,
-				     left top, left bottom,
-				     from (alpha (shade (@toolbar_gradient_base, 0.76), 0.7)),
-			             to (alpha (shade (@toolbar_gradient_base, 1.14), 0.0)));
-
-    color: @theme_base_color;
-}
-
-.primary-toolbar.toolbar.button:active:insensitive {
-    border-style: solid;
-    border-radius: 3;
-    border-color: @inactive_frame_color;
-    -adwaita-border-gradient: none;
-}
-
-.primary-toolbar.toolbar GtkSeparatorToolItem {
-    -GtkWidget-wide-separators: 1;
-    -GtkWidget-separator-width: 1;
-
-    border-style: solid;
-    border-width: 1;
-    border-color: shade (@theme_bg_color, 0.56);
-}
-
-/* primary toolbar raised buttons */
-.primary-toolbar.toolbar.raised.button,
-.primary-toolbar.toolbar.raised.button:insensitive {
-    border-radius: 2;
-    border-width: 1;
-    border-color: @button_border;
-    border-style: solid;
-
-    background-image: -gtk-gradient (linear,
-				     left top, left bottom,
-                                     from (@button_gradient_color_a),
-                                     to (@button_gradient_color_b));
-
-    -GtkWidget-focus-line-width: 2;
-}
-
-.primary-toolbar.toolbar.raised.button:hover {
-    border-color: @button_border;
-    background-image: -gtk-gradient (linear,
-				     left top, left bottom,
-				     from (@button_hover_gradient_color_a),
-				     to (@button_hover_gradient_color_b));
-    border-width: 1;
-    border-style: solid;
-}
-
-.primary-toolbar.toolbar.raised.button:hover:active,
-.primary-toolbar.toolbar.raised.button:active {
-    background-image: -gtk-gradient (linear,
-    				     left top, left bottom,
-                                     from (@button_active_gradient_color_a),
-				     to (alpha (@button_active_gradient_color_b, 0.13)));
-    background-color: @theme_base_color;
-
-    border-color: @highlighted_border;
-    border-width: 1;
-    border-style: solid;
-}
-
-/* progressbars on primary toolbar entries are special */
-.primary-toolbar.toolbar.entry.progressbar {
-    /* FIXME: need correct colors/gradient */
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@trough_bg_color_a),
-                                     to (@trough_bg_color_b));
-
-    border-width: 0;
-    border-radius: 2;
-    border-color: shade (@inactive_frame_color, 0.925);
-}
-
-/*******************
- * Inline toolbars *
- *******************/
-
-.inline-toolbar.toolbar {
-    border-width: 1;
-    border-radius: 3;
-    border-style: solid;
-
-    background-image: -gtk-gradient (linear,
-				     left top,
-				     left bottom,
-				     from (@toolbar_gradient_base),
-				     color-stop (0.16, @toolbar_gradient_step1),
-				     color-stop (0.90, @toolbar_gradient_step2),
-				     color-stop (0.98, @toolbar_gradient_final),
-                                     color-stop (0.99, shade (@theme_bg_color, 0.83)),
-				     to (shade (@theme_bg_color, 0.83)));
-}
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch {
-    font: bold condensed 10;
-}
-
-GtkSwitch.trough {
-    color: @internal_element_color;
-    border-radius: 1;
-    border-width: 1;
-    border-style: solid;
-    border-color: shade (@frame_color, 1.22);
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@trough_bg_color_a),
-                                     to (@trough_bg_color_b));
-}
-
-GtkSwitch.trough:active {
-    color: @theme_base_color;
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (shade (@theme_selected_bg_color, 0.70)),
-                                             to (shade (@theme_selected_bg_color, 0.94)));
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@active_switch_bg_color_a),
-                                     to (@active_switch_bg_color_b));
-}
-
-GtkSwitch.trough:insensitive {
-    background-image: none;
-    background-color: shade (@theme_bg_color, 0.9);
-    border-color: shade (@inactive_frame_color, 0.845);
-    -adwaita-border-gradient: none;
-}
-
-GtkSwitch.slider {
-    border-width: 1;
-    border-radius: 1;
-    border-color: shade (@frame_color, 1.31);
-    border-style: solid;
-    padding: 2;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@switch_slider_color),
-                                     color-stop (0.02, @switch_slider_color),
-                                     color-stop (0.03, @theme_base_color),
-                                     color-stop (0.85, @switch_slider_color),
-                                     color-stop (0.86, shade (@switch_slider_color, 1.03)),
-                                     to (shade (@switch_slider_color, 1.03)));
-
-    -adwaita-switch-grip-color: shade (@switch_slider_color, 0.97);
-}
-
-GtkSwitch.slider:active {
-    border-color: @switch_slider_border;
-}
-
-GtkSwitch.slider:insensitive {
-    border-style: none;
-    background-image: none;
-    background-color: @insensitive_bg_color;
-}
-
-GtkStatusbar {
-    padding: 5;
-    color: @theme_fg_color;
-    -GtkStatusbar-shadow-type: none;
-}
-
-GtkScrolledWindow.frame {
-    border-style: solid;
-    border-color: darker (@theme_bg_color);
-    border-width: 1;
-    border-radius: 3;
-}
-
-GtkViewport,
-GtkIconView {
-    border-radius: 3;
-    padding: 0;
-}
-
-GtkIconView.view.cell:selected,
-GtkIconView.view.cell:selected:focused {
-    background-color: @theme_selected_bg_color;
-    border-radius: 4;
-
-    /* FIXME: this probably needs to be better;
-     * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
-     */
-    -adwaita-focus-border-color: @progressbar_border;
-    -adwaita-focus-border-radius: 3;
-    -adwaita-focus-border-dashes: 0;
-}
-
-.view {
-    background-color: @theme_base_color;
-    color: @theme_fg_color;
-    border-radius: 0;
-    border-width: 3;
-}
-
-GtkTreeView {
-    -GtkTreeView-vertical-separator: 0;
-    -GtkTreeView-expander-size: 8;
-
-    -GtkWidget-focus-line-width: 1;
-    -adwaita-focus-border-radius: 0;
-    -adwaita-focus-border-dashes: 0;
-    -adwaita-focus-border-color: @keyboard_focus_border_a;
-}
-
-GtkTreeView.separator {
-    background-color: darker (@theme_bg_color);
-}
-
-column-header {
-    padding: 1 2;
-}
-
-column-header .button {
-    border-width: 0;
-    border-radius: 0;
-}
-
-row:hover {
-    border-width: 0;
-}
-
-row:insensitive {
-    border-width: 0;
-}
-
-row:selected:focused {
-    border-width: 0;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@progressbar_border),
-                                     color-stop (0.02, @progressbar_border),
-                                     color-stop (0.03, @theme_selected_bg_color),
-                                     color-stop (0.97, @theme_selected_bg_color),
-                                     color-stop (0.98, @progressbar_border),
-                                     to (@progressbar_border));
-    background-color: @theme_selected_bg_color;
-}
-
-row:selected {
-    border-width: 0;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@theme_selected_bg_color),
-                                     to (@theme_selected_bg_color));
-}
-
-.cell {
-    color: @theme_text_color;
-    padding: 2;
-    border-width: 0;
-}
-
-.cell:selected {
-    background-color: @theme_selected_bg_color;
-}
-
-.expander {
-    color: @internal_element_color;
-    border-color: @internal_element_color;
-
-    background-color: @theme_base_color;
-}
-
-.expander:active {
-    color: @internal_element_color;
-    border-color: @internal_element_color;
-
-    background-color: @theme_base_color;
-}
-
-.expander:prelight {
-    color: @internal_element_color;
-    border-color: @internal_element_color;
-
-    background-color: shade (@theme_bg_color, 1.02);
-}
-
-.expander row:selected,
-.expander row:selected:focused {
-    border-color: @expander_row_selected_color;
-    color: @expander_row_selected_color;
-    background-color: @theme_selected_bg_color;
-}
-
-/* Calendars */
-GtkCalendar.view {
-    border-radius: 3;
-    border-style: solid;
-    border-width: 1;
-    padding: 2;
-}
-
-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 {
-    background-image: -gtk-gradient (linear,
-                                     left top,
-                                     left bottom,
-                                     from (rgba (0, 0, 0, 0)),
-                                     to (rgba (0, 0, 0, 0)));
-}
-
-.highlight,
-GtkCalendar.highlight {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-    border-radius: 0;
-    padding: 0;
-    border-width: 0;
-}
-
-.info {
-    background-color: @info_bg_color;
-    color: @info_fg_color;
-}
-
-.warning {
-    background-color: @warning_bg_color;
-    color: @warning_fg_color;
-}
-
-.question {
-    background-color: @question_bg_color;
-    color: @question_fg_color;
-}
-
-.error {
-    background-color: @error_bg_color;
-    color: @error_fg_color;
-}
-
-.dim-label {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.50);
-}
-
-.sidebar,
-.sidebar.view {
-    background-color: shade (@theme_bg_color, 0.99);
-}
-
-ApDocView, /* Abiword */
-EogScrollView, /* Eog */
-CheeseThumbView /* Cheese */
-{
-    background-color: @chrome_bg_color;
-    -EogScrollView-shadow-type: none;
-}
-
-/* gnome-terminal */
-TerminalScreen {
-    background-color: @theme_base_color;
-    color: @theme_fg_color;
-    -TerminalScreen-background-darkness: 0.95;
-}
-
-/**********************
- * Fallback Mode Panel
- **********************/
-
-PanelWidget,
-PanelApplet,
-PanelApplet > GtkMenuBar.menubar,
-.gnome-panel-menu-bar,
-PanelAppletFrame,
-PanelMenuBar.menubar,
-PanelToplevel {
-    background-color: @os_chrome_bg_color;
-    background-image: none;
-    color: @os_chrome_fg_color;
-}
-
-ClockBox,
-.gnome-panel-menu-bar {
-    font: bold;
-}
-
-PanelApplet > GtkMenuBar.menubar.menuitem:prelight,
-.gnome-panel-menu-bar.menuitem:prelight {
-    background-color: @os_chrome_selected_bg_color;
-    color: @os_chrome_selected_fg_color;
-    border-color: lighter (@os_chrome_selected_bg_color);
-}
-
-/* panel buttons (clock, tasklist etc) */
-PanelApplet GtkToggleButton {
-    background-color: @os_chrome_bg_color;
-    background-image: none;
-    border-color: @os_chrome_bg_color;
-    border-width: 1;
-    color: @os_chrome_fg_color;
-}
-
-PanelApplet GtkToggleButton:prelight:active,
-PanelApplet GtkToggleButton:active {
-    background-color: @os_chrome_selected_bg_color;
-    background-image: none;
-    border-color: lighter (@os_chrome_selected_bg_color);
-    border-width: 1;
-    color: @os_chrome_selected_fg_color;
-}
-
-PanelApplet GtkToggleButton:prelight {
-    background-color: @os_chrome_bg_color;
-    background-image: none;
-    border-color: @os_chrome_bg_color;
-    border-width: 1;
-    color: @os_chrome_selected_fg_color;
-}
-
-NaTrayApplet {
-    -NaTrayApplet-icon-padding: 12;
-    -NaTrayApplet-icon-size: 16;
-}
-
-WnckPager, WnckTasklist {
-    background-color: @os_chrome_selected_bg_color;
-    background-image: none;
-    color: @os_chrome_fg_color;
-}
-
-GsmFailWhaleDialog,
-GsmFailWhaleDialog * {
-    background-color: @os_chrome_bg_color;
-    background-image: none;
-    color: @os_chrome_fg_color;
-}
diff --git a/desktop-themes/aldabra/gtk-3.0/gtk.css b/desktop-themes/aldabra/gtk-3.0/gtk.css
deleted file mode 100644
index f673da42..00000000
--- a/desktop-themes/aldabra/gtk-3.0/gtk.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Default color scheme */
-@define-color base_color #ffffff;
-@define-color bg_color #ededed;
-@define-color tooltip_bg_color #343434;
-@define-color selected_bg_color #4a90d9;
-@define-color text_color #2e3436;
-@define-color fg_color #2e3436;
-@define-color tooltip_fg_color #ffffff;
-@define-color selected_fg_color #ffffff;
-
-/* Colormap actually used by the theme, to be overridden in other css files */
-@define-color theme_base_color @base_color;
-@define-color theme_text_color @text_color;
-@define-color theme_bg_color @bg_color;
-@define-color theme_fg_color @fg_color;
-@define-color theme_tooltip_bg_color @tooltip_bg_color;
-@define-color theme_tooltip_fg_color @tooltip_fg_color;
-@define-color theme_selected_bg_color @selected_bg_color;
-@define-color theme_selected_fg_color @selected_fg_color;
-
-@define-color link_color #4a90d9;
-@define-color frame_color #8a9580;
-@define-color inactive_frame_color #c7ccc1;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-@define-color success_color #4e9a06;
-
-@define-color info_fg_color rgb (181, 171, 156);
-@define-color info_bg_color rgb (252, 252, 189);
-@define-color warning_fg_color rgb (173, 120, 41);
-@define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color rgb (97, 122, 214);
-@define-color question_bg_color rgb (138, 173, 212);
-@define-color error_fg_color rgb (166, 38, 38);
-@define-color error_bg_color rgb (237, 54, 54);
-
-@define-color keyboard_focus_border_a #a2c9f1;
-@define-color keyboard_focus_border_b #6794cf;
-
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
-@define-color chrome_bg_color #1e1a17;
-@define-color chrome_fg_color #fff;
-
-@define-color focused_entry_border #579eea;
-
-@define-color button_gradient_color_a #f4f6f4;
-@define-color button_gradient_color_b #d7dad7;
-@define-color button_border #a7aba7;
-
-@define-color button_hover_gradient_color_a @theme_base_color;
-@define-color button_hover_gradient_color_b shade (@button_gradient_color_a, 0.94);
-
-@define-color button_active_gradient_color_a #a2a9a2;
-@define-color button_active_gradient_color_b shade (@button_active_gradient_color_a, 0.83);
-
-@define-color insensitive_bg_color #f4f4f2;
-@define-color insensitive_fg_color #a7aba7;
-
-@define-color trough_bg_color_a #ccccc7;
-@define-color trough_bg_color_b #e4e4e1;
-
-@define-color active_switch_bg_color_a #509ae7;
-@define-color active_switch_bg_color_b #84b8ee;
-
-@define-color switch_slider_color #eeeeec;
-@define-color switch_slider_border #2a79cb;
-
-@define-color progressbar_background_a #1f72c6;
-@define-color progressbar_background_b #76b0ec;
-@define-color progressbar_border #3277bf;
-
-@define-color scale_fill_a #2c85e2;
-@define-color scale_fill_b #b8d6f5;
-
-@define-color menu_controls_color #555753;
-
-@define-color highlighted_border #8a8f8a;
-@define-color internal_element_color #888a85;
-
-@define-color notebook_border #a6a6a6;
-@define-color notebook_active_tab_border #1372d3;
-@define-color notebook_selected_tab_color #8dc0f3;
-
-@define-color notebook_tab_gradient_a @theme_base_color;
-@define-color notebook_tab_gradient_b @switch_slider_color;
-
-@define-color toolbar_gradient_base #aaaa9e;
-@define-color toolbar_gradient_step1 #bcbcb4;
-@define-color toolbar_gradient_step2 #d9d9d7;
-@define-color toolbar_gradient_final #e5e5e2;
-
-@define-color toolbar_active_button_color #909081;
-
-@define-color expander_row_selected_color #acccee;
-
-@import url("gtk-widgets.css");
diff --git a/desktop-themes/aldabra/gtk-3.0/settings.ini b/desktop-themes/aldabra/gtk-3.0/settings.ini
deleted file mode 100644
index 1a08b659..00000000
--- a/desktop-themes/aldabra/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-color-scheme = "base_color:#ffffff\nbg_color:#ededed\ntooltip_bg_color:#343434\nselected_bg_color:#4a90d9\ntext_color:#2e3436\nfg_color:#2e3436;\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff"
-gtk-auto-mnemonics = 1
diff --git a/desktop-themes/aldabra/index.theme.in b/desktop-themes/aldabra/index.theme.in
deleted file mode 100644
index cacc5a48..00000000
--- a/desktop-themes/aldabra/index.theme.in
+++ /dev/null
@@ -1,33 +0,0 @@
-[X-GNOME-Metatheme]
-Name=Aldabra
-Type=X-GNOME-Metatheme
-Encoding=UTF-8
-GtkTheme=aldabra
-MetacityTheme=aldabra
-CursorTheme=mate
-CursorSize=24
-NotificationTheme=slider
-ApplicationFont=Cantarell 11
-DocumentFont=Sans 11
-DesktopFont=Cantarell 11
-WindowTitleFont=Cantarell Bold 11
-FixedWidthFont=Monospace 9
-
-[Desktop Entry]
-Name=Aldabra
-Type=X-MATE-Metatheme
-Comment=
-
-[X-MATE-Metatheme]
-GtkTheme=aldabra
-MarcoTheme=aldabra
-IconTheme=mate
-CursorTheme=mate
-CursorSize=24
-NotificationTheme=slider
-ApplicationFont=Cantarell 11
-DocumentFont=Sans 11
-DesktopFont=Cantarell 11
-WindowTitleFont=Cantarell Bold 11
-FixedWidthFont=Monospace 9
-BackgroundImage=@BACKGROUND_DIR@/stripes.jpg
diff --git a/desktop-themes/aldabra/metacity-1/Makefile.am b/desktop-themes/aldabra/metacity-1/Makefile.am
deleted file mode 100644
index 4752dbd1..00000000
--- a/desktop-themes/aldabra/metacity-1/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-
-themedir = $(datadir)/themes/aldabra/metacity-1
-
-theme_DATA = \
-	metacity-theme-1.xml \
-	metacity-theme-2.xml \
-	metacity-theme-3.xml \
-	background.png \
-	button_close.png \
-	button_close_prelight.png \
-	button_close_pressed.png
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/aldabra/metacity-1/background.png b/desktop-themes/aldabra/metacity-1/background.png
deleted file mode 100644
index d5ecc7ab..00000000
--- a/desktop-themes/aldabra/metacity-1/background.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/metacity-1/button_close.png b/desktop-themes/aldabra/metacity-1/button_close.png
deleted file mode 100644
index cd4b7b1f..00000000
--- a/desktop-themes/aldabra/metacity-1/button_close.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/metacity-1/button_close_prelight.png b/desktop-themes/aldabra/metacity-1/button_close_prelight.png
deleted file mode 100644
index b6710d24..00000000
--- a/desktop-themes/aldabra/metacity-1/button_close_prelight.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/metacity-1/button_close_pressed.png b/desktop-themes/aldabra/metacity-1/button_close_pressed.png
deleted file mode 100644
index 983820f4..00000000
--- a/desktop-themes/aldabra/metacity-1/button_close_pressed.png
+++ /dev/null
diff --git a/desktop-themes/aldabra/metacity-1/metacity-theme-1.xml b/desktop-themes/aldabra/metacity-1/metacity-theme-1.xml
deleted file mode 100644
index a6a1b516..00000000
--- a/desktop-themes/aldabra/metacity-1/metacity-theme-1.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-	<info>
-		<name>Aldabra</name>
-		<author>Hylke Bons</author>
-		<copyright>Intel, 2010</copyright>
-		<date>April 23, 2010</date>
-		<description>The Netbook Window Theme</description>
-	</info>
-
-	<frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false" title_scale="medium"> 
-		<distance name="left_width" value="1"/>
-		<distance name="right_width" value="1"/>
-		<distance name="bottom_height" value="1"/>
-		<distance name="left_titlebar_edge" value="4"/>
-		<distance name="right_titlebar_edge" value="4"/>
-		<distance name="button_width" value="36"/>
-		<distance name="button_height" value="34"/>
-		<distance name="title_vertical_pad" value="20"/>
-		<border name="title_border" left="0" right="0" top="1" bottom="0"/>
-		<border name="button_border" left="0" right="1" top="1" bottom="0"/>
-	</frame_geometry>
-	<frame_geometry name="maximized" title_scale="medium" parent="normal"/>
-	<frame_geometry name="utility" title_scale="medium" parent="normal"/> 
-	<frame_geometry name="border" has_title="false" parent="normal"/> 
-
-	<draw_ops name="bg_titlebar_focused">
-		<image filename="background.png" x="1" y="1" width="2560" height="76" />
-	</draw_ops>
-
-	<draw_ops name="bg_bottom_focused">
-		<rectangle color="red" x="0" y="height - 3" width="width" height="3" filled="true"/>
-	</draw_ops>
-
-	<draw_ops name="lines_border_focused">
-		<line color="#556168" x1="0" y1="0" x2="0" y2="height" dash_off_length="0" dash_on_length="3"/>
-		<line color="#92918a" x1="0" y1="0" x2="width" y2="0" dash_off_length="0" dash_on_length="3"/>
-		<line color="#556168" x1="width-1" y1="0" x2="width-1" y2="height" dash_off_length="0" dash_on_length="3"/>
-		<line color="#92918a" x1="1" y1="height-1" x2="width-2" y2="height-1" dash_off_length="0" dash_on_length="3"/>
-	</draw_ops>
-
-	<draw_ops name="title_all"> 
-		<title x="6" y="(((height - title_height -1) / 2) `max` 0) + 2" color="#3b3b3a"/>
-	</draw_ops>
-
-	<draw_ops name="titlebar_normal_focused"> 
-		<include name="bg_titlebar_focused"/>
-		<include name="lines_border_focused"/>
-	</draw_ops>
-
-	<draw_ops name="normal_focused"> 
-		<include name="bg_bottom_focused"/>
-		<include name="lines_border_focused"/>
-	</draw_ops>
-
-	<draw_ops name="button_close_normal"> 
-		<image filename="button_close.png"
-				alpha="1"
-				x="0"
-				y="0"
-				width="36"
-				height="34"/>
-	</draw_ops>
-
-	<draw_ops name="button_close_prelight"> 
-		<image filename="button_close_prelight.png"
-				alpha="1"
-				x="0"
-				y="0"
-				width="36"
-				height="34"/>
-	</draw_ops>
-
-	<draw_ops name="button_close_pressed"> 
-		<image filename="button_close_pressed.png"
-				alpha="1"
-				x="0"
-				y="0"
-				width="36"
-				height="34"/>
-	</draw_ops>
-
-	<draw_ops name="none"/> 
-
-	<frame_style name="normal_focused" geometry="normal"> 
-		<piece position="entire_background" draw_ops="normal_focused"/>
-		<piece position="titlebar" draw_ops="titlebar_normal_focused"/>
-		<piece position="title" draw_ops="title_all"/>
-		<button function="close" state="normal" draw_ops="button_close_normal"/>
-		<button function="close" state="prelight" draw_ops="button_close_prelight"/>
-		<button function="close" state="pressed" draw_ops="button_close_pressed"/>
-		<button function="maximize" state="normal" draw_ops="none"/>
-		<button function="maximize" state="prelight" draw_ops="none"/>
-		<button function="maximize" state="pressed" draw_ops="none"/>
-		<button function="minimize" state="normal" draw_ops="none"/>
-		<button function="minimize" state="prelight" draw_ops="none"/>
-		<button function="minimize" state="pressed" draw_ops="none"/>
-		<button function="menu" state="normal" draw_ops="none"/>
-		<button function="menu" state="pressed" draw_ops="none"/>
-		<button function="menu" state="prelight" draw_ops="none"/>
-	</frame_style>
-
-	<frame_style name="normal_unfocused" geometry="normal"> 
-		<piece position="entire_background" draw_ops="normal_focused"/>
-		<piece position="titlebar" draw_ops="titlebar_normal_focused"/>
-		<piece position="title" draw_ops="title_all"/>
-		<button function="close" state="normal" draw_ops="button_close_normal"/>
-		<button function="close" state="prelight" draw_ops="button_close_prelight"/>
-		<button function="close" state="pressed" draw_ops="button_close_pressed"/>
-		<button function="maximize" state="normal" draw_ops="none"/>
-		<button function="maximize" state="prelight" draw_ops="none"/>
-		<button function="maximize" state="pressed" draw_ops="none"/>
-		<button function="minimize" state="normal" draw_ops="none"/>
-		<button function="minimize" state="prelight" draw_ops="none"/>
-		<button function="minimize" state="pressed" draw_ops="none"/>
-		<button function="menu" state="normal" draw_ops="none"/>
-		<button function="menu" state="pressed" draw_ops="none"/>
-		<button function="menu" state="prelight" draw_ops="none"/>
-	</frame_style>
-
-	<frame_style name="maximized_focused" geometry="maximized"> 
-		<piece position="entire_background" draw_ops="normal_focused"/>
-		<piece position="titlebar" draw_ops="titlebar_normal_focused"/>
-		<piece position="title" draw_ops="title_all"/>
-		<button function="close" state="normal" draw_ops="button_close_normal"/>
-		<button function="close" state="prelight" draw_ops="button_close_prelight"/>
-		<button function="close" state="pressed" draw_ops="button_close_pressed"/>
-		<button function="maximize" state="normal" draw_ops="none"/>
-		<button function="maximize" state="prelight" draw_ops="none"/>
-		<button function="maximize" state="pressed" draw_ops="none"/>
-		<button function="minimize" state="normal" draw_ops="none"/>
-		<button function="minimize" state="prelight" draw_ops="none"/>
-		<button function="minimize" state="pressed" draw_ops="none"/>
-		<button function="menu" state="normal" draw_ops="none"/>
-		<button function="menu" state="pressed" draw_ops="none"/>
-		<button function="menu" state="prelight" draw_ops="none"/>
-	</frame_style>
-
-	<frame_style name="maximized_unfocused" geometry="maximized"> 
-		<piece position="entire_background" draw_ops="normal_focused"/>
-		<piece position="titlebar" draw_ops="titlebar_normal_focused"/>
-		<piece position="title" draw_ops="title_all"/>
-		<button function="close" state="normal" draw_ops="button_close_normal"/>
-		<button function="close" state="prelight" draw_ops="button_close_prelight"/>
-		<button function="close" state="pressed" draw_ops="button_close_pressed"/>
-		<button function="maximize" state="normal" draw_ops="none"/>
-		<button function="maximize" state="prelight" draw_ops="none"/>
-		<button function="maximize" state="pressed" draw_ops="none"/>
-		<button function="minimize" state="normal" draw_ops="none"/>
-		<button function="minimize" state="prelight" draw_ops="none"/>
-		<button function="minimize" state="pressed" draw_ops="none"/>
-		<button function="menu" state="normal" draw_ops="none"/>
-		<button function="menu" state="pressed" draw_ops="none"/>
-		<button function="menu" state="prelight" draw_ops="none"/>
-	</frame_style>
-
-	<frame_style name="border_focused" geometry="border"> 
-		<piece position="entire_background" draw_ops="normal_focused"/>
-		<button function="close" state="normal" draw_ops="button_close_normal"/>
-		<button function="close" state="prelight" draw_ops="button_close_prelight"/>
-		<button function="close" state="pressed" draw_ops="button_close_pressed"/>
-		<button function="maximize" state="normal" draw_ops="none"/>
-		<button function="maximize" state="prelight" draw_ops="none"/>
-		<button function="maximize" state="pressed" draw_ops="none"/>
-		<button function="minimize" state="normal" draw_ops="none"/>
-		<button function="minimize" state="prelight" draw_ops="none"/>
-		<button function="minimize" state="pressed" draw_ops="none"/>
-		<button function="menu" state="normal" draw_ops="none"/>
-		<button function="menu" state="pressed" draw_ops="none"/>
-		<button function="menu" state="prelight" draw_ops="none"/>
-	</frame_style>
-
-	<frame_style name="border_unfocused" geometry="border"> 
-		<piece position="entire_background" draw_ops="normal_focused"/>
-		<button function="close" state="normal" draw_ops="button_close_normal"/>
-		<button function="close" state="prelight" draw_ops="button_close_prelight"/>
-		<button function="close" state="pressed" draw_ops="button_close_pressed"/>
-		<button function="maximize" state="normal" draw_ops="none"/>
-		<button function="maximize" state="prelight" draw_ops="none"/>
-		<button function="maximize" state="pressed" draw_ops="none"/>
-		<button function="minimize" state="normal" draw_ops="none"/>
-		<button function="minimize" state="prelight" draw_ops="none"/>
-		<button function="minimize" state="pressed" draw_ops="none"/>
-		<button function="menu" state="normal" draw_ops="none"/>
-		<button function="menu" state="pressed" draw_ops="none"/>
-		<button function="menu" state="prelight" draw_ops="none"/>
-	</frame_style>
-
-	<frame_style name="utility_focused" geometry="utility"> 
-		<piece position="entire_background" draw_ops="normal_focused"/>
-		<piece position="titlebar" draw_ops="titlebar_normal_focused"/>
-		<piece position="title" draw_ops="title_all"/>
-		<button function="close" state="normal" draw_ops="button_close_normal"/>
-		<button function="close" state="prelight" draw_ops="button_close_prelight"/>
-		<button function="close" state="pressed" draw_ops="button_close_pressed"/>
-		<button function="maximize" state="normal" draw_ops="none"/>
-		<button function="maximize" state="prelight" draw_ops="none"/>
-		<button function="maximize" state="pressed" draw_ops="none"/>
-		<button function="minimize" state="normal" draw_ops="none"/>
-		<button function="minimize" state="prelight" draw_ops="none"/>
-		<button function="minimize" state="pressed" draw_ops="none"/>
-		<button function="menu" state="normal" draw_ops="none"/>
-		<button function="menu" state="pressed" draw_ops="none"/>
-		<button function="menu" state="prelight" draw_ops="none"/>
-	</frame_style>
-
-	<frame_style name="utility_unfocused" geometry="utility"> 
-		<piece position="entire_background" draw_ops="normal_focused"/>
-		<piece position="titlebar" draw_ops="titlebar_normal_focused"/>
-		<piece position="title" draw_ops="title_all"/>
-		<button function="close" state="normal" draw_ops="button_close_normal"/>
-		<button function="close" state="prelight" draw_ops="button_close_prelight"/>
-		<button function="close" state="pressed" draw_ops="button_close_pressed"/>
-		<button function="maximize" state="normal" draw_ops="none"/>
-		<button function="maximize" state="prelight" draw_ops="none"/>
-		<button function="maximize" state="pressed" draw_ops="none"/>
-		<button function="minimize" state="normal" draw_ops="none"/>
-		<button function="minimize" state="prelight" draw_ops="none"/>
-		<button function="minimize" state="pressed" draw_ops="none"/>
-		<button function="menu" state="normal" draw_ops="none"/>
-		<button function="menu" state="pressed" draw_ops="none"/>
-		<button function="menu" state="prelight" draw_ops="none"/>
-	</frame_style>
-
-	<frame_style_set name="normal">
-		<frame state="normal" resize="none" focus="no" style="normal_unfocused"/>
-		<frame state="normal" resize="none" focus="yes" style="normal_focused"/>
-		<frame state="normal" resize="both" focus="no" style="normal_unfocused"/>
-		<frame state="normal" resize="both" focus="yes" style="normal_focused"/>
-		<frame state="shaded" focus="no" style="normal_unfocused"/>
-		<frame state="shaded" focus="yes" style="normal_focused"/>
-		<frame state="maximized" focus="no" style="normal_focused"/>
-		<frame state="maximized" focus="yes" style="normal_focused"/>
-		<frame state="maximized_and_shaded" focus="no" style="normal_unfocused"/>
-		<frame state="maximized_and_shaded" focus="yes" style="normal_focused"/>
-	</frame_style_set>
-
-	<frame_style_set name="utility">
-		<frame state="normal" resize="none" focus="no" style="normal_focused"/>
-		<frame state="normal" resize="none" focus="yes" style="normal_focused"/>
-		<frame state="normal" resize="both" focus="no" style="normal_unfocused"/>
-		<frame state="normal" resize="both" focus="yes" style="normal_focused"/>
-		<frame state="shaded" focus="no" style="normal_focused"/>
-		<frame state="shaded" focus="yes" style="normal_focused"/>
-		<frame state="maximized" focus="no" style="normal_unfocused"/>
-		<frame state="maximized" focus="yes" style="normal_focused"/>
-		<frame state="maximized_and_shaded" focus="no" style="normal_focused"/>
-		<frame state="maximized_and_shaded" focus="yes" style="normal_focused"/>
-	</frame_style_set>
-
-	<frame_style_set name="border">
-		<frame state="normal" resize="none" focus="no" style="normal_focused"/>
-		<frame state="normal" resize="none" focus="yes" style="normal_focused"/>
-		<frame state="normal" resize="both" focus="no" style="normal_unfocused"/>
-		<frame state="normal" resize="both" focus="yes" style="normal_focused"/>
-		<frame state="shaded" focus="no" style="normal_focused"/>
-		<frame state="shaded" focus="yes" style="normal_focused"/>
-		<frame state="maximized" focus="no" style="normal_focused"/>
-		<frame state="maximized" focus="yes" style="normal_focused"/>
-		<frame state="maximized_and_shaded" focus="no" style="normal_focused"/>
-		<frame state="maximized_and_shaded" focus="yes" style="normal_focused"/>
-	</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"/>
-
-</metacity_theme>
diff --git a/desktop-themes/aldabra/metacity-1/metacity-theme-2.xml b/desktop-themes/aldabra/metacity-1/metacity-theme-2.xml
deleted file mode 100644
index 4feb8116..00000000
--- a/desktop-themes/aldabra/metacity-1/metacity-theme-2.xml
+++ /dev/null
@@ -1,1604 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Aldabra</name>
-	<author>GNOME Art Team &lt;art.gnome.org&gt;</author>
-	<copyright>&#194; Intel, &#194; Red Hat, Lapo Calamandrei</copyright>
-	<date>2010</date>
-	<description>Default GNOME 3 window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<!-- color of the button icons -->
-<constant name="C_icons_focused" value="gtk:text[SELECTED]" />
-<constant name="C_icons_focused_pressed" value="#ffffff" />
-<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<constant name="C_icons_unfocused_prelight" value="gtk:bg[NORMAL]" />
-<constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
-<constant name="D_icons_unfocused_offset" value="2" /> <!-- offset of the unfocused icons -->
-<constant name="D_icons_shrink" value="1" /> <!-- increasing this value makes the icons in buttons smaller -->
-<constant name="D_icons_grow" value="0" /> <!-- increasing this value makes the icons in buttons bigger -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="2" />
-	<distance name="left_titlebar_edge" value="0"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="10"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="1" bottom="3"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="0"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons 								-->
-	<border name="title_border" left="10" right="10" top="1" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="3"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" parent="normal">
-	<distance name="title_vertical_pad" value="0"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused"/>
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" />
-		<!-- <color value="gtk:bg[NORMAL]"/> -->
-		<!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> -->
-		<color value="gtk:bg[NORMAL]"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_unfocused">
-	<rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-	<arc color="C_titlebar_focused_hilight" x="1" y="1" width="7" height="7"  start_angle="270" extent_angle="90" />
-	<arc color="C_titlebar_focused_hilight" x="width-10" y="1" width="9" height="7"  start_angle="0" extent_angle="90" />
-	<gradient type="vertical" x="1" y="5" width="1" height="height-9">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-	<!-- button icons-->
-
-<constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-
-<draw_ops name="close_glyph_focused">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_focused" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="close_shadow_focused">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_shadow" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_shadow_focused" y="1" />
-	<!-- I'm not happy with the current aa I'll draw it twice to make it darker -->
-	<include name="close_shadow_focused" y="1" />
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<include name="close_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_unfocused" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_shadow_focused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_shadow_focused" y="1" />
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<include name="maximize_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_shadow_focused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_shadow_focused" y="1" />
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<include name="minimize_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="menu_shadow_focused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_shadow_focused" y="1" />
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<include name="menu_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_focused" />
-	<rectangle 
-		x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="shade_shadow_focused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_shadow_focused" y="1" />
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-
-	<!-- button backgrounds -->
-
-<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-<constant name="C_button_hilight" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6" />
-
-<draw_ops name="button_fill"> <!-- button background gradient -->
-	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.15" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.21" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.27" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.12" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="button_bottom">
-	<line x1="0" y1="height-2" x2="width-1" y2="height-2" color="C_button_border" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_button_hilight" />
-</draw_ops>
-
-<draw_ops name="button_bevel">
-	<gradient type="vertical" x="0" y="0" width="1" height="height-2">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.1"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-	</gradient>
-	<gradient type="vertical" x="width-1" y="0" width="1" height="height-2">
-		<color value="C_border_focused"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status -->
-	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.2" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.04" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status -->
-	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
-		<color value="C_border_focused" />
-		<color value="blend/#000000/gtk:bg[NORMAL]/0.75" />
-		<color value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="button">
-	<include name="button_fill" />
-	<include name="button_bevel" />
-	<include name="button_bottom" />
-</draw_ops>
-
-<draw_ops name="button_prelight">
-	<include name="button_fill_prelight" />
-	<include name="button_bevel" />
-	<include name="button_bottom" />
-</draw_ops>
-
-<draw_ops name="button_pressed">
-	<include name="button_fill_pressed" />
-	<include name="button_bottom" />
-</draw_ops>
-
-<!-- things get messy here -->
-
-<draw_ops name="button_inner_right_slice1">
-	<clip x="0" y="0" width="width" height="height-5" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice2">
-	<clip x="1" y="height-5" width="width-1" height="2" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice3">
-	<clip x="2" y="height-3" width="width-2" height="1" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice4">
-	<clip x="4" y="height-2" width="width-4" height="2" />
-	<include name="button" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_fill">
-	<include name="button_inner_right_slice1" />
-	<include name="button_inner_right_slice2" />
-	<include name="button_inner_right_slice3" />
-	<include name="button_inner_right_slice4" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_slice1_prelight">
-	<clip x="0" y="0" width="width" height="height-5" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice2_prelight">
-	<clip x="1" y="height-5" width="width-1" height="2" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice3_prelight">
-	<clip x="2" y="height-3" width="width-2" height="1" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice4_prelight">
-	<clip x="4" y="height-2" width="width-4" height="2" />
-	<include name="button_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_fill_prelight">
-	<include name="button_inner_right_slice1_prelight" />
-	<include name="button_inner_right_slice2_prelight" />
-	<include name="button_inner_right_slice3_prelight" />
-	<include name="button_inner_right_slice4_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_slice1_pressed">
-	<clip x="0" y="0" width="width" height="height-5" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice2_pressed">
-	<clip x="1" y="height-5" width="width-1" height="2" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice3_pressed">
-	<clip x="2" y="height-3" width="width-2" height="1" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice4_pressed">
-	<clip x="4" y="height-2" width="width-4" height="2" />
-	<include name="button_pressed" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_fill_pressed">
-	<include name="button_inner_right_slice1_pressed" />
-	<include name="button_inner_right_slice2_pressed" />
-	<include name="button_inner_right_slice3_pressed" />
-	<include name="button_inner_right_slice4_pressed" />
-</draw_ops>
-
-
-<draw_ops name="button_inner_right_border">
-	<gradient type="vertical" x="0" y="0" width="1" height="height-5">
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-	<arc color="C_button_hilight" x="1" y="height-10" width="9" height="9"  start_angle="180" extent_angle="90" />
-	<gradient type="vertical" x="1" y="0" width="1" height="height-5">
-		<color value="C_border_focused" />
-		<color value="C_button_border" />
-	</gradient>
-	<arc color="C_button_border" x="1" y="height-11" width="9" height="9"  start_angle="180" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="button_inner_right">
-	<include name="button_inner_right_fill" />
-	<include name="button_inner_right_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_prelight">
-	<include name="button_inner_right_fill_prelight" />
-	<include name="button_inner_right_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_pressed">
-	<include name="button_inner_right_fill_pressed" />
-	<include name="button_inner_right_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_slice1">
-	<clip x="0" y="0" width="width-1" height="height-5" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice2">
-	<clip x="0" y="height-5" width="width-2" height="2" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice3">
-	<clip x="0" y="height-3" width="width-3" height="1" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice4">
-	<clip x="0" y="height-2" width="width-5" height="2" />
-	<include name="button" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_fill">
-	<include name="button_inner_left_slice1" />
-	<include name="button_inner_left_slice2" />
-	<include name="button_inner_left_slice3" />
-	<include name="button_inner_left_slice4" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_slice1_prelight">
-	<clip x="0" y="0" width="width-1" height="height-5" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice2_prelight">
-	<clip x="0" y="height-5" width="width-2" height="2" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice3_prelight">
-	<clip x="0" y="height-3" width="width-3" height="1" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice4_prelight">
-	<clip x="0" y="height-2" width="width-5" height="2" />
-	<include name="button_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_fill_prelight">
-	<include name="button_inner_left_slice1_prelight" />
-	<include name="button_inner_left_slice2_prelight" />
-	<include name="button_inner_left_slice3_prelight" />
-	<include name="button_inner_left_slice4_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_slice1_pressed">
-	<clip x="0" y="0" width="width-1" height="height-5" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice2_pressed">
-	<clip x="0" y="height-5" width="width-2" height="2" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice3_pressed">
-	<clip x="0" y="height-3" width="width-3" height="1" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice4_pressed">
-	<clip x="0" y="height-2" width="width-5" height="2" />
-	<include name="button_pressed" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_fill_pressed">
-	<include name="button_inner_left_slice1_pressed" />
-	<include name="button_inner_left_slice2_pressed" />
-	<include name="button_inner_left_slice3_pressed" />
-	<include name="button_inner_left_slice4_pressed" />
-</draw_ops>
-
-
-<draw_ops name="button_inner_left_border">
-	<gradient type="vertical" x="width-1" y="0" width="1" height="height-6">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="C_button_hilight" />
-	</gradient>
-	<arc color="C_button_hilight" x="width-11" y="height-11" width="10" height="10"  start_angle="90" extent_angle="90" />
-	<gradient type="vertical" x="width-2" y="0" width="1" height="height-5">
-		<color value="C_border_focused" />
-		<color value="C_button_border" />
-	</gradient>
-	<arc color="C_button_border" x="width-11" y="height-11" width="9" height="9"  start_angle="90" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="button_inner_left">
-	<include name="button_inner_left_fill" />
-	<include name="button_inner_left_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_prelight">
-	<include name="button_inner_left_fill_prelight" />
-	<include name="button_inner_left_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_pressed">
-	<include name="button_inner_left_fill_pressed" />
-	<include name="button_inner_left_border" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-
-</metacity_theme>
diff --git a/desktop-themes/aldabra/metacity-1/metacity-theme-3.xml b/desktop-themes/aldabra/metacity-1/metacity-theme-3.xml
deleted file mode 100644
index 7b7dcaf9..00000000
--- a/desktop-themes/aldabra/metacity-1/metacity-theme-3.xml
+++ /dev/null
@@ -1,1940 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Aldabra</name>
-	<author>GNOME Art Team &lt;art.gnome.org&gt;</author>
-	<copyright>&#194; Intel, &#194; Red Hat, Lapo Calamandrei</copyright>
-	<date>2010</date>
-	<description>Default GNOME 3 window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-<constant name="C_border_attached_focused" value="blend/#000000/gtk:bg[NORMAL]/0.4" />
-<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<!-- color of the button icons -->
-<constant name="C_icons_focused" value="gtk:text[SELECTED]" />
-<constant name="C_icons_focused_pressed" value="#ffffff" />
-<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<constant name="C_icons_unfocused_prelight" value="gtk:bg[NORMAL]" />
-<constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
-<constant name="D_icons_unfocused_offset" value="2" /> <!-- offset of the unfocused icons -->
-<constant name="D_icons_shrink" value="1" /> <!-- increasing this value makes the icons in buttons smaller -->
-<constant name="D_icons_grow" value="0" /> <!-- increasing this value makes the icons in buttons bigger -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="2" />
-	<distance name="left_titlebar_edge" value="0"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="10"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="0"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons 								-->
-	<border name="title_border" left="10" right="10" top="1" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="5"/>
-</frame_geometry>
-
-<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="0"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title version="< 3.1"
-               x="(0 `max` ((width - title_width) / 2)) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title version="< 3.1"
-               x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title version="< 3.1"
-               x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused"/>
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width/2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_unfocused"/>
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" />
-		<!-- <color value="gtk:bg[NORMAL]"/> -->
-		<!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> -->
-		<color value="gtk:bg[NORMAL]"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt2"> <!-- gradient for attached and modal dialogs titlebar-->
-	<gradient type="vertical" x="0" y="0" width="width" height="title_height">
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_unfocused">
-	<rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-	<arc color="C_titlebar_focused_hilight" x="1" y="1" width="7" height="7"  start_angle="270" extent_angle="90" />
-	<arc color="C_titlebar_focused_hilight" x="width-10" y="1" width="9" height="7"  start_angle="0" extent_angle="90" />
-	<gradient type="vertical" x="1" y="5" width="1" height="height-9">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt2"> <!-- titlebar for attached and modal dialogs -->
-	<include name="titlebar_fill_focused_alt2" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_attached_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-	<line x1="0" y1="0" x2="width" y2="0" color="C_border_attached_focused" />
-	<gradient type="vertical" x="0" y="0" width="1" height="top_height">
-		<color value="C_border_attached_focused" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.1" />
-		<color value="C_border_focused" />
-	</gradient>
-	<gradient type="vertical" x="width-1" y="0" width="1" height="top_height">
-		<color value="C_border_attached_focused" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.1" />
-		<color value="C_border_focused" />
-	</gradient>
-</draw_ops>
-
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-	<!-- button icons-->
-
-<constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-
-<draw_ops name="close_glyph_focused">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_focused" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="close_shadow_focused">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_shadow" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_shadow_focused" y="1" />
-	<!-- I'm not happy with the current aa I'll draw it twice to make it darker -->
-	<include name="close_shadow_focused" y="1" />
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<include name="close_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_unfocused" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<line
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-	<line
-		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-	<line 
-		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-	<line 
-		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-	<line 
-		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_shadow_focused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_shadow_focused" y="1" />
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<include name="maximize_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_shadow_focused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_shadow_focused" y="1" />
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<include name="minimize_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="menu_shadow_focused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_shadow_focused" y="1" />
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<include name="menu_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<rectangle 
-		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_focused" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_focused" />
-	<rectangle 
-		x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_focused" />
-</draw_ops>
-
-<draw_ops name="shade_shadow_focused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
-</draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_shadow_focused" y="1" />
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused" />
-	<rectangle 
-		x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused" />
-</draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused_prelight" />
-	<rectangle 
-		x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused_prelight" />
-</draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed">
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
-		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused_pressed" />
-	<rectangle 
-		x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
-		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
-		color="C_icons_unfocused_pressed" />
-</draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-
-	<!-- button backgrounds -->
-
-<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-<constant name="C_button_hilight" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6" />
-
-<draw_ops name="button_fill"> <!-- button background gradient -->
-	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.15" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.21" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.27" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.12" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="button_bottom">
-	<line x1="0" y1="height-2" x2="width-1" y2="height-2" color="C_button_border" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_button_hilight" />
-</draw_ops>
-
-<draw_ops name="button_bevel">
-	<gradient type="vertical" x="0" y="0" width="1" height="height-2">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.1"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-	</gradient>
-	<gradient type="vertical" x="width-1" y="0" width="1" height="height-2">
-		<color value="C_border_focused"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status -->
-	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.2" />
-		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.04" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status -->
-	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
-		<color value="C_border_focused" />
-		<color value="blend/#000000/gtk:bg[NORMAL]/0.75" />
-		<color value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="button">
-	<include name="button_fill" />
-	<include name="button_bevel" />
-	<include name="button_bottom" />
-</draw_ops>
-
-<draw_ops name="button_prelight">
-	<include name="button_fill_prelight" />
-	<include name="button_bevel" />
-	<include name="button_bottom" />
-</draw_ops>
-
-<draw_ops name="button_pressed">
-	<include name="button_fill_pressed" />
-	<include name="button_bottom" />
-</draw_ops>
-
-<!-- things get messy here -->
-
-<draw_ops name="button_inner_right_slice1">
-	<clip x="0" y="0" width="width" height="height-5" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice2">
-	<clip x="1" y="height-5" width="width-1" height="2" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice3">
-	<clip x="2" y="height-3" width="width-2" height="1" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice4">
-	<clip x="4" y="height-2" width="width-4" height="2" />
-	<include name="button" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_fill">
-	<include name="button_inner_right_slice1" />
-	<include name="button_inner_right_slice2" />
-	<include name="button_inner_right_slice3" />
-	<include name="button_inner_right_slice4" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_slice1_prelight">
-	<clip x="0" y="0" width="width" height="height-5" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice2_prelight">
-	<clip x="1" y="height-5" width="width-1" height="2" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice3_prelight">
-	<clip x="2" y="height-3" width="width-2" height="1" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice4_prelight">
-	<clip x="4" y="height-2" width="width-4" height="2" />
-	<include name="button_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_fill_prelight">
-	<include name="button_inner_right_slice1_prelight" />
-	<include name="button_inner_right_slice2_prelight" />
-	<include name="button_inner_right_slice3_prelight" />
-	<include name="button_inner_right_slice4_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_slice1_pressed">
-	<clip x="0" y="0" width="width" height="height-5" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice2_pressed">
-	<clip x="1" y="height-5" width="width-1" height="2" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice3_pressed">
-	<clip x="2" y="height-3" width="width-2" height="1" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice4_pressed">
-	<clip x="4" y="height-2" width="width-4" height="2" />
-	<include name="button_pressed" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_fill_pressed">
-	<include name="button_inner_right_slice1_pressed" />
-	<include name="button_inner_right_slice2_pressed" />
-	<include name="button_inner_right_slice3_pressed" />
-	<include name="button_inner_right_slice4_pressed" />
-</draw_ops>
-
-
-<draw_ops name="button_inner_right_border">
-	<gradient type="vertical" x="0" y="0" width="1" height="height-5">
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-	<arc color="C_button_hilight" x="1" y="height-10" width="9" height="9"  start_angle="180" extent_angle="90" />
-	<gradient type="vertical" x="1" y="0" width="1" height="height-5">
-		<color value="C_border_focused" />
-		<color value="C_button_border" />
-	</gradient>
-	<arc color="C_button_border" x="1" y="height-11" width="9" height="9"  start_angle="180" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="button_inner_right">
-	<include name="button_inner_right_fill" />
-	<include name="button_inner_right_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_prelight">
-	<include name="button_inner_right_fill_prelight" />
-	<include name="button_inner_right_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_pressed">
-	<include name="button_inner_right_fill_pressed" />
-	<include name="button_inner_right_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_slice1">
-	<clip x="0" y="0" width="width-1" height="height-5" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice2">
-	<clip x="0" y="height-5" width="width-2" height="2" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice3">
-	<clip x="0" y="height-3" width="width-3" height="1" />
-	<include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice4">
-	<clip x="0" y="height-2" width="width-5" height="2" />
-	<include name="button" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_fill">
-	<include name="button_inner_left_slice1" />
-	<include name="button_inner_left_slice2" />
-	<include name="button_inner_left_slice3" />
-	<include name="button_inner_left_slice4" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_slice1_prelight">
-	<clip x="0" y="0" width="width-1" height="height-5" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice2_prelight">
-	<clip x="0" y="height-5" width="width-2" height="2" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice3_prelight">
-	<clip x="0" y="height-3" width="width-3" height="1" />
-	<include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice4_prelight">
-	<clip x="0" y="height-2" width="width-5" height="2" />
-	<include name="button_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_fill_prelight">
-	<include name="button_inner_left_slice1_prelight" />
-	<include name="button_inner_left_slice2_prelight" />
-	<include name="button_inner_left_slice3_prelight" />
-	<include name="button_inner_left_slice4_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_slice1_pressed">
-	<clip x="0" y="0" width="width-1" height="height-5" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice2_pressed">
-	<clip x="0" y="height-5" width="width-2" height="2" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice3_pressed">
-	<clip x="0" y="height-3" width="width-3" height="1" />
-	<include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice4_pressed">
-	<clip x="0" y="height-2" width="width-5" height="2" />
-	<include name="button_pressed" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_fill_pressed">
-	<include name="button_inner_left_slice1_pressed" />
-	<include name="button_inner_left_slice2_pressed" />
-	<include name="button_inner_left_slice3_pressed" />
-	<include name="button_inner_left_slice4_pressed" />
-</draw_ops>
-
-
-<draw_ops name="button_inner_left_border">
-	<gradient type="vertical" x="width-1" y="0" width="1" height="height-6">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="C_button_hilight" />
-	</gradient>
-	<arc color="C_button_hilight" x="width-11" y="height-11" width="10" height="10"  start_angle="90" extent_angle="90" />
-	<gradient type="vertical" x="width-2" y="0" width="1" height="height-5">
-		<color value="C_border_focused" />
-		<color value="C_button_border" />
-	</gradient>
-	<arc color="C_button_border" x="width-11" y="height-11" width="9" height="9"  start_angle="90" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="button_inner_left">
-	<include name="button_inner_left_fill" />
-	<include name="button_inner_left_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_prelight">
-	<include name="button_inner_left_fill_prelight" />
-	<include name="button_inner_left_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_pressed">
-	<include name="button_inner_left_fill_pressed" />
-	<include name="button_inner_left_border" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button version=">= 3.3" function="left_single_background" state="normal" draw_ops="button_inner_left"/>	
-	<button version=">= 3.3" function="left_single_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button version=">= 3.3" function="left_single_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-	<button version=">= 3.3" function="right_single_background" state="normal" draw_ops="button_inner_right"/>
-	<button version=">= 3.3" function="right_single_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button version=">= 3.3" function="right_single_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button version=">= 3.3" function="left_single_background" state="normal" draw_ops="button_inner_left"/>
-	<button version=">= 3.3" function="left_single_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button version=">= 3.3" function="left_single_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-	<button version=">= 3.3" function="right_single_background" state="normal" draw_ops="button_inner_right"/>
-	<button version=">= 3.3" function="right_single_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button version=">= 3.3" function="right_single_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button version=">= 3.3" function="left_single_background" state="normal" draw_ops="button_inner_left"/>
-	<button version=">= 3.3" function="left_single_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button version=">= 3.3" function="left_single_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-	<button version=">= 3.3" function="right_single_background" state="normal" draw_ops="button_inner_right"/>
-	<button version=">= 3.3" function="right_single_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button version=">= 3.3" function="right_single_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button version=">= 3.3" function="left_single_background" state="normal" draw_ops="button_inner_left"/>
-	<button version=">= 3.3" function="left_single_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button version=">= 3.3" function="left_single_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-	<button version=">= 3.3" function="right_single_background" state="normal" draw_ops="button_inner_right"/>
-	<button version=">= 3.3" function="right_single_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button version=">= 3.3" function="right_single_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt2" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button version=">= 3.3" function="left_single_background" state="normal" draw_ops="button_inner_left"/>
-	<button version=">= 3.3" function="left_single_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button version=">= 3.3" function="left_single_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-	<button version=">= 3.3" function="right_single_background" state="normal" draw_ops="button_inner_right"/>
-	<button version=">= 3.3" function="right_single_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button version=">= 3.3" function="right_single_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button version="< 3.3" function="left_middle_background" state="normal" draw_ops="button_inner_left"/>
-	<button version="< 3.3" function="left_middle_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button version="< 3.3" function="left_middle_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button version="< 3.3" function="right_middle_background" state="normal" draw_ops="button_inner_right"/>
-	<button version="< 3.3" function="right_middle_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button version="< 3.3" function="right_middle_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button version=">= 3.3" function="left_middle_background" state="normal" draw_ops="button"/>
-	<button version=">= 3.3" function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button version=">= 3.3" function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-
-	<button version=">= 3.3"function="right_middle_background" state="normal" draw_ops="button"/>
-	<button version=">= 3.3"function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button version=">= 3.3"function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-
-	<button version=">= 3.3" function="left_single_background" state="normal" draw_ops="button_inner_left"/>
-	<button version=">= 3.3" function="left_single_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button version=">= 3.3" function="left_single_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-	<button version=">= 3.3" function="right_single_background" state="normal" draw_ops="button_inner_right"/>
-	<button version=">= 3.3" function="right_single_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button version=">= 3.3" function="right_single_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_focused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt2" />
-	<piece position="overlay" draw_ops="border_attached_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_unfocused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_focused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_right_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button version=">= 3.3" function="left_single_background" state="normal" draw_ops="button_inner_left"/>
-	<button version=">= 3.3" function="left_single_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button version=">= 3.3" function="left_single_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-	<button version=">= 3.3" function="right_single_background" state="normal" draw_ops="button_inner_right"/>
-	<button version=">= 3.3" function="right_single_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button version=">= 3.3" function="right_single_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_unfocused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_right_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_focused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_left_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="left_middle_background" state="normal" draw_ops="button"/>
-	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
-	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button version=">= 3.3" function="left_single_background" state="normal" draw_ops="button_inner_left"/>
-	<button version=">= 3.3" function="left_single_background" state="prelight" draw_ops="button_inner_left_prelight"/>
-	<button version=">= 3.3" function="left_single_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-	<button version=">= 3.3" function="right_single_background" state="normal" draw_ops="button_inner_right"/>
-	<button version=">= 3.3" function="right_single_background" state="prelight" draw_ops="button_inner_right_prelight"/>
-	<button version=">= 3.3" function="right_single_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_unfocused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_left_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3"focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3"focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3"focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="attached_style_set">
-	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
-	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
-
-</metacity_theme>