diff --git a/README.md b/README.md
index 35e87ae..93f6df7 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,6 @@ iso-profiles
>nonfree_multilib
>manjaro
->sonar
>basic
>extra
diff --git a/community/awesome/Packages-Live b/community/awesome/Packages-Live
index f3c5748..df2eacf 100644
--- a/community/awesome/Packages-Live
+++ b/community/awesome/Packages-Live
@@ -1,11 +1,8 @@
manjaro-live-skel
mkinitcpio-nfs-utils
nbd
->sonar sonar-calamares-branding
squashfs-tools
manjaro-live-systemd
->sonar thus
>manjaro grub-theme-live-manjaro
->sonar grub-theme-live-sonar
calamares
gparted
\ No newline at end of file
diff --git a/community/awesome/Packages-Root b/community/awesome/Packages-Root
index 8d039fa..ef3e154 100644
--- a/community/awesome/Packages-Root
+++ b/community/awesome/Packages-Root
@@ -65,7 +65,6 @@ sed
shadow
spectre-meltdown-checker
s-nail
->sonar sonar-release
sudo
sysfsutils
acpid
diff --git a/community/bspwm-mate/Packages-Live b/community/bspwm-mate/Packages-Live
index 5188a95..89cb330 100644
--- a/community/bspwm-mate/Packages-Live
+++ b/community/bspwm-mate/Packages-Live
@@ -2,11 +2,8 @@ gparted
manjaro-live-skel
mkinitcpio-nfs-utils
nbd
->sonar sonar-calamares-branding
squashfs-tools
manjaro-live-systemd
->sonar thus
>manjaro grub-theme-live-manjaro
->sonar grub-theme-live-sonar
gsmartcontrol
calamares
\ No newline at end of file
diff --git a/community/bspwm-mate/Packages-Root b/community/bspwm-mate/Packages-Root
index 8d039fa..ef3e154 100644
--- a/community/bspwm-mate/Packages-Root
+++ b/community/bspwm-mate/Packages-Root
@@ -65,7 +65,6 @@ sed
shadow
spectre-meltdown-checker
s-nail
->sonar sonar-release
sudo
sysfsutils
acpid
diff --git a/community/bspwm/Packages-Live b/community/bspwm/Packages-Live
index e0e582e..b8d7dd8 100644
--- a/community/bspwm/Packages-Live
+++ b/community/bspwm/Packages-Live
@@ -1,9 +1,6 @@
manjaro-live-skel
mkinitcpio-nfs-utils
nbd
->sonar sonar-calamares-branding
squashfs-tools
manjaro-live-systemd
->sonar thus
>manjaro grub-theme-live-manjaro
->sonar grub-theme-live-sonar
diff --git a/community/bspwm/Packages-Root b/community/bspwm/Packages-Root
index 7882583..2b65c03 100644
--- a/community/bspwm/Packages-Root
+++ b/community/bspwm/Packages-Root
@@ -63,7 +63,6 @@ reiserfsprogs
sed
shadow
s-nail
->sonar sonar-release
sudo
sysfsutils
acpid
diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop
index 38a7c1e..c243e21 100644
--- a/community/deepin/Packages-Desktop
+++ b/community/deepin/Packages-Desktop
@@ -9,7 +9,6 @@ binutils
bison
>extra brasero
>extra dconf-editor
->extra deepin-anything
deepin-calendar
>extra deepin-calculator
deepin-file-manager
@@ -64,6 +63,7 @@ inxi
>extra libimobiledevice
>extra libreoffice-fresh
libtool
+KERNEL-headers # needed for deepin-anything and its vfs_monitor dkms-module...
m4
make
manjaro-alsa
diff --git a/manjaro/netinstall/Packages-Live b/manjaro/netinstall/Packages-Live
index 0c467ca..7efce58 100644
--- a/manjaro/netinstall/Packages-Live
+++ b/manjaro/netinstall/Packages-Live
@@ -19,7 +19,6 @@ network-manager-applet
open-vm-tools
qt5ct
sddm-andromeda-qt-theme
->sonar sonar-calamares-branding
>systemd manjaro-live-systemd
networkmanager
>systemd sddm
@@ -48,4 +47,3 @@ xorg-server
xorg-xinit
xterm
>manjaro grub-theme-live-manjaro
->sonar grub-theme-live-sonar
diff --git a/shared/Packages-Live b/shared/Packages-Live
index f7a32ff..a4edd92 100644
--- a/shared/Packages-Live
+++ b/shared/Packages-Live
@@ -1,12 +1,10 @@
calamares-git
>manjaro grub-theme-live-manjaro-dev
->sonar grub-theme-live-sonar
gsmartcontrol
manjaro-architect
manjaro-live-skel
manjaro-live-systemd
mkinitcpio-nfs-utils
nbd
->sonar sonar-calamares-branding
squashfs-tools
clonezilla
diff --git a/shared/Packages-Live-Xorg b/shared/Packages-Live-Xorg
index 124c30c..0976877 100644
--- a/shared/Packages-Live-Xorg
+++ b/shared/Packages-Live-Xorg
@@ -11,7 +11,6 @@ nbd
open-vm-tools
primus
>manjaro grub-theme-live-manjaro
->sonar grub-theme-live-sonar
squashfs-tools
bumblebee
manjaro-live-systemd
diff --git a/shared/Packages-Root b/shared/Packages-Root
index cdb84dc..f1d52d2 100644
--- a/shared/Packages-Root
+++ b/shared/Packages-Root
@@ -63,7 +63,6 @@ sed
shadow
spectre-meltdown-checker
s-nail
->sonar sonar-release
sudo
sysfsutils
acpid
diff --git a/shared/sonar/LICENSE b/shared/sonar/LICENSE
deleted file mode 100644
index 70566f2..0000000
--- a/shared/sonar/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- {one line to give the program's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- {project} Copyright (C) {year} {fullname}
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
\ No newline at end of file
diff --git a/shared/sonar/live-overlay/etc/default/grub b/shared/sonar/live-overlay/etc/default/grub
deleted file mode 100644
index 7202865..0000000
--- a/shared/sonar/live-overlay/etc/default/grub
+++ /dev/null
@@ -1,49 +0,0 @@
-GRUB_DEFAULT=saved
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Sonar"
-GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
-#GRUB_CMDLINE_LINUX=""
-
-# If you want to enable the save default function, uncomment the following
-# line, and set GRUB_DEFAULT to saved.
-GRUB_SAVEDEFAULT=true
-
-# Preload both GPT and MBR modules so that they are not missed
-GRUB_PRELOAD_MODULES="part_gpt part_msdos"
-
-# Uncomment to enable Hidden Menu, and optionally hide the timeout count
-#GRUB_HIDDEN_TIMEOUT=5
-#GRUB_HIDDEN_TIMEOUT_QUIET=true
-
-# Uncomment to use basic console
-GRUB_TERMINAL_INPUT=console
-
-# Uncomment to disable graphical terminal
-#GRUB_TERMINAL_OUTPUT=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=auto
-
-# Uncomment to allow the kernel use the same resolution used by grub
-GRUB_GFXPAYLOAD_LINUX=keep
-
-# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
-# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-GRUB_DISABLE_RECOVERY=true
-
-# Uncomment and set to the desired menu colors. Used by normal and wallpaper
-# modes only. Entries specified as foreground/background.
-GRUB_COLOR_NORMAL="light-gray/black"
-GRUB_COLOR_HIGHLIGHT="green/black"
-
-# Uncomment one of them for the gfx desired, a image background or a gfxtheme
-GRUB_BACKGROUND="/usr/share/grub/background.png"
-#GRUB_THEME="/path/to/gfxtheme"
-
-# Uncomment to get a beep at GRUB start
-GRUB_INIT_TUNE="480 440 1"
diff --git a/shared/sonar/live-overlay/etc/default/tlp b/shared/sonar/live-overlay/etc/default/tlp
deleted file mode 100644
index b18342e..0000000
--- a/shared/sonar/live-overlay/etc/default/tlp
+++ /dev/null
@@ -1,221 +0,0 @@
-# ------------------------------------------------------------------------------
-# tlp - Parameters for power save
-
-# Hint: some features are disabled by default, remove the leading # to enable them
-
-# Set to 0 to disable/1 to enable TLP
-TLP_ENABLE=1
-
-# Seconds laptop mode has to to wait after the disk goes idle before doing a sync.
-# Non-zero value enables, zero disables laptop mode.
-DISK_IDLE_SECS_ON_AC=0
-DISK_IDLE_SECS_ON_BAT=10
-
-# Dirty page values (timeouts in secs).
-MAX_LOST_WORK_SECS_ON_AC=15
-MAX_LOST_WORK_SECS_ON_BAT=60
-
-# Select a cpu frequency scaling governor: ondemand/powersave/performance/conservative
-# Important:
-# - You *must* disable your distribution's governor settings or conflicts will occur
-# - ondemand is sufficient for *almost all* workloads, you should know what you're doing!
-#CPU_SCALING_GOVERNOR_ON_AC=ondemand
-#CPU_SCALING_GOVERNOR_ON_BAT=ondemand
-
-# Set the min/max frequency available for the scaling governor.
-# Possible values strongly depend on your cpu. For available frequencies see
-# tlp-stat output, Section "+++ Processor".
-# Hint: Parameters are disabled by default, remove the leading # to enable them,
-# otherwise kernel default values are used.
-#CPU_SCALING_MIN_FREQ_ON_AC=0
-#CPU_SCALING_MAX_FREQ_ON_AC=0
-#CPU_SCALING_MIN_FREQ_ON_BAT=0
-#CPU_SCALING_MAX_FREQ_ON_BAT=0
-
-# Set the cpu "turbo boost" feature: 0=disable / 1=allow
-# Requires an Intel Core i processor and kernel 3.7 or later.
-# Important:
-# - This may conflict with your distribution's governor settings
-# - A value of 1 does *not* activate boosting, it just allows it
-#CPU_BOOST_ON_AC=1
-#CPU_BOOST_ON_BAT=0
-
-# Minimize number of used cpu cores/hyper-threads under light load conditions
-SCHED_POWERSAVE_ON_AC=0
-SCHED_POWERSAVE_ON_BAT=1
-
-# Kernel NMI Watchdog
-# 0=disable (default, saves power) / 1=enable (for kernel debugging only)
-NMI_WATCHDOG=0
-
-# Change CPU voltages aka "undervolting" - Kernel with PHC patch required
-# Freq:voltage pairs are written to /sys/devices/system/cpu/cpu0/cpufreq/phc_controls
-# CAUTION: only use this, if you thoroughly understand what you are doing!
-#PHC_CONTROLS="F:V F:V F:V F:V"
-
-# Hard disk devices, separate multiple devices with spaces (default: sda).
-# Devices can be specified by disk id too (lookup with: tlp diskid).
-DISK_DEVICES="sda sdb"
-
-# Hard disk advanced power management level: 1(max saving)..254(off)
-# Levels 1..127 may spin down the disk.
-# Separate values for multiple devices with spaces.
-DISK_APM_LEVEL_ON_AC="254 254"
-DISK_APM_LEVEL_ON_BAT="254 254"
-
-# Hard disk spin down timeout:
-# 0: spin down disabled
-# 1..240: timeouts from 5s to 20min (in units of 5s)
-# 241..251: timeouts from 30min to 5.5 hours (in units of 30min)
-# (see 'man hdparm' for details)
-#DISK_SPINDOWN_TIMEOUT_ON_AC="0 0"
-#DISK_SPINDOWN_TIMEOUT_ON_BAT="0 0"
-
-# Select io scheduler for the disk devices: noop/deadline/cfq (Default: cfq)
-# Separate values for multiple devices with spaces.
-#DISK_IOSCHED="cfq deadline"
-
-# SATA aggressive link power management (ALPM):
-# min_power/medium_power/max_performance
-SATA_LINKPWR_ON_AC=max_performance
-SATA_LINKPWR_ON_BAT=min_power
-
-# PCI Express Active State Power Management (PCIe ASPM):
-# default/performance/powersave
-# Hint: needs kernel boot option pcie_aspm=force on some machines
-PCIE_ASPM_ON_AC=performance
-PCIE_ASPM_ON_BAT=powersave
-
-# Radeon graphics clock speed (profile method): low/mid/high/auto/default
-# auto = mid on BAT, high on AC; default = use hardware defaults
-# (Kernel >= 2.6.35 only, not with fglrx driver!)
-RADEON_POWER_PROFILE_ON_AC=high
-RADEON_POWER_PROFILE_ON_BAT=low
-
-# New radeon dynamic power management method (dpm): battery/performance
-# (Kernel >= 3.11 only, requires boot option radeon.dpm=1)
-RADEON_DPM_STATE_ON_AC=performance
-RADEON_DPM_STATE_ON_BAT=battery
-
-# New radeon dpm performance level: auto/low/high (auto is recommended)
-RADEON_DPM_PERF_LEVEL_ON_AC=auto
-RADEON_DPM_PERF_LEVEL_ON_BAT=auto
-
-# WiFi power saving mode: 1=disable/5=enable
-# (Linux 2.6.32 and later, some adapters only!)
-WIFI_PWR_ON_AC=1
-WIFI_PWR_ON_BAT=5
-
-# Disable wake on lan: Y/N
-WOL_DISABLE=Y
-
-# Enable audio power saving for Intel HDA, AC97 devices (timeout in secs).
-# A value of 0 disables / >=1 enables power save.
-SOUND_POWER_SAVE_ON_AC=0
-SOUND_POWER_SAVE_ON_BAT=1
-
-# Disable controller too (HDA only): Y/N
-SOUND_POWER_SAVE_CONTROLLER=Y
-
-# Set to 1 to power off optical drive in UltraBay (ThinkPads only)
-# when running on battery. A value of 0 disables this Feature (Default).
-# Drive can be powered on again by releasing (and reinserting) the
-# eject lever or by pressing the disc eject button on newer models.
-# Note: an UltraBay hard disk is never powered off.
-BAY_POWEROFF_ON_BAT=0
-# Optical drive device to power off (default sr0)
-BAY_DEVICE="sr0"
-
-# Runtime Power Management for pci(e) bus devices
-# (Kernel >= 2.6.35 only): on=disable/auto=enable
-RUNTIME_PM_ON_AC=on
-RUNTIME_PM_ON_BAT=auto
-
-# Runtime PM for *all* pci(e) bus devices, expect backlisted ones:
-# 0=disable / 1=enable
-# Warning: experimental option, could cause system instabilities
-RUNTIME_PM_ALL=0
-
-# Exclude pci(e) device adresses the following list from Runtime PM
-# (separate with spaces). Use lspci to get the adresses (1st column).
-#RUNTIME_PM_BLACKLIST="bb:dd.f 11:22.3 44:55.6"
-
-# Set to 0 to disable/1 to enable usb autosuspend feature
-USB_AUTOSUSPEND=1
-
-# Devices from the following list are excluded from usb autosuspend
-# (separate with spaces). Use lsusb to get the ids.
-# Note: input devices (usbhid) are excluded automatically
-#USB_BLACKLIST="1111:2222 3333:4444"
-
-# WWAN devices are excluded from usb autosuspend:
-# 0=do not exclude / 1=exclude
-# Note: works for ids 05c6:* 0bdb:* 1199:* only
-USB_BLACKLIST_WWAN=1
-
-# Set to 1 to disable autosuspend before shutdown/0 to do nothing
-# (workaround for usb devices that cause shutdown problems)
-#USB_AUTOSUSPEND_DISABLE_ON_SHUTDOWN=1
-
-# Restore radio device state (bluetooth, wifi, wwan) from previous shutdown
-# on system startup: 0=disable/1=enable
-# Hint: the parameters DEVICES_TO_DISABLE/ENABLE_ON_STARTUP/SHUTDOWN below
-# are ignored when this is enabled!
-RESTORE_DEVICE_STATE_ON_STARTUP=0
-
-# Radio devices to disable on startup: bluetooth wifi wwan
-#DEVICES_TO_DISABLE_ON_STARTUP="bluetooth wifi wwan"
-
-# Radio devices to enable on startup: bluetooth wifi wwan
-DEVICES_TO_ENABLE_ON_STARTUP="wifi bluetooth"
-
-# Radio devices to disable on shutdown: bluetooth wifi wwan
-# (workaround for devices that are blocking shutdown)
-#DEVICES_TO_DISABLE_ON_SHUTDOWN="bluetooth wifi wwan"
-
-# Radio devices to enable on shutdown: bluetooth wifi wwan
-# (to prevent other operating systems from missing radios)
-#DEVICES_TO_ENABLE_ON_SHUTDOWN="wwan"
-
-# Radio devices to enable when wireless radio switch is turned on:
-# bluetooth wifi wwan (Ubuntu + ThinkPad only)
-#DEVICES_TO_ENABLE_ON_RADIOSW="wifi wwan"
-
-# Battery charge thresholds (ThinkPad only, tp-smapi or acpi-call kernel module required)
-# Charging starts when the remaining capacity falls below the START_CHARGE_TRESH
-# value and stops when exceeding the STOP_CHARGE_TRESH value.
-# Main battery (values in %)
-#START_CHARGE_THRESH_BAT0=75
-#STOP_CHARGE_THRESH_BAT0=80
-# Ultrabay or slice battery (values in %)
-#START_CHARGE_THRESH_BAT1=75
-#STOP_CHARGE_THRESH_BAT1=80
-
-# Set to 1 to disable use of tpacpi-bat on Sandy Bridge or newer Thinkpads
-# and force usage of tp-smapi instead
-#DISABLE_TPACPIBAT=1
-
-# ------------------------------------------------------------------------------
-# tlp-rdw - Parameters for the radio device wizard
-# Possible devices: bluetooth/wifi/wwan
-
-# Hint: parameters are disabled by default, remove the leading # to enable them
-
-# Radio devices to disable on connect
-#DEVICES_TO_DISABLE_ON_LAN_CONNECT="wifi wwan"
-#DEVICES_TO_DISABLE_ON_WIFI_CONNECT="wwan"
-#DEVICES_TO_DISABLE_ON_WWAN_CONNECT="wifi"
-
-# Radio devices to enable on disconnect
-#DEVICES_TO_ENABLE_ON_LAN_DISCONNECT="wifi wwan"
-#DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT=""
-#DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT=""
-
-# Radio devices to enable/disable when docked
-#DEVICES_TO_ENABLE_ON_DOCK=""
-#DEVICES_TO_DISABLE_ON_DOCK=""
-
-# Radio devices to enable/disable when undocked
-#DEVICES_TO_ENABLE_ON_UNDOCK="wifi"
-#DEVICES_TO_DISABLE_ON_UNDOCK=""
-
diff --git a/shared/sonar/live-overlay/etc/fstab b/shared/sonar/live-overlay/etc/fstab
deleted file mode 100644
index 0df0cba..0000000
--- a/shared/sonar/live-overlay/etc/fstab
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /etc/fstab: static file system information
-#
-#
-/dev/mapper/root-image / auto defaults 0 0
diff --git a/shared/sonar/live-overlay/etc/issue b/shared/sonar/live-overlay/etc/issue
deleted file mode 100644
index 33bd312..0000000
--- a/shared/sonar/live-overlay/etc/issue
+++ /dev/null
@@ -1,5 +0,0 @@
-[H[2J
-Sonar Live ISO (\l) - \s-\r \m.
-
-Default login "sonar" with password "sonar".
-"root" login has password "sonar".
diff --git a/shared/sonar/live-overlay/etc/pam.d/su b/shared/sonar/live-overlay/etc/pam.d/su
deleted file mode 100644
index a291042..0000000
--- a/shared/sonar/live-overlay/etc/pam.d/su
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth sufficient pam_wheel.so trust use_uid
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/shared/sonar/live-overlay/etc/sudoers.d/g_wheel b/shared/sonar/live-overlay/etc/sudoers.d/g_wheel
deleted file mode 100644
index 8c45359..0000000
--- a/shared/sonar/live-overlay/etc/sudoers.d/g_wheel
+++ /dev/null
@@ -1 +0,0 @@
-%wheel ALL=(ALL) NOPASSWD: ALL
diff --git a/sonar/gnome-edition/Packages-Desktop b/sonar/gnome-edition/Packages-Desktop
deleted file mode 100644
index 9ba1d7c..0000000
--- a/sonar/gnome-edition/Packages-Desktop
+++ /dev/null
@@ -1,247 +0,0 @@
-adwaita-icon-theme
-alsa-firmware
-baobab
-dconf-editor
-dmidecode
-#empathy
-hexchat
-gthumb
-evince
-firefox
-gdm
-fprintd
-gedit
-gnome-backgrounds
-gnome-calculator
-gnome-control-center
-gnome-desktop
-gnome-disk-utility
-gnome-font-viewer
-gnome-keyring
-gnome-screenshot
-gnome-session
-gnome-settings-daemon
-gnome-shell
-gnome-shell-extensions
-gnome-system-log
-gnome-system-monitor
-gnome-terminal
-gnome-themes-standard
-gnome-tweak-tool
-gnome-user-docs
-gnome-user-share
-gnome-wallpapers
-gnome-dictionary
-gnome-disk-utility
->extra gnome-icon-theme
->extra gnome-icon-theme-extras
->extra gnome-icon-theme-symbolic
-gedit-code-assistance
-gnome-calendar
-gnome-clocks
-gnome-code-assistance
-gnome-color-manager
-gnome-devel-docs
-gnome-documents
-gnome-getting-started-docs
-gnome-logs
-gnome-maps
-gnome-music
-gnome-nettool
-gnome-photos
-gnome-tweak-tool
-nautilus-sendto
-grilo-plugins
-gucharmap
-mousetweaks
-mutter
-nautilus
-sushi
-totem
-tracker
-xdg-user-dirs-gtk
-yelp
-#our desktop settings
-sonar-gnome-settings
-#our installer branding
-sonar-calamares-branding
-sonar-backgrounds
-gparted
-gst-libav
-gst-plugins-bad
-gst-plugins-base
-gst-plugins-good
-gst-plugins-ugly
-gucharmap
-gufw
-gvfs-afc
-gvfs-gphoto2
-gvfs-mtp
-gvfs-smb
-gvfs-google
-gvfs-goa
-inxi
-imagewriter
-pacli
-mc
-mhwd-tui
-manjaro-alsa
-manjaro-artwork
-manjaro-browser-settings
-manjaro-hotfixes
-manjaro-pulse
-manjaro-settings-manager-notifier
-manjaro-hello
-mesa-demos
-mobile-broadband-provider-info
-modemmanager
-mousetweaks
->multilib lib32-mesa-demos
-mutter
-nautilus
-nautilus-admin
-nautilus-empty-file
-netctl
-networkmanager-openconnect
-networkmanager-openvpn
-networkmanager-pptp
-networkmanager-vpnc
-nss-mdns
-numlockx
-openresolv
-pamac
-polkit-gnome
-powertop
-pulseaudio-bluetooth
-pulseaudio-ctl
-pulseaudio-zeroconf
-sushi
->systemd alsa-utils
->systemd avahi
->systemd networkmanager
->systemd ntp
->systemd openssh
-terminus-font
-totem
-tracker
-ttf-bitstream-vera
-ttf-dejavu
-ttf-droid
-ttf-inconsolata
-ttf-indic-otf
-ttf-liberation
-arc-maia-icon-theme
-moka-icon-theme
-#firefox-arc-maia-settings
-vino
-xdg-su
-xdg-user-dirs
-xdg-user-dirs-gtk
-xdg-utils
-xf86-input-elographics
-xf86-input-evdev
-xf86-input-keyboard
-xf86-input-libinput
-xf86-input-mouse
-xf86-input-void
-xorg-server
-xorg-twm
-xorg-xinit
-yelp
-orca
-libyaml
->extra gtk3-print-backends
->extra libreoffice-fresh
->extra thunderbird
->extra lollypop
->extra empathy
->extra uget
->extra transmission-gtk
->extra brasero
->extra manjaro-documentation-en
->extra jre8-openjdk
->extra jre8-openjdk-headless
-# >extra flashplugin
->extra libdvdcss
->extra steam-manjaro
->extra manjaro-printer
->extra autoconf
->extra automake
->extra binutils
->extra bison
->extra fakeroot
->extra flex
->extra gcc
->extra >multilib gcc-libs-multilib
->extra >multilib gcc-multilib
->extra libtool
->extra m4
->extra make
->extra patch
->extra subversion
->extra yaourt
-
-
->extra gedit-plugins
->extra seahorse-nautilus
->extra simple-scan
->extra nautilus-share
->extra vinagre
->extra x2goserver
->extra mes-maia
->extra rss-glx
-sound-theme-freedesktop
-sonar-sound-theme
-bash-completion
-xcursor-simpleandsoft
-xcursor-vanilla-dmz-aa
-xcursor-chameleon-pearl
-xcursor-breeze
-xcursor-maia
->extra bluez-firmware
->extra bluez-plugins
->extra >bluez-hid2hci
->extra bluez-utils
-#accessibility
-qt-at-spi
-ibus-qt
-
-#media player and audio converter
->extra audacious #standard media player
->extra audacious-plugins #additional plugins for audacious
->extra soundconverter #audio and video file converter using gstreamer
->extra transmageddon #video file converter
->extra handbrake #dvd and bd ripper
->extra asunder #lightweight cd ripper with cddb support
->extra audacity #open source audio editor
->extra pitivi #open source video editor
->extra shotwell #open source photo manager
->extra #extra addons for brasero
->extra libwmf #windows meta file (wmf) image format support for disc covers
->extra dvdbackup #dvd backup support
->extra dvdauthor #create video dvd's, picture cd's and bd's
->extra openjpeg2 #jpeg image support for disc covers
-#video player
->extra vlc
-#instant messenging software
->extra pidgin
-#additional protocol support
->extra purple-facebook #facebook support
->extra purple-hangouts-hg #google hangouts
->extra purple-skypeweb #cloud skype support
->extra prpltwtr #twitter support
->extra pidgin-otr #off the record, encrypted and anonymous communication support
-#>extra telegram-purple #telegram support
-#additional plugins for pidgin
->extra purple-plugin-pack
-#youtube viewer and downloader
->extra youtube-viewer #for playing and watching individual videos
->extra youtube-dl #for downloading individual videos and playlists
-#command line applications
->extra fsarchiver #filesystem recovery
->extra surfraw #search multiple sites from the command line
->extra finch #command line pidgin
->extra ffmpeg #audio and video converter and manipulator
-#alteraeon sound pack
->extra tintin-alteraeon
-
diff --git a/sonar/gnome-edition/Packages-Live b/sonar/gnome-edition/Packages-Live
deleted file mode 120000
index 5e66e00..0000000
--- a/sonar/gnome-edition/Packages-Live
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/Packages-Live
\ No newline at end of file
diff --git a/sonar/gnome-edition/Packages-Mhwd b/sonar/gnome-edition/Packages-Mhwd
deleted file mode 120000
index 9df3d5e..0000000
--- a/sonar/gnome-edition/Packages-Mhwd
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/Packages-Mhwd
\ No newline at end of file
diff --git a/sonar/gnome-edition/Packages-Root b/sonar/gnome-edition/Packages-Root
deleted file mode 120000
index 60cc7bd..0000000
--- a/sonar/gnome-edition/Packages-Root
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/Packages-Root
\ No newline at end of file
diff --git a/sonar/gnome-edition/desktop-overlay/etc/gdm/custom.conf b/sonar/gnome-edition/desktop-overlay/etc/gdm/custom.conf
deleted file mode 100644
index 37d148d..0000000
--- a/sonar/gnome-edition/desktop-overlay/etc/gdm/custom.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# GDM configuration storage
-
-[daemon]
-# Uncoment the line below to force the login screen to use Xorg
-WaylandEnable=false
-
-[security]
-
-[xdmcp]
-
-[greeter]
-
-[chooser]
-
-[debug]
-# Uncomment the line below to turn on debugging
-#Enable=true
-
diff --git a/sonar/gnome-edition/desktop-overlay/etc/speech-dispatcher/modules/espeak.conf b/sonar/gnome-edition/desktop-overlay/etc/speech-dispatcher/modules/espeak.conf
deleted file mode 100644
index 3c145b3..0000000
--- a/sonar/gnome-edition/desktop-overlay/etc/speech-dispatcher/modules/espeak.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-
-# -- SOUND ICONS --
-
-# Espeak does not currently support playing sound icons
-# (audio files that are played by name when an application requests
-# a sound icon). If you have installed the free(b)soft sound-icons
-# package, this is the directory where will they be found. If not
-# blank, the espeak Output Module will play them if it finds a
-# file whose name matches the sound icon name. If blank, or no
-# matching file is found, the name of the sound icon will be spoken.
-
-EspeakSoundIconFolder "/usr/share/sounds/sound-icons/"
-
-# Volume at which sound icons are played.
-
-EspeakSoundIconVolume 0
-
-# -- Punctuation --
-
-# Characters to be spoken when punctuation setting is "some"
-# Encoding is UTF-8.
-EspeakPunctuationList "@+_"
-EspeakCapitalPitchRise 0
-
-# -- Rate control --
-# The following options are in words per minute
-#the same as the -s parameter for the -s option in espeak command line tool.
-
-# Minimum rate (-100 in speech-dispatcher)
-EspeakMinRate 80
-
-# Normal rate (0 in speech-dispatcher)
-EspeakNormalRate 170
-
-# Maximum rate (100 in speech-dispatcher)
-EspeakMaxRate 450
-
-# -- Espeak variants --
-
-# Controls whether espeak voice variants are presented in the list of
-# available voices. A value of 1 will present an espeak voice, plus the
-# espeak voice with all the available variants. A value of 0 will present
-# the list of espeak voices only.
-
-EspeakListVoiceVariants 0
-
-# -- Internal parameters --
-
-# Number of ms of audio returned by the espeak callback function.
-EspeakAudioChunkSize 3000
-
-# Maximum number of samples to buffer in playback queue.
-EspeakAudioQueueMaxSize 441000
-
-# Debugging
-Debug 0
diff --git a/sonar/gnome-edition/desktop-overlay/profile.d/libreoffice-gtk2.csh b/sonar/gnome-edition/desktop-overlay/profile.d/libreoffice-gtk2.csh
deleted file mode 100755
index dd66e9f..0000000
--- a/sonar/gnome-edition/desktop-overlay/profile.d/libreoffice-gtk2.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-# to force a certain look'n feel
-
-#setenv SAL_USE_VCLPLUGIN gen
-#setenv SAL_USE_VCLPLUGIN kde4
-setenv SAL_USE_VCLPLUGIN gtk
-#setenv SAL_USE_VCLPLUGIN gtk3 # currently broken and not available
diff --git a/sonar/gnome-edition/desktop-overlay/profile.d/libreoffice-gtk2.sh b/sonar/gnome-edition/desktop-overlay/profile.d/libreoffice-gtk2.sh
deleted file mode 100755
index d5e91ec..0000000
--- a/sonar/gnome-edition/desktop-overlay/profile.d/libreoffice-gtk2.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# to force a certain look'n feel
-
-#export SAL_USE_VCLPLUGIN=gen
-#export SAL_USE_VCLPLUGIN=kde4
-export SAL_USE_VCLPLUGIN=gtk
-#export SAL_USE_VCLPLUGIN=gtk3 # currently broken and not available
diff --git a/sonar/gnome-edition/live-overlay b/sonar/gnome-edition/live-overlay
deleted file mode 120000
index acb5966..0000000
--- a/sonar/gnome-edition/live-overlay
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/sonar/live-overlay
\ No newline at end of file
diff --git a/sonar/gnome-edition/profile.conf b/sonar/gnome-edition/profile.conf
deleted file mode 100644
index 383e6f1..0000000
--- a/sonar/gnome-edition/profile.conf
+++ /dev/null
@@ -1,71 +0,0 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
-# use multilib packages; x86_64 only
-multilib="true"
-
-# use extra packages as defined in pkglist to activate a full profile
-# extra="false"
-
-################ install ################
-
-# default displaymanager: none
-# supported; lightdm, sddm, gdm, lxdm, mdm
-displaymanager="gdm"
-
-# Set to false to disable autologin in the livecd
-# autologin="true"
-
-# nonfree xorg drivers
-nonfree_mhwd="false"
-
-# possible values: grub;systemd-boot
-# efi_boot_loader="grub"
-
-# configure calamares for netinstall
-# netinstall="false"
-
-# configure calamares to use chrootcfg instead of unpackfs
-# chrootcfg="false"
-
-# use geoip
-# geoip="true"
-
-# unset defaults to given values
-# names must match systemd service names
-enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'brltty')
-# disable_systemd=()
-
-# unset defaults to given values,
-# names must match openrc service names
-# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
-# disable_openrc=()
-
-# unset defaults to given values
-# addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel"
-
-# the same workgroup name if samba is used
-# smb_workgroup="Manjaro"
-
-################# live-session #################
-
-# unset defaults to given value
-hostname="sonar-pc"
-
-# unset defaults to given value
-username="sonar"
-
-# unset defaults to given value
-password="sonar"
-
-# unset defaults to given values
-# names must match systemd service names
-# services in enable_systemd array don't need to be listed here
-# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-
-# unset defaults to given values,
-# names must match openrc service names
-# services in enable_openrc array don't need to be listed here
-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-
diff --git a/sonar/mate-edition/Packages-Desktop b/sonar/mate-edition/Packages-Desktop
deleted file mode 100644
index c01b190..0000000
--- a/sonar/mate-edition/Packages-Desktop
+++ /dev/null
@@ -1,106 +0,0 @@
-### Sonar mate Packages
-
-lightdm-gtk-greeter
-lightdm-gtk-greeter-settings
-mate-gtk3
-mate-extra-gtk3
-mate-desktop-gtk3
-maia-wallpaper
-manjaro-artwork
->extra gtk3-print-backends
-mate-tweak
-mate-screensaver-gtk3
-network-manager-applet
-sonar-mate-panel-layout
-dconf-editor
-sonar-mate-settings
-sonar-sound-theme
-sonar-common
-sonar-backgrounds
-
-## Xorg Input Drivers
-xf86-input-elographics
-xf86-input-evdev
-xf86-input-keyboard
-xf86-input-mouse
->systemd xf86-input-libinput
->openrc xf86-input-libinput-nosystemd
-xf86-input-synaptics #synaptic mice
-xf86-input-void
-
-## Xorg Server and Graphics
-xorg-twm
-xorg-xinit
-mesa-demos
->multilib lib32-mesa-demos
-
-## Desktop Utils
-xdg-utils
-xdg-su
-numlockx
-
-## Fonts
-terminus-font
-ttf-bitstream-vera
-ttf-dejavu
-ttf-inconsolata
-ttf-indic-otf
-ttf-liberation
-ttf-droid
-ttf-ubraille
-
-## Applications
-inxi
-dmidecode # for inxi -m output
-powertop
-
-## Sound
-alsa-firmware
->openrc alsa-utils-openrc
->systemd alsa-utils
-
-## Network
-mobile-broadband-provider-info
-modemmanager
-networkmanager
->openrc networkmanager-openrc
->openrc avahi-openrc
->systemd avahi
-nss-mdns
->systemd ntp
->openrc ntp-openrc
->systemd openssh
->openrc openssh-openrc
-
-## Misc
->openrc elogind-openrc
->openrc openrc-settingsd
->openrc displaymanager-openrc
-manjaro-hotfixes
->openrc accountsservice-elogind
->openrc upower-nosystemd
->openrc udisks2-elogind
->openrc xdg-user-dirs-nosystemd
->openrc xorg-server-nosystemd
->systemd xdg-user-dirs
->systemd xorg-server
-
-#accessibility packages
->systemd espeakup
->openrc espeakup-openrc
-orca
->systemd brltty
->openrc brltty-openrc
-eviacam
-open-dyslexic-fonts
-caribou
-ibus
-ibus-table
-ibus-table-extraphrase
-mousetweaks
-#alteraeon sound pack
-tintin-alteraeon
-python-yaml
-vorbis-tools
-ocrdesktop
-mumble
diff --git a/sonar/mate-edition/Packages-Live b/sonar/mate-edition/Packages-Live
deleted file mode 120000
index 5e66e00..0000000
--- a/sonar/mate-edition/Packages-Live
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/Packages-Live
\ No newline at end of file
diff --git a/sonar/mate-edition/Packages-Mhwd b/sonar/mate-edition/Packages-Mhwd
deleted file mode 120000
index 9df3d5e..0000000
--- a/sonar/mate-edition/Packages-Mhwd
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/Packages-Mhwd
\ No newline at end of file
diff --git a/sonar/mate-edition/Packages-Root b/sonar/mate-edition/Packages-Root
deleted file mode 120000
index 60cc7bd..0000000
--- a/sonar/mate-edition/Packages-Root
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/Packages-Root
\ No newline at end of file
diff --git a/sonar/mate-edition/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/sonar/mate-edition/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
deleted file mode 100644
index 5d5d470..0000000
--- a/sonar/mate-edition/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[greeter]
-reader = orca
-a11y-states = +reader
-
-background = /usr/share/backgrounds/sonar.jpg
-font-name = Cantarell 11
-xft-antialias = true
-icon-theme-name = Vertex-Maia
-screensaver-timeout = 60
-theme-name = Vertex-Maia
-cursor-theme-name = Maia-Cursor
-show-clock = true
-default-user-image = #avatar-default
-xft-hintstyle = hintfull
-position = 50%,center 50%,center
-clock-format =
-panel-position = bottom
diff --git a/sonar/mate-edition/desktop-overlay/etc/purple/accels b/sonar/mate-edition/desktop-overlay/etc/purple/accels
deleted file mode 100755
index 66bf70e..0000000
--- a/sonar/mate-edition/desktop-overlay/etc/purple/accels
+++ /dev/null
@@ -1,86 +0,0 @@
-; Pidgin GtkAccelMap rc-file -*- scheme -*-
-; this file is an automated accelerator map dump
-;
-; (gtk_accel_path "/Conversation/Send File..." "")
-; (gtk_accel_path "/Options/Enable Logging" "")
-; (gtk_accel_path "/Options/Enable Sounds" "")
-; (gtk_accel_path "/Conversation/Alias..." "")
-; (gtk_accel_path "/Tools/Buddy Pounces" "")
-; (gtk_accel_path "/Conversation/Close" "w")
-; (gtk_accel_path "/Buddies/Sort Buddies/By status" "")
-; (gtk_accel_path "/Help/Online Help" "F1")
-; (gtk_accel_path "/Conversation/Insert Link..." "")
-; (gtk_accel_path "/Accounts/Manage Accounts" "a")
-; (gtk_accel_path "/Tools/Certificates" "")
-; (gtk_accel_path "/Tools/Mute Sounds" "")
-; (gtk_accel_path "/Buddies/Sort Buddies/Alphabetically" "")
-; (gtk_accel_path "/Buddies/Add Buddy..." "b")
-; (gtk_accel_path "/Conversation/Insert Image..." "")
-; (gtk_accel_path "/Tools/Set Mood" "d")
-; (gtk_accel_path "/Tools/Room List" "")
-; (gtk_accel_path "/Buddies/Add Chat..." "")
-; (gtk_accel_path "/Conversation/Invite..." "")
-; (gtk_accel_path "/Conversation/Media" "")
-; (gtk_accel_path "/Accounts/sonar-user@irc.netwirc.tk (IRC)/Disable" "")
-; (gtk_accel_path "/Help/Plugin Information" "")
-; (gtk_accel_path "/Help/Debug Window" "")
-; (gtk_accel_path "/Help/Developer Information" "")
-; (gtk_accel_path "/Buddies/Show/Offline Buddies" "")
-; (gtk_accel_path "/Buddies/Sort Buddies/Manually" "")
-; (gtk_accel_path "/Help/Translator Information" "")
-; (gtk_accel_path "/Accounts/sonar-user@irc.netwirc.tk (IRC)/No actions available" "")
-; (gtk_accel_path "/Options/sep0" "")
-; (gtk_accel_path "/Conversation/Get Attention" "")
-; (gtk_accel_path "/Conversation/Media/Video Call" "")
-; (gtk_accel_path "/Buddies/Show/Idle Times" "")
-; (gtk_accel_path "/Buddies/Sort Buddies/By recent log activity" "")
-; (gtk_accel_path "/Conversation/Add..." "")
-; (gtk_accel_path "/Accounts/sonar-user@irc.netwirc.tk (IRC)/View MOTD" "")
-; (gtk_accel_path "/Accounts/sonar-user@irc.netwirc.tk (IRC)/Edit Account" "")
-; (gtk_accel_path "/Help/Build Information" "")
-; (gtk_accel_path "/Accounts/sonar-user@irc.netwirc.tk (IRC)" "")
-; (gtk_accel_path "/Buddies/Show/Protocol Icons" "")
-; (gtk_accel_path "/Conversation/Unblock..." "")
-; (gtk_accel_path "/Tools/Plugins" "u")
-; (gtk_accel_path "/Buddies/Show/Buddy Details" "")
-; (gtk_accel_path "/Conversation/Remove..." "")
-; (gtk_accel_path "/Help/sep2" "")
-; (gtk_accel_path "/Buddies/sep1" "")
-; (gtk_accel_path "/Conversation/sep4" "")
-; (gtk_accel_path "/Options/Show Formatting Toolbars" "")
-; (gtk_accel_path "/Buddies/Add Group..." "")
-; (gtk_accel_path "/Tools/File Transfers" "t")
-; (gtk_accel_path "/Conversation/Media/Audio\\/Video Call" "")
-; (gtk_accel_path "/Tools/Custom Smileys" "y")
-; (gtk_accel_path "/Buddies/sep3" "")
-; (gtk_accel_path "/Buddies/sep2" "")
-; (gtk_accel_path "/Conversation/Save As..." "")
-; (gtk_accel_path "/Conversation/View Log" "")
-; (gtk_accel_path "/Buddies/Quit" "q")
-; (gtk_accel_path "/Tools/sep3" "")
-; (gtk_accel_path "/Tools/sep2" "")
-; (gtk_accel_path "/Tools/Preferences" "p")
-; (gtk_accel_path "/Conversation/Clear Scrollback" "l")
-; (gtk_accel_path "/Tools/Privacy" "")
-; (gtk_accel_path "/Conversation/Get Info" "o")
-; (gtk_accel_path "/Help/sep1" "")
-; (gtk_accel_path "/Conversation/New Instant Message..." "m")
-; (gtk_accel_path "/Conversation/sep3" "")
-; (gtk_accel_path "/Conversation/sep2" "")
-; (gtk_accel_path "/Conversation/sep1" "")
-; (gtk_accel_path "/Conversation/Block..." "")
-; (gtk_accel_path "/Conversation/sep0" "")
-; (gtk_accel_path "/Conversation/Find..." "f")
-; (gtk_accel_path "/Tools/System Log" "")
-; (gtk_accel_path "/Conversation/Add Buddy Pounce..." "")
-; (gtk_accel_path "/Buddies/Get User Info..." "i")
-; (gtk_accel_path "/Options/Show Timestamps" "")
-; (gtk_accel_path "/Buddies/View User Log..." "l")
-; (gtk_accel_path "/Buddies/Show/Empty Groups" "")
-; (gtk_accel_path "/Conversation/More" "")
-; (gtk_accel_path "/Conversation/Join a Chat..." "")
-; (gtk_accel_path "/Conversation/More/No actions available" "")
-; (gtk_accel_path "/Conversation/Media/Audio Call" "")
-; (gtk_accel_path "/Buddies/New Instant Message..." "m")
-; (gtk_accel_path "/Help/About" "")
-; (gtk_accel_path "/Buddies/Join a Chat..." "c")
diff --git a/sonar/mate-edition/desktop-overlay/etc/purple/accounts.xml b/sonar/mate-edition/desktop-overlay/etc/purple/accounts.xml
deleted file mode 100755
index eb3e0cb..0000000
--- a/sonar/mate-edition/desktop-overlay/etc/purple/accounts.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- prpl-irc
- sonar-user@irc.netwirc.tk
-
-
-
-
-
-
-
-
-
-
-
-
- 6697
- 0
- 0
- UTF-8
- 0
- 1
-
-
- 1
-
-
-
-
diff --git a/sonar/mate-edition/desktop-overlay/etc/purple/blist.xml b/sonar/mate-edition/desktop-overlay/etc/purple/blist.xml
deleted file mode 100755
index 5b17253..0000000
--- a/sonar/mate-edition/desktop-overlay/etc/purple/blist.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
- 0
-
- sonar help channel
- #sonar
- 0
- 1
-
-
- talking arch channel
- #talkingarch
- 1
-
-
-
-
-
-
-
diff --git a/sonar/mate-edition/desktop-overlay/etc/purple/certificates/x509/tls_peers/irc.netwirc.tk b/sonar/mate-edition/desktop-overlay/etc/purple/certificates/x509/tls_peers/irc.netwirc.tk
deleted file mode 100755
index 287edd3..0000000
--- a/sonar/mate-edition/desktop-overlay/etc/purple/certificates/x509/tls_peers/irc.netwirc.tk
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICeDCCAeGgAwIBAgIJAOYsV/UJUinPMA0GCSqGSIb3DQEBCwUAMFUxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRQwEgYDVQQHDAtMb3MgQW5nZWxl
-czEbMBkGA1UEAwwSbnVjbGVhci5uZXR3aXJjLnRrMB4XDTE1MDYxMjA1MTkxMloX
-DTE2MDYxMTA1MTkxMlowVTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3Ju
-aWExFDASBgNVBAcMC0xvcyBBbmdlbGVzMRswGQYDVQQDDBJudWNsZWFyLm5ldHdp
-cmMudGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMo7S/YcPunc/8c4gLxU
-nLXJ3egT1Kkv6wdPnUghZeo86YwiOd4AbKtLgNx0V3rf082KHOt/iPF8oUhmL4/h
-NUg7qssgPrq20HnjPsoF+lJVlvtymfZ30NNlPbd3phSElwh9y59b+Mj1kGpo2wci
-NEvh/BauyqpKjSEqnXAWDI4xAgMBAAGjUDBOMB0GA1UdDgQWBBRRZ3v2DGbLntZo
-ceSjPQtSezS+5jAfBgNVHSMEGDAWgBRRZ3v2DGbLntZoceSjPQtSezS+5jAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBAAIqBjk1gkuvGbMR5RoQyawBVuGx
-SeQ7B5ubplpSl1MGX/m7pTAd8xos8aZQg5/xorLUK7qGibv4wrl4BMRheoIQfZ9H
-gNlzI/bzAjm9GG5PC4WMt5Hy1Ry2nLs75pn0Z76H9kB/l41pnVD/4jSuBPP3zbiq
-ANkLwl//i3N9rpN7
------END CERTIFICATE-----
diff --git a/sonar/mate-edition/desktop-overlay/etc/purple/prefs.xml b/sonar/mate-edition/desktop-overlay/etc/purple/prefs.xml
deleted file mode 100755
index 258c0a2..0000000
--- a/sonar/mate-edition/desktop-overlay/etc/purple/prefs.xml
+++ /dev/null
@@ -1,563 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sonar/mate-edition/desktop-overlay/etc/purple/status.xml b/sonar/mate-edition/desktop-overlay/etc/purple/status.xml
deleted file mode 100755
index e324a79..0000000
--- a/sonar/mate-edition/desktop-overlay/etc/purple/status.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- away
- I'm not here right now
-
-
- available
-
-
diff --git a/sonar/mate-edition/live-overlay b/sonar/mate-edition/live-overlay
deleted file mode 120000
index acb5966..0000000
--- a/sonar/mate-edition/live-overlay
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/sonar/live-overlay
\ No newline at end of file
diff --git a/sonar/mate-edition/profile.conf b/sonar/mate-edition/profile.conf
deleted file mode 100644
index 462c17c..0000000
--- a/sonar/mate-edition/profile.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
-# use multilib packages; x86_64 only
-multilib="false"
-
-# use extra packages as defined in pkglist to activate a full profile
-# extra="false"
-
-################ install ################
-
-# default displaymanager: none
-# supported; lightdm, sddm, gdm, lxdm, mdm
-displaymanager="lightdm"
-
-# Set to false to disable autologin in the livecd
-# autologin="true"
-
-# nonfree mhwd drivers
-nonfree_mhwd="false"
-
-# unset defaults to given value
-# efi_boot_loader="grub"
-
-# configure calamares for netinstall
-# netinstall="false"
-
-# configure calamares to use chrootcfg instead of unpackfs
-# chrootcfg="false"
-
-# use geoip for localization
-# geoip='true'
-
-# the login shell
-# defaults to bash
-# login_shell=/bin/bash
-
-# unset defaults to given values
-# addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel"
-
-# unset defaults to given values
-# names must match systemd service names
-enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'brltty')
-
-# disable_systemd=('pacman-init')
-
-# unset defaults to given values,
-# names must match openrc service names
-enable_openrc=('acpid' 'elogind' 'cronie' 'dbus' 'syslog-ng' 'NetworkManager' 'brltty')
-
-# disable_openrc=()
-
-
-# the same workgroup name if samba is used
-# smb_workgroup="SONAR"
-
-################# livecd #################
-
-# unset defaults to given value
-hostname="sonar-pc"
-
-# unset defaults to given value
-username="sonar"
-
-# unset defaults to given value
-password="sonar"
-
-# unset defaults to given values
-# names must match systemd service names
-# services in enable_systemd array don't need to be listed here
-# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-
-# unset defaults to given values,
-# names must match openrc service names
-# services in enable_openrc array don't need to be listed here
-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-