calamares 3.2.35.1-2 (aarch64) 2021-13476
9999

Submitter rugyada [@T] gmail.com
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/942365
Packages
calamares-3.2.35.1-2.aarch64.binary
calamares-3.2.35.1-2.aarch64.source
calamares-debuginfo-3.2.35.1-2.aarch64.debuginfo
calamares-debugsource-3.2.35.1-2.aarch64.binary
lib64calamares3-3.2.35.1-2.aarch64.binary
lib64calamares3-debuginfo-3.2.35.1-2.aarch64.debuginfo
lib64calamares-devel-3.2.35.1-2.aarch64.binary
Build Date 2021-01-12 13:47:54 +0000 UTC
Last Updated 2021-01-18 21:53:26.812513214 +0000 UTC
$ git diff --patch-with-stat --summary e12bc7446045c5933b987019344284abc5347a42..8b3dc281df207462be8fe46f466591acdd2f9d22

 .abf.yml                                           |    3 +-
 0001-locale-fixes.patch                            |   26 +-
 0003-disable-lvm.patch                             |   37 +-
 calamares-Add-LVM-devices-to-devies-list.patch     |   30 +
 ...le-newPartitionTableButton-for-LVM-device.patch |   43 +
 calamares.spec                                     |  126 +--
 esp-to-boot-flag.patch                             |   21 -
 fix-incomplete-type.patch                          |   12 -
 omv-bootloader.conf                                |   54 -
 omv-displaymanager.conf                            |   24 -
 omv-finished.conf                                  |   44 -
 omv-fstab.conf                                     |   37 -
 omv-grubcfg.conf                                   |   42 -
 omv-keyboard.conf                                  |   16 -
 omv-locale.conf                                    |   97 --
 omv-machineid.conf                                 |   24 -
 omv-mount.conf                                     |   22 -
 omv-packages.conf                                  |  149 ---
 omv-partition.conf                                 |  114 --
 omv-removeuser.conf                                |    2 -
 omv-services-systemd.conf                          |  182 ----
 omv-settings.conf                                  |  147 ---
 omv-shellprocess.conf                              |   34 -
 omv-umount.conf                                    |    3 -
 omv-unpackfs.conf                                  |    5 -
 omv-users.conf                                     |   71 --
 omv-webview.conf                                   |    3 -
 omv-welcome.conf                                   |   50 -
 openmandriva-install.svg                           | 1122 --------------------
 29 files changed, 111 insertions(+), 2429 deletions(-)
 create mode 100644 calamares-Add-LVM-devices-to-devies-list.patch
 create mode 100644 calamares-Disable-newPartitionTableButton-for-LVM-device.patch
 delete mode 100644 esp-to-boot-flag.patch
 delete mode 100644 fix-incomplete-type.patch
 delete mode 100644 omv-bootloader.conf
 delete mode 100644 omv-displaymanager.conf
 delete mode 100644 omv-finished.conf
 delete mode 100644 omv-fstab.conf
 delete mode 100644 omv-grubcfg.conf
 delete mode 100644 omv-keyboard.conf
 delete mode 100644 omv-locale.conf
 delete mode 100644 omv-machineid.conf
 delete mode 100644 omv-mount.conf
 delete mode 100644 omv-packages.conf
 delete mode 100644 omv-partition.conf
 delete mode 100644 omv-removeuser.conf
 delete mode 100644 omv-services-systemd.conf
 delete mode 100644 omv-settings.conf
 delete mode 100644 omv-shellprocess.conf
 delete mode 100644 omv-umount.conf
 delete mode 100644 omv-unpackfs.conf
 delete mode 100644 omv-users.conf
 delete mode 100644 omv-webview.conf
 delete mode 100644 omv-welcome.conf
 delete mode 100644 openmandriva-install.svg

diff --git a/.abf.yml b/.abf.yml
index 8d3700e..ac629ce 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,3 @@
 sources:
-  OpenMandriva-adverts.tar.xz: d0833604f1ce5bdcc7a1560cc51f4c392a9ed665
+  calamares-3.2.35.1.tar.gz: f9ce83eecc585fa176943b9780d6607350bfccef
   openmandriva-install.svg: a64c8fd2b0e11766cfdcc0c345664b99c4b108b7
-  calamares-3.2.20.tar.gz: 6f23d53c68ca691dcbf6e1bdbd298c076b17e862 
diff --git a/0001-locale-fixes.patch b/0001-locale-fixes.patch
index c1f05ca..d26bf2e 100644
--- a/0001-locale-fixes.patch
+++ b/0001-locale-fixes.patch
@@ -1,17 +1,7 @@
-From 06f58e409030ae1109721d5047a6cc86264da0de Mon Sep 17 00:00:00 2001
-From: Gabriel Craciunescu <nix.or.die@gmail.com>
-Date: Mon, 15 Apr 2019 19:24:34 +0200
-Subject: [PATCH 4/4] locale fixes
-
- sort some things out
----
- src/modules/locale/LocalePage.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff -Naur calamares-3.2.16/src/modules/locale/LocalePage.cpp calamares-3.2.16.tpg/src/modules/locale/LocalePage.cpp
---- calamares-3.2.16/src/modules/locale/LocalePage.cpp	2019-11-01 16:24:10.000000000 +0000
-+++ calamares-3.2.16.tpg/src/modules/locale/LocalePage.cpp	2019-11-05 09:49:22.168003876 +0000
-@@ -182,6 +182,7 @@
+diff -up calamares-3.2.28.2/src/modules/locale/Config.cpp.omv~ calamares-3.2.28.2/src/modules/locale/Config.cpp
+--- calamares-3.2.28.2/src/modules/locale/Config.cpp.omv~	2020-08-15 18:40:02.935735917 +0200
++++ calamares-3.2.28.2/src/modules/locale/Config.cpp	2020-08-15 18:42:43.213625743 +0200
+@@ -62,6 +62,7 @@ loadLocales( const QString& localeGenPat
  
      if ( supported.exists() && supported.open( QIODevice::ReadOnly | QIODevice::Text ) )
      {
@@ -19,13 +9,12 @@ diff -Naur calamares-3.2.16/src/modules/locale/LocalePage.cpp calamares-3.2.16.t
          ba = supported.readAll();
          supported.close();
  
-@@ -194,16 +195,16 @@
+@@ -74,16 +75,15 @@ loadLocales( const QString& localeGenPat
      else
      {
          QFile localeGen( localeGenPath );
 -        if ( localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
-+        if ( localeGen.exists() &&
-+             localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
++        if ( localeGen.exists() && localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
          {
 +            cDebug() << "Locale: using " << localeGenPath;
              ba = localeGen.readAll();
@@ -40,6 +29,3 @@ diff -Naur calamares-3.2.16/src/modules/locale/LocalePage.cpp calamares-3.2.16.t
              QProcess localeA;
              localeA.start( "locale", QStringList() << "-a" );
              localeA.waitForFinished();
-
---
-2.21.0
diff --git a/0003-disable-lvm.patch b/0003-disable-lvm.patch
index 22a936b..565a811 100644
--- a/0003-disable-lvm.patch
+++ b/0003-disable-lvm.patch
@@ -1,26 +1,13 @@
-From 7684d3fae4e0d8b6f87f6eef0fdcf4f8b3c50692 Mon Sep 17 00:00:00 2001
-From: Gabriel Craciunescu <nix.or.die@gmail.com>
-Date: Mon, 15 Apr 2019 19:17:49 +0200
-Subject: [PATCH 3/4] disable-lvm
-
- is not going to work well , crashes and not really done yet
-
----
- src/modules/partition/gui/PartitionPage.cpp | 31 ++++-----------------
- 1 file changed, 5 insertions(+), 26 deletions(-)
-
-diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
-index 22398bddb..806a31147 100644
---- a/src/modules/partition/gui/PartitionPage.cpp
-+++ b/src/modules/partition/gui/PartitionPage.cpp
-@@ -161,29 +161,6 @@ PartitionPage::updateButtons()
-         else if ( device->type() != Device::Type::LVM_Device )
+diff -Naur calamares-3.2.32.1/src/modules/partition/gui/PartitionPage.cpp calamares-3.2.32.1.tpg/src/modules/partition/gui/PartitionPage.cpp
+--- calamares-3.2.32.1/src/modules/partition/gui/PartitionPage.cpp	2020-10-17 14:41:08.000000000 +0000
++++ calamares-3.2.32.1.tpg/src/modules/partition/gui/PartitionPage.cpp	2020-11-03 19:21:10.976785776 +0000
+@@ -170,30 +170,6 @@
          {
              createTable = true;
--
+ 
 -#ifdef WITH_KPMCORE4API
--            if ( device->type() == Device::Type::SoftwareRAID_Device &&
--                 static_cast< SoftwareRAID* >(device)->status() == SoftwareRAID::Status::Inactive )
+-            if ( device->type() == Device::Type::SoftwareRAID_Device
+-                 && static_cast< SoftwareRAID* >( device )->status() == SoftwareRAID::Status::Inactive )
 -            {
 -                createTable = false;
 -                create = false;
@@ -31,7 +18,7 @@ index 22398bddb..806a31147 100644
 -        {
 -            currentDeviceIsVG = true;
 -
--            LvmDevice* lvmDevice = dynamic_cast<LvmDevice*>(m_core->deviceModel()->deviceForIndex( deviceIndex ));
+-            LvmDevice* lvmDevice = dynamic_cast< LvmDevice* >( m_core->deviceModel()->deviceForIndex( deviceIndex ) );
 -
 -            isDeactivable = DeactivateVolumeGroupOperation::isDeactivatable( lvmDevice );
 -            isRemovable = RemoveVolumeGroupOperation::isRemovable( lvmDevice );
@@ -39,11 +26,13 @@ index 22398bddb..806a31147 100644
 -            isVGdeactivated = m_core->isVGdeactivated( lvmDevice );
 -
 -            if ( isVGdeactivated )
+-            {
 -                m_ui->revertButton->setEnabled( true );
+-            }
          }
      }
  
-@@ -191,9 +168,11 @@ PartitionPage::updateButtons()
+@@ -201,9 +177,10 @@
      m_ui->editButton->setEnabled( edit );
      m_ui->deleteButton->setEnabled( del );
      m_ui->newPartitionTableButton->setEnabled( createTable );
@@ -54,10 +43,6 @@ index 22398bddb..806a31147 100644
 +    m_ui->resizeVolumeGroupButton->setEnabled( false );
 +    m_ui->deactivateVolumeGroupButton->setEnabled( false );
 +    m_ui->removeVolumeGroupButton->setEnabled( false );
-+
  }
  
  void
--- 
-2.21.0
-
diff --git a/calamares-Add-LVM-devices-to-devies-list.patch b/calamares-Add-LVM-devices-to-devies-list.patch
new file mode 100644
index 0000000..225f682
--- /dev/null
+++ b/calamares-Add-LVM-devices-to-devies-list.patch
@@ -0,0 +1,30 @@
+From 5f231086de09dda1473d94dc091031166e26d38f Mon Sep 17 00:00:00 2001
+From: Chantara Tith <tith.chantara@gmail.com>
+Date: Mon, 12 Sep 2016 18:25:25 +0700
+Subject: [PATCH] Add LVM devices to devies-list.
+
+---
+ src/modules/partition/core/PartitionCoreModule.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
+index 7733384..6356348 100644
+--- a/src/modules/partition/core/PartitionCoreModule.cpp
++++ b/src/modules/partition/core/PartitionCoreModule.cpp
+@@ -42,6 +42,7 @@
+ 
+ // KPMcore
+ #include <kpmcore/core/device.h>
++#include <kpmcore/core/lvmdevice.h>
+ #include <kpmcore/core/partition.h>
+ #include <kpmcore/backend/corebackend.h>
+ #include <kpmcore/backend/corebackendmanager.h>
+@@ -119,6 +120,8 @@ PartitionCoreModule::doInit()
+ 
+     using DeviceList = QList< Device* >;
+     DeviceList devices = PartUtils::getDevices( PartUtils::DeviceType::WritableOnly );
++    for ( auto dev : LvmDevice::scanSystemLVM() )
++        devices.append(dev);
+ 
+     cDebug() << "LIST OF DETECTED DEVICES:";
+     cDebug() << "node\tcapacity\tname\tprettyName";
diff --git a/calamares-Disable-newPartitionTableButton-for-LVM-device.patch b/calamares-Disable-newPartitionTableButton-for-LVM-device.patch
new file mode 100644
index 0000000..4294aa5
--- /dev/null
+++ b/calamares-Disable-newPartitionTableButton-for-LVM-device.patch
@@ -0,0 +1,43 @@
+From 9017edad920090f601e5a3b9698d9b6b9dff854b Mon Sep 17 00:00:00 2001
+From: Chantara Tith <tith.chantara@gmail.com>
+Date: Mon, 5 Sep 2016 16:05:16 +0700
+Subject: [PATCH] Disable newPartitionTableButton for LVM device.
+
+---
+ src/modules/partition/gui/PartitionPage.cpp | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
+index 2ba0760..fd8b673 100644
+--- a/src/modules/partition/gui/PartitionPage.cpp
++++ b/src/modules/partition/gui/PartitionPage.cpp
+@@ -114,7 +114,7 @@ PartitionPage::~PartitionPage()
+ void
+ PartitionPage::updateButtons()
+ {
+-    bool create = false, edit = false, del = false;
++    bool create = false, createTable = false, edit = false, del = false;
+ 
+     QModelIndex index = m_ui->partitionTreeView->currentIndex();
+     if ( index.isValid() )
+@@ -136,11 +136,18 @@ PartitionPage::updateButtons()
+         edit = !isFree && !isExtended;
+         del = !isFree;
+     }
++
++    if ( m_ui->deviceComboBox->currentIndex() >= 0 )
++    {
++        QModelIndex deviceIndex = m_core->deviceModel()->index( m_ui->deviceComboBox->currentIndex(), 0 );
++        if ( m_core->deviceModel()->deviceForIndex( deviceIndex )->type() != Device::LVM_Device )
++            createTable = true;
++    }
++
+     m_ui->createButton->setEnabled( create );
+     m_ui->editButton->setEnabled( edit );
+     m_ui->deleteButton->setEnabled( del );
+-
+-    m_ui->newPartitionTableButton->setEnabled( m_ui->deviceComboBox->currentIndex() >= 0 );
++    m_ui->newPartitionTableButton->setEnabled( createTable );
+ }
+ 
+ void
diff --git a/calamares.spec b/calamares.spec
index e93a5ce..a206d98 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -3,14 +3,21 @@
 %define develname %mklibname %{name} -d
 %define git %{nil}
 
+
+## !NO JOKE! STOP TOUCHING THAT PACKAGE ##
+## ANY COMMIT MADE WITHOUT DISCUSS IN DEVEL CHANELS WILL BE REVERTED ##
+## THAT INCLUDES CRAP BUMPS WITHOUT TESTING ###
+
+### STOP IT!! #####
+
 Summary:	Distribution-independent installer framework
 Name:		calamares
-Version:	3.2.20
+Version:	3.2.35.1
 %if "%{git}" != ""
-Release:	0.%{git}.1
+Release:	1
 Source0:	calamares-%{version}-%{git}.tar.xz
 %else
-Release:	3
+Release:	2
 # git archive --format=tar --prefix=calamares-1.1.0-$(date +%Y%m%d)/ HEAD | xz -vf > calamares-1.1.0-$(date +%Y%m%d).tar.xz
 #Source0:	calamares-%{version}-%{calamdate}.tar.xz
 Source0:	https://github.com/calamares/calamares/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -22,30 +29,9 @@ Source2:	%{name}.rpmlintrc
 Source3:	%{name}-locale-setup
 Source4:	%{name}-locale.service
 Source5:	%{name}-post-script
-Source7:	omv-bootloader.conf
-Source8:	omv-displaymanager.conf
-Source9:	omv-finished.conf
-Source10:	omv-fstab.conf
-Source11:	omv-grubcfg.conf
-Source12:	omv-keyboard.conf
-Source13:	omv-locale.conf
-Source14:	omv-machineid.conf
-Source15:	omv-mount.conf
-Source16:	omv-packages.conf
-Source17:	omv-welcome.conf
-Source18:	omv-services-systemd.conf
-Source19:	omv-settings.conf
-Source20:	omv-unpackfs.conf
-Source21:	omv-users.conf
-Source22:	omv-partition.conf
-Source23:	omv-removeuser.conf
-Source24:	omv-webview.conf
-Source25:	omv-umount.conf
-Source26:	omv-shellprocess.conf
 Source50:	49-nopasswd_calamares.rules
 Source51:	%{name}-live.sudo
 Source99:	openmandriva-install.svg
-Source100:	OpenMandriva-adverts.tar.xz
 Patch1:		calamares-0.17.0-20150112-openmandriva-desktop-file.patch
 # (crazy) why we need this?
 Patch2:		calamares-libparted-detection.patch
@@ -56,9 +42,6 @@ Patch5:		0001-services-systemd-support-sockets-timers-and-unmask.patch
 # (crazy) LVM disabled for now
 #  -- until it starts working properly
 Patch6:		0003-disable-lvm.patch
-Patch7:		calamares-3.2.16-random-seed-location.patch
-Patch10:	esp-to-boot-flag.patch
-Patch11:	fix-incomplete-type.patch
 #Patch12:	http://frugalware.eu/cala-luks-sucker1.patch
 
 BuildRequires:	pkgconfig(Qt5Core)
@@ -78,13 +61,12 @@ BuildRequires:	pkgconfig(libatasmart)
 BuildRequires:	pkgconfig(blkid)
 BuildRequires:	pkgconfig(libparted)
 BuildRequires:	pkgconfig(polkit-qt5-1)
-BuildRequires:	cmake >= 3.0
-BuildRequires:	ninja
 BuildRequires:	cmake(ECM)
 BuildRequires:	qt5-qttools
 BuildRequires:	qt5-linguist
 # (crazy): fixme need to sort these after unused plasma*
 # and *terminal gone
+BuildRequires:	cmake(KF5DBusAddons)
 BuildRequires:	cmake(KF5CoreAddons)
 BuildRequires:	cmake(KF5Config)
 BuildRequires:	cmake(KF5Crash)
@@ -94,7 +76,7 @@ BuildRequires:	cmake(KF5IconThemes)
 BuildRequires:	cmake(KF5KIO)
 BuildRequires:	cmake(KF5Service)
 BuildRequires:	cmake(KF5Parts)
-BuildRequires:	cmake(KPMcore) >= 4.0.0
+BuildRequires:	cmake(KPMcore) >= 4.2.0
 BuildRequires:	cmake(AppStreamQt)
 BuildRequires:	yaml-cpp-devel
 BuildRequires:	pkgconfig(python3)
@@ -103,14 +85,15 @@ BuildRequires:	boost-python-devel
 BuildRequires:	pkgconfig(libcrypto)
 BuildRequires:	pkgconfig(pwquality)
 BuildRequires:	systemd-macros
-Requires(post):	distro-release-OpenMandriva
-Requires(post):	distro-theme-OpenMandriva
+BuildRequires:	python3dist(jsonschema)
+BuildRequires:	python3dist(pyyaml)
 Requires:	coreutils
-Requires:       kpmcore
+Requires:	kpmcore >= 4.2.0
 Requires:	gawk
 Requires:	util-linux
 Requires:	dracut
 Requires:	grub2
+Requires:	distro-release-installer
 %ifarch %{x86_64}
 # EFI currently only supported on x86_64
 Requires:	grub2-efi
@@ -169,7 +152,7 @@ rm -f src/modules/*/*.conf.default-settings
 # plasma* one can just set a theme with an external tool right now.
 # the rest cannot be used in OpenMandriva cause these are Gentoo , ArchLinux , Debian/Ubuntu only modules.
 %cmake_qt5 \
-	-DCALAMARES_BOOST_PYTHON3_COMPONENT="python37" \
+	-DCALAMARES_BOOST_PYTHON3_COMPONENT="python39" \
 	-DWITH_PYTHONQT="OFF" \
 	-DSKIP_MODULES="plasmalnf preservefiles openrcdmcryptcfg fsresizer luksopenswaphookcfg tracking services-openrc dummycpp dummyprocess dummypython dummypythonqt initcpio initcpiocfg initramfs initramfscfg interactiveterminal" \
 	-DBoost_NO_BOOST_CMAKE=ON \
@@ -188,28 +171,6 @@ fi
 #own the local settings directories
 mkdir -p %{buildroot}%{_sysconfdir}/calamares/modules
 mkdir -p %{buildroot}%{_sysconfdir}/calamares/branding/auto
-touch %{buildroot}%{_sysconfdir}/calamares/branding/auto/branding.desc
-# (tpg) settings specific for OMV
-install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/calamares/modules/bootloader.conf
-install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/calamares/modules/displaymanager.conf
-install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/calamares/modules/finished.conf
-install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/calamares/modules/fstab.conf
-install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/calamares/modules/grubcfg.conf
-install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/calamares/modules/keyboard.conf
-install -m 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/calamares/modules/locale.conf
-install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/calamares/modules/machineid.conf
-install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/calamares/modules/mount.conf
-install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/calamares/modules/packages.conf
-install -m 644 %{SOURCE17} %{buildroot}%{_sysconfdir}/calamares/modules/welcome.conf
-install -m 644 %{SOURCE18} %{buildroot}%{_sysconfdir}/calamares/modules/services-systemd.conf
-install -m 644 %{SOURCE19} %{buildroot}%{_sysconfdir}/calamares/settings.conf
-install -m 644 %{SOURCE20} %{buildroot}%{_sysconfdir}/calamares/modules/unpackfs.conf
-install -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/calamares/modules/users.conf
-install -m 644 %{SOURCE22} %{buildroot}%{_sysconfdir}/calamares/modules/partition.conf
-install -m 644 %{SOURCE23} %{buildroot}%{_sysconfdir}/calamares/modules/removeuser.conf
-install -m 644 %{SOURCE24} %{buildroot}%{_sysconfdir}/calamares/modules/webview.conf
-install -m 644 %{SOURCE25} %{buildroot}%{_sysconfdir}/calamares/modules/umount.conf
-install -m 644 %{SOURCE26} %{buildroot}%{_sysconfdir}/calamares/modules/shellprocess.conf
 
 # (crazy) service and wrapper for language/keyboard stuff in the iso
 mkdir -p %{buildroot}{%{_unitdir},%{_sbindir}}
@@ -228,59 +189,18 @@ cat > %{buildroot}%{_presetdir}/90-%{name}-locale.preset << EOF
 enable %{name}-locale.service
 EOF
 
-# (tpg) install adverts and slideshow
-tar xf %{SOURCE100} -C %{buildroot}%{_sysconfdir}/calamares/branding/auto
-
 # (crazy) wipe original icon and use symlink to our one
 rm -rf %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{name}.svg
 install -m 644 %{SOURCE99} %{buildroot}%{_iconsdir}/hicolor/scalable/apps/openmandriva-install.svg
 ln -s %{_iconsdir}/hicolor/scalable/apps/openmandriva-install.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{name}.svg
+
 #(crazy) we want debug.log
 sed -i -e 's|/usr/bin/calamares|/usr/bin/calamares -d|g' %{buildroot}%{_datadir}/applications/calamares.desktop
 
 %find_lang %{name} --all-name --with-html
 
-%post
-## (crazy) that should not be done here..
-## please look for possible options to brnding there:
-## https://github.com/calamares/calamares/blob/master/src/branding/default/branding.desc
-# generate the "auto" branding
-. %{_sysconfdir}/os-release
-
-cat > %{_sysconfdir}/calamares/branding/auto/branding.desc <<EOF
-# THIS FILE IS AUTOMATICALLY GENERATED! ANY CHANGES TO THIS FILE WILL BE LOST!
----
-componentName:  auto
-
-strings:
-    productName:         "$NAME"
-    shortProductName:    "$NAME"
-    version:             "$VERSION"
-    shortVersion:        "$VERSION"
-    versionedName:       "$NAME $VERSION"
-    shortVersionedName:  "$NAME $VERSION"
-    bootloaderEntryName: "openmandriva"
-    productUrl:          "$HOME_URL"
-    supportUrl:          "$BUG_REPORT_URL"
-    knownIssuesUrl:      "https://wiki.openmandriva.org/en/${VERSION_ID}/Errata"
-    releaseNotesUrl:     "https://wiki.openmandriva.org/en/${VERSION_ID}/Release_Notes"
-
-images:
-    productLogo:         "%{_iconsdir}/openmandriva.svg"
-    productIcon:         "%{_iconsdir}/openmandriva.svg"
-# (tpg) need to decide what show here
-#    productWelcome:      "languages.png"
-
-slideshow:               "omv-ads.qml"
-
-style:
-   sidebarBackground:    "#263039"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#292F34"
-EOF
-
 %files -f calamares.lang
-%doc LICENSE AUTHORS
+%doc AUTHORS
 %dir %{_libdir}/calamares
 %dir %{_datadir}/calamares
 %dir %{_datadir}/calamares/branding
@@ -292,7 +212,6 @@ EOF
 %dir %{_datadir}/calamares/qml
 %dir %{_datadir}/calamares/qml/calamares
 %dir %{_datadir}/calamares/qml/calamares/slideshow
-%config(noreplace) %{_sysconfdir}/calamares/settings.conf
 %{_presetdir}/90-%{name}-locale.preset
 %{_unitdir}/%{name}-locale.service
 %{_sbindir}/%{name}-locale-setup
@@ -300,18 +219,13 @@ EOF
 %{_sysconfdir}/polkit-1/rules.d/49-nopasswd_calamares.rules
 %{_sysconfdir}/sudoers.d/%{name}-live
 %{_bindir}/calamares
-%{_sysconfdir}/calamares/modules/*.conf
 %{_datadir}/calamares/branding/default/*
 %{_datadir}/calamares/qml/calamares/slideshow/*.qml
 %{_datadir}/calamares/qml/calamares//slideshow/qmldir
+%{_datadir}/calamares/qml/calamares/slideshow/qmldir.license
 %{_datadir}/applications/calamares.desktop
 %{_datadir}/polkit-1/actions/com.github.calamares.calamares.policy
-%{_sysconfdir}/calamares/*.conf
-%{_sysconfdir}/calamares/modules/*.conf
 %{_libdir}/calamares/*
-%ghost %{_sysconfdir}/calamares/branding/auto/branding.desc
-%{_sysconfdir}/calamares/branding/auto/*.qml
-%{_sysconfdir}/calamares/branding/auto/*.png
 %{_iconsdir}/hicolor/scalable/apps/*.svg
 %{_mandir}/man8/calamares.8.*
 
diff --git a/esp-to-boot-flag.patch b/esp-to-boot-flag.patch
deleted file mode 100644
index 11df1df..0000000
--- a/esp-to-boot-flag.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur calamares-3.2.7/src/modules/partition/gui/PartitionViewStep.cpp calamares-3.2.7-p/src/modules/partition/gui/PartitionViewStep.cpp
---- calamares-3.2.7/src/modules/partition/gui/PartitionViewStep.cpp	2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-p/src/modules/partition/gui/PartitionViewStep.cpp	2019-06-12 15:26:42.156998632 +0200
-@@ -405,7 +405,7 @@
-                                   "<br/><br/>"
-                                   "To configure an EFI system partition, go back and "
-                                   "select or create a FAT32 filesystem with the "
--                                  "<strong>esp</strong> flag enabled and mount point "
-+                                  "<strong>boot</strong> flag enabled and mount point "
-                                   "<strong>%2</strong>.<br/><br/>"
-                                   "You can continue without setting up an EFI system "
-                                   "partition but your system may fail to start." )
-@@ -418,7 +418,7 @@
-                 description = tr( "An EFI system partition is necessary to start %1."
-                                   "<br/><br/>"
-                                   "A partition was configured with mount point "
--                                  "<strong>%2</strong> but its <strong>esp</strong> "
-+                                  "<strong>%2</strong> but its <strong>boot</strong> "
-                                   "flag is not set.<br/>"
-                                   "To set the flag, go back and edit the partition."
-                                   "<br/><br/>"
diff --git a/fix-incomplete-type.patch b/fix-incomplete-type.patch
deleted file mode 100644
index e3ecb6e..0000000
--- a/fix-incomplete-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp
-index bcc80b6..50f7871 100644
---- a/src/modules/partition/gui/PartitionSplitterWidget.cpp
-+++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp
-@@ -32,6 +32,7 @@
- 
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QStyleOption>
- 
diff --git a/omv-bootloader.conf b/omv-bootloader.conf
deleted file mode 100644
index d44969c..0000000
--- a/omv-bootloader.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# Bootloader configuration. The bootloader is installed to allow
-# the system to start (and pick one of the installed operating
-# systems to run).
----
-# Define which bootloader you want to use for EFI installations
-# Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
-efiBootLoader: "grub"
-
-# systemd-boot configuration files settings, set kernel and initramfs file names
-# and amount of time before default selection boots
-kernel: "/vmlinuz-desktop"
-img: "/initrd-desktop.img"
-#fallback: "/initramfs-linux-fallback.img"
-timeout: "10"
-
-# Optionally set the menu entry name and kernel name to use in systemd-boot.
-# If not specified here, these settings will be taken from branding.desc.
-#
-bootloaderEntryName: "OpenMandriva Lx"
-kernelLine: ", with Stable-Kernel"
-# fallbackKernelLine:  ", with Stable-Kernel (fallback initramfs)"
-
-# GRUB 2 binary names and boot directory
-# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
-# These names are also used when using sb-shim, since that needs some
-# GRUB functionality (notably grub-probe) to work. As needed, you may use
-# complete paths like `/usr/bin/efibootmgr` for the executables.
-#
-grubInstall: "grub2-install"
-grubMkconfig: "grub2-mkconfig"
-grubCfg: "/boot/grub2/grub.cfg"
-grubProbe: "grub2-probe"
-efiBootMgr: "efibootmgr"
-
-# Optionally set the bootloader ID to use for EFI. This is passed to
-# grub-install --bootloader-id.
-#
-# If not set here, the value from bootloaderEntryName from branding.desc
-# is used, with problematic characters (space and slash) replaced.
-#
-# The ID is also used as a directory name within the EFI environment,
-# and the bootloader is copied from /boot/efi/EFI/<dirname>/ . When
-# setting the option here, keep in mind that the name is sanitized
-# (problematic characters, see above, are replaced).
-#
-# efiBootloaderId: "openmandriva"
-
-# Optionally install a copy of the GRUB EFI bootloader as the EFI
-# fallback loader (either bootia32.efi or bootx64.efi depending on
-# the system). This may be needed on certain systems (Intel DH87MC
-# seems to be the only one). If you set this to false, take care
-# to add another module to optionally install the fallback on those
-# boards that need it.
-installEFIFallback: true
diff --git a/omv-displaymanager.conf b/omv-displaymanager.conf
deleted file mode 100644
index c16f40e..0000000
--- a/omv-displaymanager.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configure one or more display managers (e.g. SDDM)
-# with a "best effort" approach.
----
-#The DM module attempts to set up all the DMs found in this list, in that precise order.
-#It also sets up autologin, if the feature is enabled in globalstorage.
-#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
-displaymanagers:
-  - sddm
-  - lightdm
-  - gdm
-
-#Enable the following settings to force a desktop environment in your displaymanager configuration file:
-#defaultDesktopEnvironment:
-#    executable: "startkde"
-#    desktopFile: "plasma"
-
-#If true, try to ensure that the user, group, /var directory etc. for the
-#display manager are set up correctly. This is normally done by the distribution
-#packages, and best left to them. Therefore, it is disabled by default.
-basicSetup: false
-
-#If true, setup autologin for openSUSE. This only makes sense on openSUSE
-#derivatives or other systems where /etc/sysconfig/displaymanager exists.
-sysconfigSetup: false
diff --git a/omv-finished.conf b/omv-finished.conf
deleted file mode 100644
index 3b6dd9d..0000000
--- a/omv-finished.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-# Configuration for the "finished" page, which is usually shown only at
-# the end of the installation (successful or not).
----
-# DEPRECATED
-#
-# The finished page can hold a "restart system now" checkbox.
-# If this is false, no checkbox is shown and the system is not restarted
-# when Calamares exits.
-# restartNowEnabled: true
-
-# DEPRECATED
-#
-# Initial state of the checkbox "restart now". Only relevant when the
-# checkbox is shown by restartNowEnabled.
-# restartNowChecked: false
-
-# Behavior of the "restart system now" button.
-#
-# There are four usable values:
-#   - never
-#       Does not show the button and does not restart.
-#       This matches the old behavior with restartNowEnabled=false.
-#   - user-unchecked
-#       Shows the button, defaults to unchecked, restarts if it is checked.
-#       This matches the old behavior with restartNowEnabled=true and restartNowChecked=false.
-#   - user-checked
-#       Shows the button, defaults to checked, restarts if it is checked.
-#       This matches the old behavior with restartNowEnabled=true and restartNowChecked=true.
-#   - always
-#       Shows the button, checked, but the user cannot change it.
-#       This is new behavior.
-#
-# The three combinations of legacy values are still supported.
-restartNowMode: user-unchecked
-
-# If the checkbox is shown, and the checkbox is checked, then when
-# Calamares exits from the finished-page it will run this command.
-# If not set, falls back to "shutdown -r now".
-restartNowCommand: "systemctl -i reboot"
-
-# When the last page is (successfully) reached, send a DBus notification
-# to the desktop that the installation is done. This works only if the
-# user as whom Calamares is run, can reach the regular desktop session bus.
-notifyOnFinished: false
diff --git a/omv-fstab.conf b/omv-fstab.conf
deleted file mode 100644
index d2a08a4..0000000
--- a/omv-fstab.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# For Debian and Debian-based distributions, change the above line to:
-# crypttabOptions: luks,keyscript=/bin/cat
-# Creates /etc/fstab and /etc/crypttab in the target system.
-# Also creates mount points for all the filesystems.
-#
-# When creating fstab entries for a filesystem, this module
-# uses the options for the filesystem type to write to the
-# options field of the file.
----
-# Mount options to use for all filesystems. If a specific filesystem
-# is listed here, use those options, otherwise use the *default*
-# options from this mapping.
-mountOptions:
-    default: defaults,noatime
-    ext4: defaults,noatime
-    btrfs: defaults,noatime,space_cache,autodefrag
-
-# Mount options to use for the EFI System Partition. If not defined, the
-# *mountOptions* for *vfat* are used, or if that is not set either,
-# *default* from *mountOptions*.
-efiMountOptions: umask=0077
-
-# If a filesystem is on an SSD, add the following options. If a specific
-# filesystem is listed here, use those options, otherwise no additional
-# options are set (i.e. there is no *default* like in *mountOptions*).
-ssdExtraMountOptions:
-    ext4: discard
-    f2fs: discard
-    jfs: discard
-    xfs: discard
-    swap: discard
-    btrfs: discard,compress=lzo
-
-# Additional options added to each line in /etc/crypttab
-crypttabOptions: luks
-# For Debian and Debian-based distributions, change the above line to:
-# crypttabOptions: luks,keyscript=/bin/cat
diff --git a/omv-grubcfg.conf b/omv-grubcfg.conf
deleted file mode 100644
index 09a1c9c..0000000
--- a/omv-grubcfg.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# Create, overwrite or update /etc/default/grub in the target system.
-#
-# Write lines to /etc/default/grub (in the target system) based
-# on calculated values and the values set in the *defaults* key
-# in this configuration file.
-#
-# Calculated values are:
-#   - GRUB_DISTRIBUTOR,   branding module, *bootloaderEntryName* (this
-#     string is sanitized, and see also setting *keepDistributor*)
-#   - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems
-#     that use LUKS
-#   - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth
-#     support to the kernel.
-
----
-# If set to true, always creates /etc/default/grub from scratch even if the file
-# already existed. If set to false, edits the existing file instead.
-overwrite: false
-
-# If set to true, an **existing** setting for GRUB_DISTRIBUTOR is
-# kept, not updated to the *bootloaderEntryName* from the branding file.
-# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in
-# some way (e.g. uses shell-command substitution).
-keepDistributor: false
-
-# Default entries to write to /etc/default/grub if it does not exist yet or if
-# we are overwriting it.
-#
-defaults:
-    GRUB_TIMEOUT: 10
-    GRUB_DEFAULT: "saved"
-    GRUB_DISABLE_SUBMENU: true
-    GRUB_GFXPAYLOAD: "keep"
-    GRUB_GFXMODE: "1680x1050,1360x786,1280x800,1024x768,1024x600,800x600,640x480"
-    GRUB_CMDLINE_LINUX_DEFAULT: " rw quiet splash=silent logo.nologo acpi_backlight=vendor audit=0 scsi_mod.use_blk_mq=1 dm_mod.use_blk_mq=1 rd.loglevel=0 rd.systemd.show_status=false rd.udev.log-priority=0 systemd.show_status=auto loglevel=3 udev.log-priority=0 vt.global_cursor_default=0 i915.fastboot=1"
-    GRUB_CMDLINE_LINUX_RECOVERY: " failsafe nomodest xdriver=vesa vga=788 acpi_backlight=vendor systemd.log_level=debug systemd.log_target=kmsg log_buf_len=1M audit=0 "
-    GRUB_DISABLE_VENDOR_CONF: false
-    GRUB_THEME: "/boot/grub2/themes/OpenMandriva/theme.txt"
-    GRUB_BACKGROUND: "/boot/grub2/themes/OpenMandriva/terminal_background.png"
-    GRUB_DISTRIBUTOR: "OpenMandriva Lx"
-    GRUB_TERMINAL_OUTPUT: "console"
-    GRUB_DISABLE_RECOVERY: true
diff --git a/omv-keyboard.conf b/omv-keyboard.conf
deleted file mode 100644
index 7925969..0000000
--- a/omv-keyboard.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# NOTE: you must have ckbcomp installed and runnable
-#       on the live system, for keyboard layout previews.
----
-# The name of the file to write X11 keyboard settings to
-# The default value is the name used by upstream systemd-localed.
-# Relative paths are assumed to be relative to /etc/X11/xorg.conf.d
-xOrgConfFileName: "/etc/X11/xorg.conf.d/00-keyboard.conf"
-
-# The path to search for keymaps converted from X11 to kbd format
-# Leave this empty if the setting does not make sense on your distribution.
-convertedKeymapPath: "/lib/kbd/keymaps/xkb"
-
-# Write keymap configuration to /etc/default/keyboard, usually
-# found on Debian-related systems.
-# Defaults to true if nothing is set.
-#writeEtcDefaultKeyboard: true
diff --git a/omv-locale.conf b/omv-locale.conf
deleted file mode 100644
index cde391a..0000000
--- a/omv-locale.conf
+++ /dev/null
@@ -1,97 +0,0 @@
----
-# This settings are used to set your default system time zone.
-# Time zones are usually located under /usr/share/zoneinfo and
-# provided by the 'tzdata' package of your Distribution.
-#
-# Distributions using systemd can list available
-# time zones by using the timedatectl command.
-#    timedatectl list-timezones
-#
-# The starting timezone (e.g. the pin-on-the-map) when entering
-# the locale page can be set through keys *region* and *zone*.
-# If either is not set, defaults to America/New_York.
-#
-region:                     "Europe"
-zone:                       "London"
-
-
-# System locales are detected in the following order:
-#
-#  - /usr/share/i18n/SUPPORTED
-#  - localeGenPath (defaults to /etc/locale.gen if not set)
-#  - 'locale -a' output
-#
-# Enable only when your Distribution is using an
-# custom path for locale.gen
-#
-#localeGenPath:             "PATH_TO/locale.gen"
-
-# GeoIP based Language settings: Leave commented out to disable GeoIP.
-#
-# GeoIP needs a working Internet connection.
-# This can be managed from `welcome.conf` by adding
-# internet to the list of required conditions.
-#
-# The configuration
-# is in three parts: a *style*, which can be "json" or "xml"
-# depending on the kind of data returned by the service, and
-# a *url* where the data is retrieved, and an optional *selector*
-# to pick the right field out of the returned data (e.g. field
-# name in JSON or element name in XML).
-#
-# The default selector (when the setting is blank) is picked to
-# work with existing JSON providers (which use "time_zone") and
-# Ubiquity's XML providers (which use "TimeZone").
-#
-# If the service configured via *url* uses
-# a different attribute name (e.g. "timezone") in JSON or a
-# different element tag (e.g. "<Time_Zone>") in XML, set this
-# string to the name or tag to be used.
-#
-# In JSON:
-#  - if the string contains "." characters, this is used as a
-#    multi-level selector, e.g. "a.b" will select the timezone
-#    from data "{a: {b: "Europe/Amsterdam" } }".
-#  - each part of the string split by "." characters is used as
-#    a key into the JSON data.
-# In XML:
-#  - all elements with the named tag (e.g. all TimeZone) elements
-#    from the document are checked; the first one with non-empty
-#    text value is used.
-#
-#
-# An HTTP(S) request is made to *url*. The request should return
-# valid data in a suitable format, depending on *style*;
-# generally this includes a string value with the timezone
-# in <region>/<zone> format. For services that return data which
-# does not follow the conventions of "suitable data" described
-# below, *selector* may be used to pick different data.
-#
-# Note that this example URL works, but the service is shutting
-# down in June 2018.
-#
-# Suitable JSON data looks like
-# ```
-#    {"time_zone":"America/New_York"}
-# ```
-# Suitable XML data looks like
-# ```
-#    <Response><TimeZone>Europe/Brussels</TimeZone></Response>
-# ```
-#
-# To accommodate providers of GeoIP timezone data with peculiar timezone
-# naming conventions, the following cleanups are performed automatically:
-#  - backslashes are removed
-#  - spaces are replaced with _
-#
-# Legacy settings "geoipStyle", "geoipUrl" and "geoipSelector"
-# in the top-level are still supported, but I'd advise against.
-#
-# To disable GeoIP checking, either comment-out the entire geoip section,
-# or set the *style* key to an unsupported format (e.g. `none`).
-# Also, note the analogous feature in src/modules/welcome/welcome.conf.
-#
-geoip:
-    style:    "json"
-    url:      "https://geoip.kde.org/v1/calamares"
-    selector: "timezone"
diff --git a/omv-machineid.conf b/omv-machineid.conf
deleted file mode 100644
index e7672f2..0000000
--- a/omv-machineid.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# Machine-ID and other random data on the target system.
-#
-# This module can create a number of "random" things on the target:
-#  - a systemd machine-id file (hence the name of the Calamares module)
-#    with a random UUID.
-#  - a dbus machine-id file (or, optionally, link to the one from systemd)
-#  - an entropy file
-#
----
-# Whether to create /etc/machine-id for systemd.
-systemd: true
-
-# Whether to create /var/lib/dbus/machine-id for D-Bus.
-dbus: true
-# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
-# (ignored if dbus is false, or if there is no /etc/machine-id to point to).
-dbus-symlink: true
-# this is a deprecated form of *dbus-symlink*
-symlink: true
-
-# Whether to create an entropy file
-entropy: true
-# Whether to copy entropy from the host
-entropy-copy: true
diff --git a/omv-mount.conf b/omv-mount.conf
deleted file mode 100644
index d8f8fb8..0000000
--- a/omv-mount.conf
+++ /dev/null
@@ -1,22 +0,0 @@
----
-extraMounts:
-    - device: proc
-      fs: proc
-      mountPoint: /proc
-    - device: sys
-      fs: sysfs
-      mountPoint: /sys
-    - device: /dev
-      mountPoint: /dev
-      options: bind
-    - device: tmpfs
-      fs: tmpfs
-      mountPoint: /run
-    - device: /run/udev
-      mountPoint: /run/udev
-      options: bind
-
-extraMountsEfi:
-    - device: efivarfs
-      fs: efivarfs
-      mountPoint: /sys/firmware/efi/efivars
diff --git a/omv-packages.conf b/omv-packages.conf
deleted file mode 100644
index 434dd31..0000000
--- a/omv-packages.conf
+++ /dev/null
@@ -1,149 +0,0 @@
----
-#
-# Which package manager to use, options are:
-#  - packagekit  - PackageKit CLI tool
-#  - zypp        - Zypp RPM frontend
-#  - yum         - Yum RPM frontend
-#  - dnf         - DNF, the new RPM frontend
-#  - urpmi       - Mandriva package manager
-#  - apt         - APT frontend for DEB and RPM
-#  - pacman      - Pacman
-#  - portage     - Gentoo package manager
-#  - entropy     - Sabayon package manager
-#  - dummy       - Dummy manager, only logs
-#
-backend: dnf
-
-#
-# Often package installation needs an internet connection.
-# Since you may allow system installation without a connection
-# and want to offer OPTIONAL package installation, it's
-# possible to have no internet, yet have this packages module
-# enabled in settings.
-#
-# You can skip the whole module when there is no internet
-# by setting "skip_if_no_internet" to true.
-#
-# You can run a package-manager specific update procedure
-# before installing packages (for instance, to update the
-# list of packages and dependencies); this is done only if there
-# is an internet connection.
-#
-# Set "update_db" to 'true' for refreshing the database on the
-# target system. On target installations, which got installed by
-# unsquashing, a full system update may be needed. Otherwise 
-# post-installing additional packages may result in conflicts.
-# Therefore set also "update_system" to 'true'. 
-#
-
-# (crazy) as long we do use 'rsync' all these need stay false.
-# remove does not need internet to work, we cannot do an full
-# sync on the live iso will error out.
-skip_if_no_internet: false
-update_db: false
-update_system: false
-
-#
-# List of maps with package operations such as install or remove.
-# Distro developers can provide a list of packages to remove
-# from the installed system (for instance packages meant only
-# for the live system).
-#
-# A job implementing a distro specific logic to determine other
-# packages that need to be installed or removed can run before
-# this one. Distro developers may want to install locale packages
-# or remove drivers not needed on the installed system.
-# Such a job would populate a list of dictionaries in the global
-# storage called "packageOperations" and that list is processed
-# after the static list in the job configuration (i.e. the list
-# that is in this configuration file).
-#
-# Allowed package operations are:
-#  - install, try_install: will call the package manager to
-#       install one or more packages. The install target will
-#       abort the whole installation if package-installation
-#       fails, while try_install carries on. Packages may be
-#       listed as (localized) names, or as (localized) package-data.
-#       See below for the description of the format.
-# - localInstall: this is used to call the package manager
-#       to install a package from a path-to-a-package. This is
-#       useful if you have a static package archive on the install media.
-# - remove, try_remove: will call the package manager to
-#       remove one or more packages. The remove target will
-#       abort the whole installation if package-removal fails,
-#       while try_remove carries on. Packages may be listed as
-#       (localized) names.
-#
-# There are two formats for naming packages: as a name or as package-data,
-# which is an object notation providing package-name, as well as pre- and
-# post-install scripts.
-#
-# Here are both formats, for installing vi. The first one just names the
-# package for vi (using the naming of the installed package manager), while
-# the second contains three data-items; the pre-script is run before invoking
-# the package manager, and the post-script runs once it is done.
-#
-# - install
-#   - vi
-#   - package: vi
-#     pre-script: touch /tmp/installing-vi
-#     post-script: rm -f /tmp/installing-vi
-#
-# The pre- and post-scripts are optional, but you cannot leave both out: using
-# "package: vi" with neither script option will trick Calamares into
-# trying to install a package named "package: vi", which is unlikely to work.
-#
-# Any package name may be localized; this is used to install localization
-# packages for software based on the selected system locale. By including
-# the string LOCALE in the package name, the following happens:
-#
-# - if the system locale is English (any variety), then the package is not
-#   installed at all,
-# - otherwise $LOCALE or ${LOCALE} is replaced by the 'lower-cased' BCP47
-#   name of the 'language' part of the selected system locale (not the
-#   country/region/dialect part), e.g. selecting "nl_BE" will use "nl"
-#   here.
-#
-# Take care that just plain LOCALE will not be replaced, so foo-LOCALE will
-# be left unchanged, while foo-$LOCALE will be changed. However, foo-LOCALE
-# 'will' be removed from the list of packages, if English is selected.
-#
-# The following installs localizations for vi, if they are relevant; if
-# there is no localization, installation continues normally.
-#
-# - install
-#   - vi-$LOCALE
-#   - package: vi-${LOCALE}
-#     pre-script: touch /tmp/installing-vi
-#     post-script: rm -f /tmp/installing-vi
-#
-# When installing packages, Calamares will invoke the package manager
-# with a list of package names if it can; package-data prevents this because
-# of the scripts that need to run. In other words, this:
-#
-# - install:
-#   - vi
-#   - binutils
-#   - package: wget
-#     pre-script: touch /tmp/installing-wget
-#
-# This will invoke the package manager three times, once for each package,
-# because not all of them are simple package names. You can speed up the
-# process if you have only a few pre-scripts, by using multiple install targets:
-#
-# - install:
-#   - vi
-#   - binutils
-# - install:
-#   - package: wget
-#     pre-script: touch /tmp/installing-wget
-#
-# This will call the package manager once with the package-names "vi" and
-# "binutils", and then a second time for "wget". When installing large numbers
-# of packages, this can lead to a considerable time savings.
-#
-operations:
-  - remove:
-      - calamares
-#     - console-setup
-      - squashfs-tools
diff --git a/omv-partition.conf b/omv-partition.conf
deleted file mode 100644
index 323295b..0000000
--- a/omv-partition.conf
+++ /dev/null
@@ -1,114 +0,0 @@
-# This setting specifies the mount point of the EFI system partition. Some
-# distributions (Fedora, Debian, Manjaro, etc.) use /boot/efi, others (KaOS,
-# etc.) use just /boot.
-efiSystemPartition:     "/boot/efi"
-
-# This optional setting specifies the size of the EFI system partition.
-# If nothing is specified, the default size of 300MiB will be used.
-# efiSystemPartitionSize:     300M
-
-# In autogenerated partitioning, allow the user to select a swap size?
-# If there is exactly one choice, no UI is presented, and the user
-# cannot make a choice -- this setting is used. If there is more than
-# one choice, a UI is presented.
-#
-# Legacy settings *neverCreateSwap* and *ensureSuspendToDisk* correspond
-# to values of *userSwapChoices* as follows:
-#    - *neverCreateSwap* is true, means [none]
-#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is false, [small]
-#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is true, [suspend]
-#
-# Autogenerated swap sizes are as follows:
-#    - *suspend*: Swap is always at least total memory size,
-#      and up to 4GiB RAM follows the rule-of-thumb 2 * memory;
-#      from 4GiB to 8 GiB it stays steady at 8GiB, and over 8 GiB memory
-#      swap is the size of main memory.
-#    - *small*: Follows the rules above, but Swap is at
-#      most 8GiB, and no more than 10% of available disk.
-# In both cases, a fudge factor (usually 10% extra) is applied so that there
-# is some space for administrative overhead (e.g. 8 GiB swap will allocate
-# 8.8GiB on disk in the end).
-userSwapChoices:
-    - none      # Create no swap, use no swap
-    #- reuse     # Re-use existing swap, but don't create any
-    - small     # Up to 4GB
-    - suspend   # At least main memory size
-    # - file      # To swap file instead of partition (unsupported right now)
-
-# LEGACY SETTINGS (these will generate a warning)
-# ensureSuspendToDisk:    true
-# neverCreateSwap:        false
-
-# Correctly draw nested (e.g. logical) partitions as such.
-drawNestedPartitions:   false
-
-# Show/hide partition labels on manual partitioning page.
-alwaysShowPartitionLabels: true
-
-# Default filesystem type, pre-selected in the "Create Partition" dialog.
-# The filesystem type selected here is also used for automated install
-# modes (Erase, Replace and Alongside).
-# Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs
-# If nothing is specified, Calamares defaults to "ext4".
-defaultFileSystemType:  "ext4"
-
-# Show/hide LUKS related functionality in automated partitioning modes.
-# Disable this if you choose not to deploy early unlocking support in GRUB2
-# and/or your distribution's initramfs solution.
-#
-# BIG FAT WARNING:
-#
-# This option is unsupported, as it cuts out a crucial security feature.
-# Disabling LUKS and shipping Calamares without a correctly configured GRUB2
-# and initramfs is considered suboptimal use of the Calamares software. The
-# Calamares team will not provide user support for any potential issue that
-# may arise as a consequence of setting this option to false.
-# It is strongly recommended that system integrators put in the work to support
-# LUKS unlocking support in GRUB2 and initramfs/dracut/mkinitcpio/etc.
-# Support is offered to system integrators that wish to do so, through the
-# Calamares bug tracker, as well as in #calamares on Freenode.
-# For more information on setting up GRUB2 for Calamares with LUKS, see
-# https://github.com/calamares/calamares/wiki/LUKS-Deployment
-#
-# If nothing is specified, LUKS is enabled in automated modes.
-#enableLuksAutomatedPartitioning:    true
-
-# Allow manual partitioning.
-#
-# When set to false, this option hides the "Manual partitioning" button,
-# limiting the user's choice to "Erase", "Replace" or "Alongside".
-# This can be useful when using a custom partition layout we don't want
-# the user to modify.
-#
-# If nothing is specified, manual partitioning is enabled.
-#allowManualPartitioning:   true
-
-# To apply a custom partition layout, it has to be defined this way :
-#
-# partitionLayout:
-#     - name: "rootfs"
-#       filesystem: "ext4"
-#       mountPoint: "/"
-#       size: 20%
-#       minSize: 500M
-#       maxSize: 10G
-#     - name: "home"
-#       filesystem: "ext4"
-#       mountPoint: "/home"
-#       size: 3G
-#       minSize: 1.5G
-#     - name: "data"
-#       filesystem: "fat32"
-#       mountPoint: "/data"
-#       size: 100%
-#
-# There can be any number of partitions, each entry having the following attributes:
-#   - name: partition label
-#   - filesystem: filesystem type
-#   - mountPoint: partition mount point
-#   - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB)
-#           or
-#           % of the available drive space if a '%' is appended to the value
-#   - minSize: minimum partition size (optional parameter)
-#   - maxSize: maximum partition size (optional parameter)
-
diff --git a/omv-removeuser.conf b/omv-removeuser.conf
deleted file mode 100644
index a59961e..0000000
--- a/omv-removeuser.conf
+++ /dev/null
@@ -1,2 +0,0 @@
----
-username: live
diff --git a/omv-services-systemd.conf b/omv-services-systemd.conf
deleted file mode 100644
index 679b862..0000000
--- a/omv-services-systemd.conf
+++ /dev/null
@@ -1,182 +0,0 @@
-# Systemd services manipulation.
-#
-# This module can enable services and targets for systemd
-# (if packaging doesn't already do that). It can calso
-# disable services (but not targets).
-#
-# First, services are enabled; then targets; then services
-# are disabled -- this order of operations is fixed.
----
-
-# There are three configuration keys for this module:
-# *services*, *targets* and *disable*. The value of each
-# key is a list of entries. Each entry has two keys:
-#   - *name* is the (string) name of the service or target that is being
-#     changed. Use quotes. Don't include ".target" or ".service"
-#     in the name.
-#   - *mandatory* is a boolean option, which states whether the change
-#     must be done successfully. If systemd reports an error while changing
-#     a mandatory entry, the installation will fail. When mandatory is false,
-#     errors for that entry (service or target) are ignored. If mandatory
-#     is not specified, the default is false.
-#
-# An entry may also be given as a single string, which is then
-# interpreted as the name of the service. In this case, mandatory
-# is also set to the default of false.
-#
-# Use [] to express an empty list.
-
-# # This example enables NetworkManager (and fails if it can't),
-# # disables cups (and ignores failure). Then it enables the
-# # graphical target (e.g. so that SDDM runs for login), and
-# # finally disables pacman-init (an ArchLinux-only service).
-# #
-# # Enables <name>.service
-# services:
-#   - name: "NetworkManager"
-#     mandatory: true
-#   - name: "cups"
-#     mandatory: false
-#
-# # Enables <name>.target
-# targets:
-#   - name: "graphical"
-#     mandatory: true
-#
-# # Disables <name>.service
-# disable:
-#   - name: "pacman-init"
-#     mandatory: false
-#
-# # Disables <name>.target
-# #     .. this shows how to use just the name
-# disable-targets:
-#   - graphical
-#
-# # Masks (stronger version of disable). This section
-# # is unusual because you **must** include the suffix
-# # (e.g. ".service") as part of the name, so, e.g. to mask
-# # NetworkManager (rather than just disable it) you must
-# # specify "NetworkManager.service" as name.
-# mask:
-#  - name: "NetworkManager.service"
-#  - mandatory: true
-
-# By default, no changes are made.
-
-# (crazy) NONE of these are mandatory
-# please to NOT ADD true to any.
-services:
-  - name: "dbus-broker"
-    mandatory: false
-
-  - name: "NetworkManager"
-    mandatory: false
-
-  - name: "cups"
-    mandatory: false
-
-  - name: "sshd"
-    mandatory: false
-
-  - name: "systemd-resolved"
-    mandatory: false
-
-  - name: "systemd-timesyncd"
-    mandatory: false
-
-  - name: "avahi-daemon"
-    mandatory: false
-
-  - name: "ufw"
-    mandatory: false
-
-  - name: "irqbalance"
-    mandatory: false
-
-  - name: "rngd"
-    mandatory: false
-
-  - name: "lvm2-monitor"
-    mandatory: false
-
-  - name: "iptables"
-    mandatory: false
-
-targets:
-  - name: "graphical"
-    mandatory: true
-
-disable:
-# we need disable this too before removing later
-  - name: "calamares-locale"
-    mandatory: false
-# Running systemd-networkd and NetworkManager at the same time
-# is not a good idea.
-# Let's keep using NM by default as long as it's the only one
-# for which we have a GUI config tool
-  - name: "systemd-networkd"
-    mandatory: false
-
-  - name: "nfs-utils"
-    mandatory: false
-
-  - name: "vboxadd"
-    mandatory: false
-
-  - name: "NetworkManager-wait-online"
-    mandatory: false
-
-disable-sockets:
-  - name: "systemd-networkd"
-    mandatory: false
-# ISO sh**
-unmask:
-  - name: "systemd-journald-audit"
-    mandatory: false
-
-sockets:
-  - name: "avahi-daemon"
-    mandatory: false
-
-  - name: "nscd"
-    mandatory: false
-
-  - name: "uuidd"
-    mandatory: false
-
-  - name: "acpid"
-    mandatory: false
-
-  - name: "dbus"
-    mandatory: false
-
-  - name: "cups"
-    mandatory: false
-
-  - name: "dm-event"
-    mandatory: false
-
-  - name: "rpcbind"
-    mandatory: false
-
-timers:
-  - name: "shadow"
-    mandatory: false
-
-  - name: "updatedb"
-    mandatory: false
-
-  - name: "fstrim"
-    mandatory: false
-
-  - name: "man-db"
-    mandatory: false
-
-  - name: "dnf-makecache"
-    mandatory: false
-
-mask: []
-disable-targets: []
-disable-timers: []
-unmask: []
diff --git a/omv-settings.conf b/omv-settings.conf
deleted file mode 100644
index 5f1684e..0000000
--- a/omv-settings.conf
+++ /dev/null
@@ -1,147 +0,0 @@
-# Configuration file for Calamares
-# Syntax is YAML 1.2
----
-# Modules can be job modules (with different interfaces) and QtWidgets view modules.
-# They could all be placed in a number of different paths.
-# "modules-search" is a list of strings, each of these can either be a full path to a
-# directory or the keyword "local".
-# "local" means LIBDIR/calamares/modules with settings in SHARE/calamares/modules or
-# /etc/calamares/modules.
-# YAML: list of strings.
-modules-search: [ local ]
-
-# Instances section. This section is optional, and it defines custom instances for
-# modules of any kind. An instance entry has an instance name, a module name, and
-# a configuration file name.
-# The primary goal of this mechanism is to allow loading multiple instances of the
-# same module, with different configuration. If you don't need this, the instances
-# section can safely be left empty.
-# Module name plus instance name makes an instance key, e.g. "webview@owncloud",
-# where "webview" is the module name (for the webview viewmodule) and "owncloud"
-# is the instance name, which loads a configuration file named "owncloud.conf" from
-# any of the configuration file paths, including the webview module directory.
-# This instance key can then be referenced in the sequence section.
-# For all modules without a custom instance specification, a default instance is
-# generated automatically by Calamares. Therefore a statement such as "webview" in
-# the sequence section automatically implies an instance key of "webview@webview"
-# even without explicitly defining this instance, and the configuration file for
-# this default instance "<modulename>@<modulename>" is always assumed to be
-# "<modulename>.conf".
-# For more information on running module instances, run Calamares in debug mode
-# and check the Modules page in the Debug information interface.
-# YAML: list of maps of string:string key-value pairs.
-
-#instances:
-#- id:       owncloud
-#  module:   webview
-#  config:   owncloud.conf
-
-# Sequence section. This section describes the sequence of modules, both
-# viewmodules and jobmodules, as they should appear and/or run.
-# A jobmodule instance key (or name) can only appear in an exec phase, whereas
-# a viewmodule instance key (or name) can appear in both exec and show phases.
-# There is no limit to the number of show or exec phases. However, the same module
-# instance key should not appear more than once per phase, and deployers should
-# take notice that the global storage structure is persistent throughout the
-# application lifetime, possibly influencing behavior across phases.
-# A show phase defines a sequence of viewmodules (and therefore pages). These
-# viewmodules can offer up jobs for the execution queue.
-# An exec phase displays a progress page (with brandable slideshow). This progress
-# page iterates over the modules listed in the *immediately preceding* show phase,
-# and enqueues their jobs, as well as any other jobs from jobmodules, in the order
-# defined in the current exec phase.
-# It then executes the job queue and clears it. If a viewmodule offers up a job
-# for execution, but the module name (or instance key) isn't listed in the
-# immediately following exec phase, this job will not be executed.
-# WARNING: when upgrading from Calamares 1.1, this section requires manual
-# intervention. There are no fixed prepare/install/postinstall phases any more,
-# and all limitations on the number of phases, number of pages, and number of
-# instances are lifted.
-# YAML: list of lists of strings.
-sequence:
-- show:
-  - welcome
-  - locale
-  - keyboard
-  - partition
-  - users
-  - summary
-- exec:
-  - partition
-  - mount
-  - unpackfs
-  - machineid
-  - fstab
-  - locale
-  - keyboard
-  - localecfg
-  - luksbootkeyfile
-  - dracutlukscfg
-  - users
-  - removeuser
-  - displaymanager
-  - networkcfg
-  - hwclock
-  - services-systemd
-  - dracut
-  - grubcfg
-  - bootloader
-  - shellprocess
-  - packages
-  - umount
-- show:
-  - finished
-
-# A branding component is a directory, either in SHARE/calamares/branding or in
-# /etc/calamares/branding (the latter takes precedence). The directory must contain a
-# YAML file branding.desc which may reference additional resources (such as images) as
-# paths relative to the current directory.
-# A branding component can also ship a QML slideshow for execution pages, along with
-# translation files.
-# Only the name of the branding component (directory) should be specified here, Calamares
-# then takes care of finding it and loading the contents.
-# YAML: string.
-branding: auto
-
-# If this is set to true, Calamares will show an "Are you sure?" prompt right before
-# each execution phase, i.e. at points of no return. If this is set to false, no prompt
-# is shown.
-# Default is false.
-# YAML: boolean.
-prompt-install: true
-
-# If this is set to true, Calamares will execute all target environment commands in the
-# current environment, without chroot. This setting is considered experimental, and it
-# should only be used when setting up Calamares as a post-install configuration tool, as
-# opposed to a full operating system installer.
-# Some official Calamares modules are not expected to function with this setting.
-# Packagers beware, here be dragons.
-# Default is false.
-# YAML: boolean.
-dont-chroot: false
-
-# If this is set to true, Calamares refers to itself as a "setup program"
-# rather than an "installer". Defaults to the value of dont-chroot, but
-# Calamares will complain if this is not explicitly set.
-# oem-setup: true
-
-# If this is set to true, the "Cancel" button will be disabled entirely.
-# The button is also hidden from view.
-#
-# This can be useful if when e.g. Calamares is used as a post-install 
-# configuration tool and you require the user to go through all the 
-# configuration steps.
-#
-# Default is false, but Calamares will complain if this is not explicitly set.
-#
-# YAML: boolean.
-disable-cancel: false
-
-# If this is set to true, the "Cancel" button will be disabled once
-# you start the 'Installation', meaning there won't be a way to cancel
-# the Installation until it has finished or installation has failed.
-#
-# Default is false, but Calamares will complain if this is not explicitly set.
-#
-# YAML: boolean.
-disable-cancel-during-exec: false
diff --git a/omv-shellprocess.conf b/omv-shellprocess.conf
deleted file mode 100644
index 793ca14..0000000
--- a/omv-shellprocess.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# Configuration for the shell process job.
-#
-# Executes a list of commands found under the key *script*.
-# If the top-level key *dontChroot* is true, then the commands
-# are executed in the context of the live system, otherwise
-# in the context of the target system. In all of the commands,
-# the following substitutions will take place:
-#  - `@@ROOT@@` is replaced by the root mount point of the **target**
-#    system from the point of view of the command (for chrooted
-#    commands, that will be */*).
-#  - `@@USER@@` is replaced by the username, set on the user page.
-#
-# The (global) timeout for the command list can be set with
-# the *timeout* key. The value is a time in seconds, default
-# is 10 seconds if not set.
-#
-# If a command starts with "-" (a single minus sign), then the
-# return value of the command following the - is ignored; otherwise,
-# a failing command will abort the installation. This is much like
-# make's use of - in a command.
-#
-# The value of *script* may be:
-#   - a single string; this is one command that is executed.
-#   - a list of strings; these are executed one at a time, by
-#     separate shells (/bin/sh -c is invoked for each command).
-#   - an object, specifying a key *command* and (optionally)
-#     a key *timeout* to set the timeout for this specific
-#     command differently from the global setting.
----
-dontChroot: false
-timeout: 10
-script:
-    - command: "/usr/sbin/calamares-post-script"
-      timeout: 180
diff --git a/omv-umount.conf b/omv-umount.conf
deleted file mode 100644
index 0e6d0d2..0000000
--- a/omv-umount.conf
+++ /dev/null
@@ -1,3 +0,0 @@
----
-srcLog:      "/root/.cache/calamares/session.log"
-destLog:     "/var/log/calamares-installation.log"
diff --git a/omv-unpackfs.conf b/omv-unpackfs.conf
deleted file mode 100644
index 2adb1d2..0000000
--- a/omv-unpackfs.conf
+++ /dev/null
@@ -1,5 +0,0 @@
----
-unpack:
-    -   source: "/run/initramfs/omdv/LiveOS/squashfs.img"
-        sourcefs: "squashfs"
-        destination: ""
diff --git a/omv-users.conf b/omv-users.conf
deleted file mode 100644
index 12ed9c3..0000000
--- a/omv-users.conf
+++ /dev/null
@@ -1,71 +0,0 @@
----
-defaultGroups:
-    - users
-    - lp
-    - lpadmin
-    - video
-    - network
-    - storage
-    - wheel
-    - audio
-    - sambashare
-# (crazy) NOTE: lp group changed meaning , blame Apple for that.
-# first user need be in lpadmin group to be able to do anything with
-# the cups setup from any GUI apps.
-
-autologinGroup:  autologin
-doAutologin:     false
-sudoersGroup:    wheel
-setRootPassword: true
-doReusePassword: false
-
-# These are optional password-requirements that a distro can enforce
-# on the user. The values given in this sample file disable each check,
-# as if the check was not listed at all.
-#
-# Checks may be listed multiple times; each is checked separately,
-# and no effort is done to ensure that the checks are consistent
-# (e.g. specifying a maximum length less than the minimum length
-# will annoy users).
-#
-# (additional checks may be implemented in UsersPage.cpp)
-passwordRequirements:
-    minLength: -1  # Password at least this many characters
-    maxLength: -1 # Password at most this many characters
-#    libpwquality:
-#        - minlen=0
-#        - minclass=0
-
-# You can control the visibility of the 'strong passwords' checkbox here.
-# Possible values are: 
-#  - true to show or 
-#  - false to hide  (default)
-# the checkbox. This checkbox allows the user to choose to disable
-# password-strength-checks. By default the box is **hidden**, so
-# that you have to pick a password that satisfies the checks.
-allowWeakPasswords: false
-# You can control the initial state for the 'strong passwords' checkbox here.
-# Possible values are: 
-#  - true to uncheck or 
-#  - false to check (default)
-# the checkbox by default. Since the box is labeled to enforce strong
-# passwords, in order to **allow** weak ones by default, the box needs
-# to be unchecked.
-allowWeakPasswordsDefault: false
-
-# (crazy) FIXME: add UI options  for that
-userShell: /bin/bash
-
-# Hostname setting
-#
-# The user can enter a hostname; this is configured into the system
-# in some way; pick one of:
-#   - *None*, to not set the hostname at all
-#   - *EtcFile*, to write to `/etc/hostname` directly
-#   - *Hostnamed*, to use systemd hostnamed(1) over DBus
-# The default is *EtcFile*.
-setHostname: EtcFile
-
-# Should /etc/hosts be written with a hostname for this machine
-# (also adds localhost and some ipv6 standard entries).
-writeHostsFile: true
diff --git a/omv-webview.conf b/omv-webview.conf
deleted file mode 100644
index eae02c8..0000000
--- a/omv-webview.conf
+++ /dev/null
@@ -1,3 +0,0 @@
----
-prettyName: "OpenMandriva Lx"
-url:        "https://www.openmandriva.org"
diff --git a/omv-welcome.conf b/omv-welcome.conf
deleted file mode 100644
index e4417d0..0000000
--- a/omv-welcome.conf
+++ /dev/null
@@ -1,50 +0,0 @@
----
-showSupportUrl:         true
-showKnownIssuesUrl:     true
-showReleaseNotesUrl:    true
-showDonateUrl:          https://liberapay.com/OpenMandriva/donate
-
-requirements:
-    requiredStorage:    8.0
-    requiredRam:        2.0
-    internetCheckUrl:   http://google.com
-    check:
-        - storage
-        - ram
-        - power
-        - internet
-        - root
-    required:
-        - storage
-        - ram
-        - root
-
-# GeoIP checking
-#
-# This can be used to pre-select a language based on the country
-# the user is currently in. It *assumes* that there's internet
-# connectivity, though. Configuration is like in the locale module,
-# but remember to use a URL that returns full data **and** to
-# use a selector that will pick the country, not the timezone.
-#
-# To disable GeoIP checking, either comment-out the entire geoip section,
-# or set the *style* key to an unsupported format (e.g. `none`).
-# Also, note the analogous feature in src/modules/locale/locale.conf.
-#
-geoip:
-    style:    "none"
-    url:      "https://geoip.kde.org/v1/ubiquity"  # extended XML format
-    selector: "CountryCode"  # blank uses default, which is wrong
-
-# User interface
-#
-# The "select language" icon is an international standard, but it
-# might not theme very well with your desktop environment.
-# Fill in an icon name (following FreeDesktop standards) to
-# use that named icon instead of the usual one.
-#
-# Leave blank or unset to use the international standard.
-#
-# Known icons in this space are "set-language" and "config-language".
-#
-# languageIcon: set-language
diff --git a/openmandriva-install.svg b/openmandriva-install.svg
deleted file mode 100644
index fb10bf3..0000000
--- a/openmandriva-install.svg
+++ /dev/null
@@ -1,1122 +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="128"
-   height="128"
-   id="svg10026"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Nuovo documento 12">
-  <defs
-     id="defs10028">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id12"
-       id="linearGradient7551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,250.68063,453.71002)"
-       x1="63.493301"
-       y1="67.754799"
-       x2="62.999599"
-       y2="44.590698" />
-    <linearGradient
-       y2="44.590698"
-       x2="62.999599"
-       y1="67.754799"
-       x1="63.493301"
-       gradientUnits="userSpaceOnUse"
-       id="id12">
-      <stop
-         id="stop7012"
-         style="stop-color:#E4E4E4"
-         offset="0" />
-      <stop
-         id="stop7014"
-         style="stop-color:white"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id4"
-       id="linearGradient7553"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,250.68063,453.71002)"
-       x1="62.463402"
-       y1="55.033001"
-       x2="62.201199"
-       y2="71.463501" />
-    <linearGradient
-       y2="71.463501"
-       x2="62.201199"
-       y1="55.033001"
-       x1="62.463402"
-       gradientUnits="userSpaceOnUse"
-       id="id4">
-      <stop
-         id="stop6972"
-         style="stop-color:#A0A0A0"
-         offset="0" />
-      <stop
-         id="stop6974"
-         style="stop-color:white"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id6"
-       id="linearGradient7555"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,250.68063,453.71002)"
-       x1="63.351601"
-       y1="7.0760698"
-       x2="61.313"
-       y2="119.419" />
-    <linearGradient
-       y2="119.419"
-       x2="61.313"
-       y1="7.0760698"
-       x1="63.351601"
-       gradientUnits="userSpaceOnUse"
-       id="id6">
-      <stop
-         id="stop6982"
-         style="stop-color:#CCCCCC"
-         offset="0" />
-      <stop
-         id="stop6984"
-         style="stop-color:#999999"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id10"
-       id="linearGradient7557"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,250.68063,453.71002)"
-       x1="54.8251"
-       y1="51.1991"
-       x2="68.8284"
-       y2="117.157" />
-    <linearGradient
-       y2="117.157"
-       x2="68.8284"
-       y1="51.1991"
-       x1="54.8251"
-       gradientUnits="userSpaceOnUse"
-       id="id10">
-      <stop
-         id="stop7002"
-         style="stop-color:#191919"
-         offset="0" />
-      <stop
-         id="stop7004"
-         style="stop-color:#999999"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id1"
-       id="linearGradient7559"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,250.68063,453.71002)"
-       x1="53.189201"
-       y1="46.337601"
-       x2="54.124699"
-       y2="84.764" />
-    <linearGradient
-       y2="84.764"
-       x2="54.124699"
-       y1="46.337601"
-       x1="53.189201"
-       gradientUnits="userSpaceOnUse"
-       id="id1">
-      <stop
-         id="stop6955"
-         style="stop-color:#A2C849"
-         offset="0" />
-      <stop
-         id="stop6957"
-         style="stop-color:#A8CE52"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id2"
-       id="linearGradient7561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,250.68063,453.71002)"
-       x1="53.810501"
-       y1="86.756599"
-       x2="54.098701"
-       y2="54.747101" />
-    <linearGradient
-       y2="54.747101"
-       x2="54.098701"
-       y1="86.756599"
-       x1="53.810501"
-       gradientUnits="userSpaceOnUse"
-       id="id2">
-      <stop
-         id="stop6960"
-         style="stop-color:#EAFFB5"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#E3FF9C"
-         offset="0.368627" />
-      <stop
-         id="stop6964"
-         style="stop-color:#A8CE52"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id8"
-       id="linearGradient7563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,250.68063,453.71002)"
-       x1="44.393501"
-       y1="109.292"
-       x2="60.147202"
-       y2="29.469999" />
-    <linearGradient
-       y2="29.469999"
-       x2="60.147202"
-       y1="109.292"
-       x1="44.393501"
-       gradientUnits="userSpaceOnUse"
-       id="id8">
-      <stop
-         id="stop6992"
-         style="stop-color:#7C9E2E"
-         offset="0" />
-      <stop
-         id="stop6994"
-         style="stop-color:#BBDD6A"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id6"
-       id="linearGradient11999"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-       x1="63.351601"
-       y1="7.0760698"
-       x2="61.313"
-       y2="119.419" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id12"
-       id="linearGradient12001"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-       x1="63.493301"
-       y1="67.754799"
-       x2="62.999599"
-       y2="44.590698" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id4"
-       id="linearGradient12003"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-       x1="62.463402"
-       y1="55.033001"
-       x2="62.201199"
-       y2="71.463501" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id10"
-       id="linearGradient12005"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-       x1="54.8251"
-       y1="51.1991"
-       x2="68.8284"
-       y2="117.157" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id1"
-       id="linearGradient12007"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-       x1="53.189201"
-       y1="46.337601"
-       x2="54.124699"
-       y2="84.764" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id2"
-       id="linearGradient12009"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-       x1="53.810501"
-       y1="86.756599"
-       x2="54.098701"
-       y2="54.747101" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#id8"
-       id="linearGradient12011"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-       x1="44.393501"
-       y1="109.292"
-       x2="60.147202"
-       y2="29.469999" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="-229.78199"
-     inkscape:cy="62.554557"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata10031">
-    <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="Livello 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-490.28572,-362.6479)">
-    <g
-       id="g12013"
-       transform="translate(264.63966,1.1816406e-5)">
-      <rect
-         y="362.64789"
-         x="225.64606"
-         height="128"
-         width="128"
-         id="rect10809"
-         style="fill:none;stroke:none" />
-      <g
-         transform="translate(-0.80034,-6.8164063e-6)"
-         id="g11564">
-        <path
-           style="fill:#e5e5e5;fill-rule:evenodd"
-           inkscape:connector-curvature="0"
-           id="path10579"
-           d="m 289.85078,364.209 c 33.81865,0 61.24336,27.42471 61.24336,61.24336 0,33.81865 -27.42471,61.24336 -61.24336,61.24336 -33.81865,0 -61.24337,-27.42471 -61.24337,-61.24336 0,-33.81865 27.42472,-61.24336 61.24337,-61.24336 z m 0,40.74252 c 11.32018,0 20.50084,9.18068 20.50084,20.50084 0,11.32018 -9.18068,20.50084 -20.50084,20.50084 -11.32018,0 -20.50084,-9.18068 -20.50084,-20.50084 0,-11.32018 9.18068,-20.50084 20.50084,-20.50084 z"
-           class="fil24" />
-        <g
-           style="fill-rule:evenodd"
-           id="g10581"
-           transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)">
-          <path
-             style="fill:#ffffff;fill-opacity:0.05882401"
-             inkscape:connector-curvature="0"
-             d="M 72.8466,45.2557 83.4802,4.6914 c 23.9637,8.65995 41.0981,31.6102 41.0981,58.5562 0,3.39453 -0.2752,6.7241 -0.79843,9.97217 L 83.143565,62.24127 c -0.344886,-7.24851 -4.39375,-13.5285 -10.297,-16.9856 z"
-             class="fil25"
-             id="path10583" />
-          <path
-             style="fill:#ffffff;fill-opacity:0.11372501"
-             inkscape:connector-curvature="0"
-             d="M 73.5044,45.6584 86.3183,5.7957 c 22.466,9.39342 38.2599,31.5831 38.2599,57.4519 0,1.77876 -0.0791,3.53863 -0.22559,5.27959 L 83.053707,61.05781 c -0.67678,-6.47725 -4.32053,-12.071 -9.54933,-15.3994 z"
-             class="fil26"
-             id="path10585" />
-          <path
-             style="fill:#ffffff;fill-opacity:0.17254902"
-             inkscape:connector-curvature="0"
-             d="M 74.1659,46.0978 89.2665,7.1186 c 20.8892,10.0442 35.3119,31.4059 35.3119,56.129 l -0.002,0.174805 -41.697002,-3.64611 c -0.949618,-5.65755 -4.17997,-10.5438 -8.7131,-13.6785 z"
-             class="fil27"
-             id="path10587" />
-          <path
-             style="fill:#ffffff;fill-opacity:0.23137297"
-             inkscape:connector-curvature="0"
-             d="M 74.8285,46.5738 92.2949,8.6812 c 17.7888,9.79028 30.2744,28.0255 32.0591,49.2998 l -41.7501,0.437013 c -1.14096,-4.80715 -3.94611,-8.97058 -7.77529,-11.8442 z"
-             class="fil28"
-             id="path10589" />
-          <path
-             style="fill:#ffffff;fill-opacity:0.29019602"
-             inkscape:connector-curvature="0"
-             d="M 75.4828,47.0876 95.3752,10.4942 c 14.5974,9.16429 25.1259,24.2188 28.2464,41.8269 l -41.4052,4.68431 c -1.23545,-3.93784 -3.60831,-7.37135 -6.73355,-9.91784 z"
-             class="fil29"
-             id="path10591" />
-          <path
-             style="fill:#ffffff;fill-opacity:0.34509798"
-             inkscape:connector-curvature="0"
-             d="M 76.1265,47.6344 98.4709,12.567 c 11.4427,8.17569 19.9999,20.1298 23.8515,34.0362 l -40.6115,8.97531 c -1.21891,-3.07445 -3.14768,-5.78984 -5.58432,-7.94419 z"
-             class="fil30"
-             id="path10593" />
-          <path
-             style="fill:#ffffff;fill-opacity:0.40392199"
-             inkscape:connector-curvature="0"
-             d="m 76.7525,48.2096 24.781,-33.3063 c 8.40955,6.82922 15.0014,15.8069 18.9439,26.0968 L 81.0907,54.1696 c -1.08663,-2.24058 -2.56184,-4.25556 -4.33824,-5.95992 z"
-             class="fil31"
-             id="path10595" />
-          <path
-             style="fill:#ffffff;fill-opacity:0.46274504"
-             inkscape:connector-curvature="0"
-             d="M 77.3549,48.8108 104.517,17.4864 c 5.58432,5.14967 10.2202,11.308 13.6265,18.1845 L 80.369,52.8101 c -0.842136,-1.45277 -1.8579,-2.7957 -3.01421,-3.99926 z"
-             class="fil32"
-             id="path10597" />
-        </g>
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient11999);fill-rule:nonzero"
-           id="path10675"
-           d="m 289.85078,363.74763 c 17.03305,0 32.46243,6.90992 43.62803,18.07669 11.16679,11.16561 18.07669,26.59262 18.07669,43.62803 0,17.03306 -6.90992,32.46243 -18.07669,43.62804 -11.1656,11.16679 -26.59498,18.07669 -43.62803,18.07669 -17.03542,0 -32.46243,-6.90992 -43.62804,-18.07669 -11.16678,-11.16561 -18.07668,-26.59498 -18.07668,-43.62804 0,-17.03541 6.90992,-32.46242 18.07668,-43.62803 11.16561,-11.16679 26.59262,-18.07669 43.62804,-18.07669 z m 42.97728,18.72745 c -10.99825,-10.99942 -26.19404,-17.80473 -42.97728,-17.80473 -16.78206,0 -31.97904,6.80533 -42.97728,17.80473 -10.99942,10.99824 -17.80473,26.19522 -17.80473,42.97727 0,16.78324 6.80533,31.97904 17.80473,42.97728 10.99824,10.99942 26.19522,17.80473 42.97728,17.80473 16.78324,0 31.97903,-6.80532 42.97728,-17.80473 10.99942,-10.99824 17.80473,-26.19404 17.80473,-42.97728 0,-16.78205 -6.80533,-31.97903 -17.80473,-42.97727 z m -42.97728,22.0139 c 5.78499,0 11.02845,2.35095 14.81925,6.14292 l 0,0.001 10e-4,0 c 3.79197,3.79081 6.14293,9.03426 6.14293,14.81926 0,5.78499 -2.35096,11.02844 -6.14293,14.81925 l -10e-4,0 0,10e-4 c -3.7908,3.79314 -9.03426,6.14292 -14.81925,6.14292 -5.785,0 -11.02845,-2.34979 -14.81926,-6.14292 l 0,-10e-4 -10e-4,0 c -3.79197,-3.79081 -6.14292,-9.03426 -6.14292,-14.81925 0,-5.785 2.35095,-11.02845 6.14292,-14.81926 l 10e-4,0 0,-0.001 c 3.79081,-3.79197 9.03426,-6.14292 14.81926,-6.14292 z m 14.16968,6.79255 c -3.62347,-3.62463 -8.63566,-5.86867 -14.16968,-5.86867 -5.53398,0 -10.54614,2.24404 -14.16968,5.86867 l -0.001,0.001 c -3.62463,3.62346 -5.86867,8.63565 -5.86867,14.16967 0,5.53399 2.24404,10.54614 5.86867,14.16968 l 0.001,0.001 c 3.62346,3.62463 8.63566,5.86867 14.16968,5.86867 5.53398,0 10.54613,-2.24404 14.16968,-5.86867 l 10e-4,-0.001 c 3.62462,-3.62346 5.86866,-8.63566 5.86866,-14.16968 0,-5.53398 -2.24404,-10.54613 -5.86866,-14.16967 l -10e-4,-0.001 z"
-           class="fil63" />
-        <g
-           id="g11445">
-          <path
-             class="fil14"
-             d="m 291.17551,483.70506 c 34.8494,-0.56478 37.09694,3.38523 37.09694,4.08366 0,0.69843 -16.10916,1.75944 -35.97321,1.75944 -19.86278,0 -35.97322,-1.06101 -35.97322,-1.75944 0,-0.69843 0,-3.52004 34.8494,-4.08366 z"
-             id="path10557"
-             inkscape:connector-curvature="0"
-             style="fill:#333333;fill-opacity:0;fill-rule:evenodd" />
-          <g
-             transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-             id="g10559"
-             style="fill-rule:evenodd">
-            <path
-               id="path10561"
-               class="fil15"
-               d="m 63.6835,122.75 c 31.9906,-0.51024 34.4969,3.13587 34.4969,3.81265 0,0.63898 -15.0415,1.60041 -33.4752,1.60041 -18.4313,0 -33.474,-0.96261 -33.474,-1.60041 0,-0.67678 0.462998,-3.3024 32.4524,-3.81265 z"
-               inkscape:connector-curvature="0"
-               style="fill:#333333;fill-opacity:0.01176501" />
-            <path
-               id="path10563"
-               class="fil16"
-               d="m 63.6894,123.049 c 28.5629,-0.44646 31.2901,2.82877 31.2901,3.47366 0,0.56694 -13.7104,1.41262 -30.389,1.41262 -16.6762,0 -30.3866,-0.84686 -30.3866,-1.41262 0,-0.64489 0.924815,-3.02838 29.4854,-3.47366 z"
-               inkscape:connector-curvature="0"
-               style="fill:#333333;fill-opacity:0.02745098" />
-            <path
-               id="path10565"
-               class="fil17"
-               d="m 63.6941,123.346 c 25.133,-0.38268 28.0822,2.52405 28.0822,3.13587 0,0.49607 -12.3793,1.226 -27.3027,1.22482 -14.921,0 -27.3003,-0.72993 -27.3003,-1.22482 0,-0.61182 1.38781,-2.75318 26.5208,-3.13587 z"
-               inkscape:connector-curvature="0"
-               style="fill:#333333;fill-opacity:0.03921599" />
-            <path
-               id="path10567"
-               class="fil18"
-               d="m 63.6988,123.644 c 21.7042,-0.3189 24.8755,2.21696 24.8755,2.79688 0,0.4252 -11.0482,1.0382 -24.2164,1.03702 -13.1659,0 -24.2141,-0.61418 -24.2141,-1.03702 0,-0.57993 1.85081,-2.47916 23.555,-2.79688 z"
-               inkscape:connector-curvature="0"
-               style="fill:#333333;fill-opacity:0.05490202" />
-            <path
-               id="path10569"
-               class="fil19"
-               d="m 63.7035,123.944 c 18.2766,-0.25512 21.6688,1.91223 21.6688,2.46027 0,0.35197 -9.71705,0.84922 -21.129,0.84922 -11.4108,-0.001 -21.1278,-0.49961 -21.1278,-0.84922 0,-0.54804 2.31381,-2.20515 20.588,-2.46027 z"
-               inkscape:connector-curvature="0"
-               style="fill:#333333;fill-opacity:0.06666703" />
-            <path
-               id="path10571"
-               class="fil20"
-               d="m 63.7083,124.242 c 14.8478,-0.19134 18.462,1.60514 18.462,2.12129 0,0.28111 -8.38593,0.66143 -18.0427,0.66143 -9.65563,-0.001 -18.0416,-0.38387 -18.0416,-0.66143 0,-0.51615 2.77681,-1.93113 17.6223,-2.12129 z"
-               inkscape:connector-curvature="0"
-               style="fill:#333333;fill-opacity:0.07843101" />
-            <path
-               id="path10573"
-               class="fil21"
-               d="m 63.713,124.539 c 11.4179,-0.12756 15.2541,1.30041 15.2541,1.78349 0,0.21024 -7.05481,0.47481 -14.9565,0.47363 -7.90049,-0.001 -14.9553,-0.26693 -14.9553,-0.47363 0,-0.48308 3.2398,-1.65593 14.6577,-1.78349 z"
-               inkscape:connector-curvature="0"
-               style="fill:#333333;fill-opacity:0.09411801" />
-            <path
-               id="path10575"
-               class="fil22"
-               d="m 63.7189,124.838 c 7.99026,-0.0638 12.0474,0.99332 12.0474,1.44451 0,0.13819 -5.72369,0.28701 -11.8702,0.28583 -6.14535,-0.001 -11.8679,-0.15118 -11.8679,-0.28583 0,-0.45119 3.70162,-1.38191 11.6907,-1.44451 z"
-               inkscape:connector-curvature="0"
-               style="fill:#333333;fill-opacity:0.10588199" />
-          </g>
-          <path
-             class="fil23"
-             d="m 291.21969,486.34588 c 4.48808,0 8.69841,0.67751 8.69841,1.0889 0,0.13364 -17.28414,0.12434 -17.28414,0 0,-0.41138 4.09761,-1.0889 8.58568,-1.0889 z"
-             id="path10577"
-             inkscape:connector-curvature="0"
-             style="fill:#333333;fill-opacity:0.12156899;fill-rule:evenodd" />
-          <g
-             transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-             id="g10599"
-             style="fill-rule:evenodd">
-            <path
-               id="path10601"
-               class="fil33"
-               d="M 74.1316,46.0742 97.2307,11.7025 c 8.05404,5.46503 14.7569,12.7691 19.5132,21.3062 L 82.9474,60.2145 C 82.092271,54.35616 78.79932,49.288 74.13154,46.0742 z"
-               inkscape:connector-curvature="0"
-               style="fill:#ffffff;fill-opacity:0" />
-            <g
-               id="g10603">
-              <path
-                 id="path10605"
-                 class="fil34"
-                 d="m 74.8249,46.5714 23.8716,-33.839 c 6.893,4.97132 12.7277,11.3186 17.1026,18.638 L 82.6203,58.4841 C 81.48879,53.64861 78.67301,49.45919 74.82493,46.5714 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.035294" />
-              <path
-                 id="path10607"
-                 class="fil35"
-                 d="M 75.4875,47.0911 100.1386,13.806 c 5.76503,4.41501 10.7387,9.81272 14.6636,15.9463 L 82.1609,56.8365 c -1.24844,-3.86343 -3.59532,-7.2367 -6.67331,-9.7454 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.07450998" />
-              <path
-                 id="path10609"
-                 class="fil36"
-                 d="m 76.1265,47.6344 25.4342,-32.7075 c 4.6725,3.79847 8.78279,8.25955 12.1903,13.2415 L 81.5868,55.275 c -1.22364,-2.94925 -3.10516,-5.55715 -5.4603,-7.64065 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.10980398" />
-              <path
-                 id="path10611"
-                 class="fil37"
-                 d="m 76.7348,48.1919 26.2173,-32.1028 c 3.61894,3.12051 6.8741,6.65323 9.69579,10.5202 L 80.90069,53.788 c -1.07009,-2.0953 -2.48271,-3.98509 -4.1658,-5.59613 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.14509798" />
-              <path
-                 id="path10613"
-                 class="fil38"
-                 d="m 77.3112,48.7671 27.0027,-31.4697 c 2.60791,2.38349 5.01148,4.98786 7.18237,7.78002 l -31.3846,27.3015 C 79.310873,51.0726 78.36952,49.86196 77.31124,48.76706 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.18431402" />
-            </g>
-            <path
-               id="path10615"
-               class="fil39"
-               d="m 77.8557,49.3518 27.7799,-30.8071 c 1.64175,1.58978 3.19728,3.26815 4.65596,5.0292 l -31.0716,27.4716 c -0.425202,-0.588196 -0.881113,-1.15395 -1.36419,-1.69372 z"
-               inkscape:connector-curvature="0"
-               style="fill:#ffffff;fill-opacity:0.21960802" />
-          </g>
-          <g
-             transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-             id="g10617"
-             style="fill-rule:evenodd">
-            <path
-               id="path10619"
-               class="fil40"
-               d="M 42.9407,55.6117 9.9285,29.6508 C 17.85261,17.3164 30.0134,7.9655 44.3533,3.645 l 14.4403,39.0678 c -7.2497,1.24135 -13.2238,6.22803 -15.853,12.899 z"
-               inkscape:connector-curvature="0"
-               style="fill:#fffffa;fill-opacity:0" />
-            <g
-               id="g10621">
-              <path
-                 id="path10623"
-                 class="fil41"
-                 d="M 43.2312,54.9172 10.7493,28.4047 C 18.50097,16.9538 29.9661,8.2206 43.4143,3.9343 l 14.7049,38.9036 c -6.69221,1.376 -12.2151,5.96346 -14.888,12.0793 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#fffffb;fill-opacity:0.02352899" />
-              <path
-                 id="path10625"
-                 class="fil42"
-                 d="M 43.5431,54.2322 11.6057,27.1716 C 19.14713,16.5888 29.9166,8.4651 42.4754,4.239 l 14.9742,38.7501 c -6.14181,1.47522 -11.2277,5.67172 -13.9065,11.2431 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#fffffc;fill-opacity:0.047059" />
-              <path
-                 id="path10627"
-                 class="fil43"
-                 d="M 43.8832,53.5601 12.4962,25.9539 C 19.7896,16.22504 29.8669,8.7037 41.5434,4.5651 l 15.24,38.5954 c -5.59613,1.54372 -10.2497,5.36227 -12.9002,10.3997 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#fffffc;fill-opacity:0.07450998" />
-              <path
-                 id="path10629"
-                 class="fil44"
-                 d="M 44.2458,52.8999 13.4186,24.7551 C 20.42853,15.86011 29.8137,8.9258 40.6138,4.9017 L 56.1219,43.353 c -5.05754,1.57797 -9.28712,5.03274 -11.8761,9.54697 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#fffffd;fill-opacity:0.09803898" />
-              <path
-                 id="path10631"
-                 class="fil45"
-                 d="M 44.6332,52.2514 14.3765,23.5703 C 21.06753,15.49382 29.7558,9.1359 39.6867,5.2535 l 15.7809,38.3178 c -4.52486,1.57915 -8.33987,4.67604 -10.8344,8.68003 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#fffffd;fill-opacity:0.12156899" />
-              <path
-                 id="path10633"
-                 class="fil46"
-                 d="M 45.0419,51.6195 15.3628,22.4093 C 21.69831,15.13008 29.6968,9.3391 38.7655,5.6256 l 16.0514,38.1843 c -4.00399,1.54963 -7.40915,4.30045 -9.77492,7.80954 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#fffffe;fill-opacity:0.14509798" />
-              <path
-                 id="path10635"
-                 class="fil47"
-                 d="M 45.4742,51.0042 16.3797,21.2684 c 5.94456,-6.50323 13.2521,-11.7391 21.468,-15.26 l 16.3266,38.0627 c -3.49138,1.48821 -6.49378,3.90241 -8.70011,6.93316 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#fffffe;fill-opacity:0.17254902" />
-              <path
-                 id="path10637"
-                 class="fil48"
-                 d="M 45.9254,50.4042 17.4262,20.1523 C 22.94674,14.40144 29.5622,9.7089 36.9347,6.4076 l 16.6041,37.9481 c -2.99177,1.3949 -5.59849,3.47839 -7.61348,6.0485 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.19607801" />
-            </g>
-            <path
-               id="path10639"
-               class="fil39"
-               d="M 46.3978,49.8254 18.4998,19.0608 C 23.56443,14.03633 29.4877,9.87998 36.0288,6.8244 l 16.8793,37.8371 c -2.50397,1.27206 -4.7162,3.03547 -6.51032,5.16384 z"
-               inkscape:connector-curvature="0"
-               style="fill:#ffffff;fill-opacity:0.21960802" />
-          </g>
-          <g
-             transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-             id="g10641"
-             style="fill-rule:evenodd">
-            <path
-               id="path10643"
-               class="fil49"
-               d="M 55.7404,83.0183 28.6515,115.597 C 20.26911,110.19221 13.2686,102.8303 8.295,94.1562 L 43.1958,71.4965 c 2.33743,5.41424 6.90363,9.64146 12.5446,11.5218 z"
-               inkscape:connector-curvature="0"
-               style="fill:#c4deff;fill-opacity:0" />
-            <g
-               id="g10645">
-              <path
-                 id="path10647"
-                 class="fil50"
-                 d="m 54.8818,82.7101 -27.748,31.8748 C 19.94434,109.64547 13.8451,103.2355 9.267,95.7886 L 43.8891,72.947 c 2.3457,4.44927 6.25283,7.94655 10.9927,9.76311 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#c4deff;fill-opacity:0.035294" />
-              <path
-                 id="path10649"
-                 class="fil51"
-                 d="M 54.0479,82.3687 25.6373,113.5218 C 19.61006,109.11505 14.4061,103.65002 10.2946,97.4019 L 44.6923,74.337 c 2.22759,3.5339 5.48629,6.35205 9.35563,8.03159 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#c4deff;fill-opacity:0.07450998" />
-              <path
-                 id="path10651"
-                 class="fil52"
-                 d="M 53.2306,81.9943 24.1574,112.4069 C 19.25931,108.5978 14.94587,104.07294 11.373,98.9894 L 45.5959,75.6588 c 1.99018,2.67877 4.60754,4.86266 7.63474,6.33551 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#c4deff;fill-opacity:0.10980398" />
-              <path
-                 id="path10653"
-                 class="fil53"
-                 d="m 52.4416,81.5892 -29.7358,29.6567 c -3.80674,-3.1465 -7.23552,-6.73827 -10.2013,-10.6938 L 46.6069,76.9156 c 1.64175,1.88742 3.61776,3.47485 5.83472,4.67368 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#c4deff;fill-opacity:0.14509798" />
-              <path
-                 id="path10655"
-                 class="fil54"
-                 d="m 51.6786,81.1557 -30.396,28.8748 c -2.75555,-2.42011 -5.29495,-5.07998 -7.58631,-7.94537 l 34.0268,-23.9849 c 1.1882,1.16931 2.51578,2.19688 3.95556,3.05555 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#c4deff;fill-opacity:0.18431402" />
-            </g>
-            <path
-               id="path10657"
-               class="fil55"
-               d="m 50.9463,80.6974 -31.0527,28.0751 c -1.74805,-1.63112 -3.40162,-3.3591 -4.9536,-5.18038 l 34.0032,-24.3818 c 0.636622,0.533865 1.30632,1.03112 2.00317,1.48703 z"
-               inkscape:connector-curvature="0"
-               style="fill:#c4deff;fill-opacity:0.21960802" />
-          </g>
-          <path
-             class="fil56"
-             d="m 290.18423,393.62675 c 17.42238,0 31.55014,14.12776 31.55014,31.54906 0,17.42121 -14.12776,31.55015 -31.55014,31.55015 -17.42121,0 -31.54907,-14.12894 -31.54907,-31.55015 0,-17.4212 14.12776,-31.54906 31.54907,-31.54906 z m -0.33353,12.08251 c 10.9029,0 19.74313,8.84135 19.74313,19.74313 0,10.9029 -8.84019,19.74313 -19.74313,19.74313 -10.9029,0 -19.74313,-8.84019 -19.74313,-19.74313 0,-10.90182 8.84019,-19.74313 19.74313,-19.74313 z"
-             id="path10659"
-             inkscape:connector-curvature="0"
-             style="fill:#a6a8a4;fill-opacity:0.21960802;fill-rule:evenodd" />
-          <path
-             class="fil57"
-             d="m 289.85078,405.70808 c 10.90182,0 19.74431,8.84251 19.74431,19.74431 0,10.90182 -8.84251,19.74431 -19.74431,19.74431 -10.90182,0 -19.74432,-8.84251 -19.74432,-19.74431 0,-10.90182 8.84252,-19.74431 19.74432,-19.74431 z m 0,12.24633 c 4.13944,0 7.49795,3.3585 7.49795,7.49795 0,4.13945 -3.35851,7.49795 -7.49795,7.49795 -4.13945,0 -7.49795,-3.3585 -7.49795,-7.49795 0,-4.13945 3.3585,-7.49795 7.49795,-7.49795 z"
-             id="path10661"
-             style="fill:url(#linearGradient12001);fill-opacity:0.92156899;fill-rule:evenodd"
-             inkscape:connector-curvature="0" />
-          <path
-             class="fil58"
-             d="m 289.85078,405.70916 c 10.9029,0 19.74313,8.84135 19.74313,19.74313 0,0.2882 -0.008,0.57408 -0.0198,0.8588 -0.44973,-10.50314 -9.10863,-18.88664 -19.72335,-18.88664 -10.61472,0 -19.27361,8.38348 -19.72336,18.88664 -0.0116,-0.28472 -0.0198,-0.5706 -0.0198,-0.8588 0,-10.90182 8.8402,-19.74313 19.74314,-19.74313 z m 7.44798,20.60081 c -0.42533,3.73502 -3.59906,6.63914 -7.44798,6.63914 -3.84892,0 -7.02265,-2.90412 -7.44798,-6.63914 -0.0337,0.28239 -0.0488,0.56827 -0.0488,0.85763 0,4.14061 3.35734,7.49796 7.49679,7.49796 4.13944,0 7.49679,-3.35735 7.49679,-7.49796 0,-0.28936 -0.0151,-0.57524 -0.0488,-0.85763 z"
-             id="path10663"
-             inkscape:connector-curvature="0"
-             style="fill:#ffffff;fill-opacity:0.78039198;fill-rule:evenodd" />
-          <path
-             class="fil59"
-             d="m 289.85078,417.49305 c 2.19407,0 4.18592,0.8925 5.62579,2.33352 1.44101,1.43985 2.33352,3.43172 2.33352,5.62579 0,2.19407 -0.89251,4.18593 -2.33352,5.62695 -1.43986,1.43985 -3.43172,2.33236 -5.62579,2.33236 -2.19407,0 -4.18593,-0.8925 -5.62579,-2.33236 -1.44102,-1.44101 -2.33352,-3.43288 -2.33352,-5.62695 0,-2.19407 0.8925,-4.18593 2.33352,-5.62579 1.43985,-1.44101 3.43172,-2.33352 5.62579,-2.33352 z m 4.975,2.98431 c -1.27251,-1.27251 -3.03195,-2.06043 -4.975,-2.06043 -1.94306,0 -3.70249,0.78791 -4.975,2.06043 -1.27251,1.27251 -2.06043,3.03195 -2.06043,4.975 0,1.94305 0.78791,3.70249 2.06043,4.975 1.27251,1.27251 3.03194,2.06043 4.975,2.06043 1.94305,0 3.70249,-0.78792 4.975,-2.06043 1.27251,-1.27251 2.06043,-3.03195 2.06043,-4.975 0,-1.94305 -0.78792,-3.70249 -2.06043,-4.975 z"
-             id="path10665"
-             style="fill:url(#linearGradient12003);fill-rule:nonzero"
-             inkscape:connector-curvature="0" />
-          <path
-             class="fil60"
-             d="m 289.85078,408.01131 c 4.81231,0 9.17488,1.95235 12.33114,5.10981 3.15746,3.15629 5.10981,7.51887 5.10981,12.33114 0,4.81231 -1.95235,9.17488 -5.10981,12.33115 -3.15629,3.15745 -7.51887,5.1098 -12.33114,5.1098 -4.81231,0 -9.17488,-1.95235 -12.33115,-5.1098 -3.15745,-3.1563 -5.1098,-7.51888 -5.1098,-12.33115 0,-4.81231 1.95235,-9.17488 5.1098,-12.33114 3.1563,-3.15746 7.51888,-5.10981 12.33115,-5.10981 z m 11.64319,5.79778 c -2.97849,-2.9785 -7.09702,-4.8216 -11.64319,-4.8216 -4.54619,0 -8.66471,1.8431 -11.6432,4.8216 -2.97849,2.97849 -4.8216,7.09702 -4.8216,11.64319 0,4.54619 1.84311,8.66471 4.8216,11.6432 2.9785,2.97849 7.09702,4.8216 11.6432,4.8216 4.54618,0 8.66471,-1.84311 11.64319,-4.8216 2.97849,-2.9785 4.8216,-7.09702 4.8216,-11.6432 0,-4.54618 -1.84311,-8.66471 -4.8216,-11.64319 z"
-             id="path10667"
-             inkscape:connector-curvature="0"
-             style="fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero" />
-          <path
-             class="fil61"
-             d="m 229.55105,418.34138 c 3.92678,-33.29797 34.11383,-57.11665 67.41179,-53.18869 33.29334,3.92678 57.11203,34.11383 53.18642,67.40953 -3.92677,33.29688 -34.115,57.11665 -67.40952,53.18987 -33.29797,-3.92795 -57.11665,-34.11609 -53.18869,-67.41061 z m 6.81231,0.80302 c 3.48285,-29.53628 30.26024,-50.66466 59.79534,-47.17946 29.53274,3.48285 50.66112,30.26024 47.17828,59.79298 -3.48285,29.53737 -30.26024,50.66575 -59.79417,47.18172 -29.53628,-3.48401 -50.66466,-30.26142 -47.17945,-59.79534 z"
-             id="path10669"
-             inkscape:connector-curvature="0"
-             style="fill:#ffffff;fill-opacity:0.58039198;fill-rule:evenodd" />
-          <path
-             class="fil61"
-             d="m 229.55105,418.34138 c 3.92562,-33.29797 34.11265,-57.11665 67.41061,-53.18869 33.29452,3.92562 57.11321,34.11265 53.1876,67.40953 -3.92677,33.29688 -34.11382,57.11665 -67.40952,53.18987 -33.29797,-3.92795 -57.11665,-34.11501 -53.18869,-67.41061 z m 1.5491,0.18129 c 3.82452,-32.44157 33.23637,-55.64777 65.6803,-51.82096 32.43803,3.82452 55.64541,33.23638 51.81978,65.67913 -3.82568,32.44039 -33.23756,55.64777 -65.67913,51.82203 -32.44157,-3.82684 -55.64777,-33.23873 -51.82095,-65.6803 z"
-             id="path10671"
-             inkscape:connector-curvature="0"
-             style="fill:#ffffff;fill-opacity:0.58039198;fill-rule:evenodd" />
-          <path
-             class="fil62"
-             d="m 275.52535,420.93054 -0.13365,0.46949 -1.52236,-1.39686 -0.30796,1.06915 -0.39047,-0.11156 0.44393,-1.54794 0.35328,0.1011 1.55724,1.41662 z m 0.33236,-2.78675 c 0.10808,0.0511 0.1964,0.12086 0.25915,0.20686 0.0628,0.0883 0.10459,0.18593 0.12319,0.2975 0.0197,0.10924 0.0163,0.23009 -0.005,0.35793 -0.0232,0.12783 -0.0651,0.25799 -0.12667,0.39047 -0.0151,0.0325 -0.0349,0.0686 -0.0523,0.10459 -0.0209,0.036 -0.0407,0.0744 -0.0616,0.1104 -0.0221,0.0372 -0.043,0.0732 -0.0651,0.10691 -0.0221,0.0349 -0.0407,0.0662 -0.0628,0.0953 l -0.33236,-0.15572 c 0.043,-0.0546 0.0872,-0.1197 0.13364,-0.19407 0.0453,-0.0755 0.0872,-0.15456 0.12551,-0.23707 0.0755,-0.16037 0.10343,-0.2975 0.0825,-0.40907 -0.0209,-0.11272 -0.086,-0.19291 -0.19058,-0.24288 -0.11157,-0.0523 -0.21151,-0.0511 -0.30099,10e-4 -0.0918,0.0546 -0.17664,0.16735 -0.25915,0.34283 l -0.19059,0.41138 -1.08774,-0.50668 0.56595,-1.21092 0.36141,0.16735 -0.39511,0.84602 0.41487,0.19407 0.0709,-0.15224 c 0.05,-0.10691 0.10692,-0.20569 0.17083,-0.29401 0.0639,-0.0883 0.13713,-0.15921 0.21848,-0.21151 0.0813,-0.0534 0.17083,-0.0848 0.2731,-0.0918 0.0976,-0.007 0.20918,0.0163 0.33003,0.0732 z m 0.92853,-1.60953 c 0.10459,0.0604 0.18361,0.13713 0.23823,0.22894 0.0558,0.093 0.0883,0.19291 0.0988,0.30563 0.0105,0.11157 -0.003,0.23126 -0.036,0.35677 -0.0337,0.12551 -0.086,0.25102 -0.16037,0.37769 -0.0174,0.0325 -0.0395,0.0651 -0.0627,0.0988 -0.0221,0.036 -0.0465,0.0709 -0.0686,0.10691 -0.0256,0.0349 -0.0511,0.0686 -0.0744,0.0999 -0.0256,0.0325 -0.0476,0.0628 -0.0709,0.0895 l -0.31842,-0.18478 c 0.0477,-0.05 0.0988,-0.1104 0.14992,-0.18129 0.0523,-0.0709 0.1011,-0.14642 0.14758,-0.22428 0.0883,-0.15456 0.12784,-0.28821 0.11505,-0.40093 -0.009,-0.11389 -0.0651,-0.19989 -0.1685,-0.25915 -0.10459,-0.0593 -0.2057,-0.0686 -0.2975,-0.0232 -0.0965,0.0442 -0.19291,0.14991 -0.28821,0.31725 l -0.22661,0.39396 -1.04009,-0.59965 0.66938,-1.15746 0.34398,0.19872 -0.46484,0.80883 0.39628,0.22777 0.0837,-0.1441 c 0.0593,-0.10226 0.12435,-0.19523 0.1964,-0.27774 0.0709,-0.0837 0.14991,-0.14643 0.23474,-0.19291 0.0872,-0.0465 0.17781,-0.0686 0.27891,-0.0662 0.1011,10e-4 0.20918,0.0337 0.32423,0.1011 z m 1.11098,-0.35793 -0.30796,0.38001 -0.85415,-1.87914 -0.70076,0.86461 -0.31725,-0.25682 1.01453,-1.25276 0.28588,0.23126 0.87972,1.91284 z m 1.14584,-1.36316 -0.3405,0.35212 -0.68913,-1.94654 -0.77164,0.79954 -0.29402,-0.2824 1.11912,-1.15978 0.26496,0.25567 0.71122,1.98139 z m 1.4968,-2.34979 c 0.0767,0.093 0.12667,0.19291 0.14643,0.2975 0.0209,0.10691 0.0163,0.21267 -0.0139,0.32191 -0.0267,0.10691 -0.0802,0.21499 -0.15456,0.32306 -0.0744,0.10575 -0.16735,0.2057 -0.28007,0.29983 -0.0279,0.0232 -0.0604,0.0465 -0.0918,0.0721 -0.0349,0.0244 -0.0686,0.05 -0.10227,0.0755 -0.036,0.0244 -0.0709,0.0477 -0.10342,0.0686 -0.0349,0.0232 -0.0662,0.0418 -0.0976,0.0593 l -0.23591,-0.28123 c 0.0616,-0.0314 0.13016,-0.0697 0.20454,-0.12086 0.0732,-0.0476 0.1441,-0.1011 0.21383,-0.16037 0.13596,-0.11389 0.21847,-0.22661 0.24753,-0.33585 0.0279,-0.11156 0.005,-0.21034 -0.0709,-0.29982 -0.079,-0.0941 -0.16966,-0.13597 -0.27309,-0.12551 -0.10459,0.009 -0.2301,0.0767 -0.38001,0.19988 l -0.34631,0.29285 -0.77164,-0.91923 1.02498,-0.8588 0.25567,0.30331 -0.71586,0.60081 0.29517,0.35096 0.129,-0.10691 c 0.0895,-0.0755 0.18477,-0.14062 0.27891,-0.19408 0.0953,-0.0534 0.19058,-0.0872 0.2882,-0.0999 0.0953,-0.0139 0.18826,-0.003 0.28472,0.0325 0.093,0.0337 0.18245,0.10343 0.26844,0.20453 z m 1.57118,-1.05869 c 0.0639,0.10227 0.0988,0.20802 0.10459,0.3161 0.005,0.10807 -0.0151,0.2115 -0.0593,0.31609 -0.043,0.10227 -0.10924,0.20221 -0.19756,0.2975 -0.0907,0.0941 -0.19523,0.18013 -0.31958,0.25799 -0.0302,0.0198 -0.0662,0.0383 -0.10227,0.0581 -0.0372,0.0209 -0.0732,0.0407 -0.1104,0.0604 -0.0383,0.0209 -0.0767,0.0384 -0.11272,0.0546 -0.0372,0.0186 -0.0721,0.0314 -0.10459,0.0453 l -0.19407,-0.31145 c 0.0651,-0.0221 0.13829,-0.0511 0.21731,-0.0906 0.0802,-0.0372 0.15921,-0.0802 0.23591,-0.129 0.14991,-0.0941 0.24753,-0.19407 0.29053,-0.29866 0.0442,-0.10575 0.0349,-0.20802 -0.0267,-0.30796 -0.0662,-0.10343 -0.15107,-0.15805 -0.25334,-0.16153 -0.10575,-0.006 -0.24055,0.0442 -0.40441,0.14642 l -0.38466,0.2394 -0.63568,-1.01569 1.13423,-0.70889 0.2115,0.33701 -0.7914,0.4939 0.24288,0.38931 0.14178,-0.0883 c 0.1011,-0.0627 0.20221,-0.11389 0.30331,-0.1534 0.10227,-0.0395 0.20221,-0.0581 0.29866,-0.0581 0.0965,-0.001 0.18943,0.0209 0.27891,0.0709 0.0872,0.0476 0.16618,0.12784 0.23707,0.24056 z m 1.16444,0.21034 -0.43463,0.22197 -0.0174,-2.06507 -0.99012,0.50552 -0.18593,-0.36258 1.43637,-0.73213 0.16734,0.32771 0.0244,2.10459 z m 2.19639,-1.73271 c 0.043,0.11272 0.0558,0.22313 0.0418,0.32888 -0.0151,0.10807 -0.0546,0.20685 -0.11738,0.29982 -0.0627,0.0918 -0.14759,0.17781 -0.25218,0.25567 -0.10459,0.0744 -0.22545,0.13945 -0.36258,0.19175 -0.0337,0.0128 -0.0709,0.0256 -0.11156,0.0372 -0.0395,0.0128 -0.079,0.0267 -0.12086,0.0383 -0.0418,0.0128 -0.0814,0.0221 -0.11969,0.0314 -0.0407,0.0105 -0.0755,0.0186 -0.11041,0.0256 l -0.13131,-0.34283 c 0.0686,-0.009 0.1441,-0.0256 0.23009,-0.0476 0.0848,-0.0221 0.17083,-0.0488 0.25567,-0.0825 0.16502,-0.0639 0.28007,-0.14177 0.34282,-0.23823 0.0639,-0.0941 0.0732,-0.1964 0.0314,-0.30564 -0.0442,-0.11388 -0.11621,-0.18361 -0.21848,-0.20685 -0.1011,-0.0256 -0.24172,-0.003 -0.42184,0.0651 l -0.42418,0.16386 -0.42998,-1.12028 1.24811,-0.47879 0.14178,0.37071 -0.87042,0.33469 0.16502,0.42882 0.15572,-0.0604 c 0.10924,-0.0418 0.21964,-0.0732 0.32539,-0.0918 0.10924,-0.0197 0.21151,-0.0197 0.30564,-10e-4 0.0953,0.0174 0.18245,0.0569 0.25915,0.12319 0.0779,0.0627 0.13945,0.15804 0.18826,0.28123 z m 1.85705,-0.43463 c 0.0244,0.11737 0.0221,0.22894 -0.0105,0.3312 -0.0302,0.10343 -0.0848,0.19524 -0.16269,0.27775 -0.0755,0.0813 -0.17316,0.15223 -0.28821,0.2115 -0.11505,0.0581 -0.2452,0.10343 -0.38814,0.13364 -0.0349,0.008 -0.0755,0.014 -0.11505,0.0209 -0.0418,0.006 -0.0837,0.0116 -0.12667,0.0174 -0.0418,0.006 -0.0825,0.009 -0.12319,0.0128 -0.0418,0.003 -0.0779,0.006 -0.11272,0.008 l -0.0767,-0.36025 c 0.0697,10e-4 0.14759,-0.001 0.23591,-0.0105 0.0872,-0.008 0.17664,-0.0221 0.26496,-0.0418 0.17316,-0.036 0.29983,-0.0965 0.37537,-0.18012 0.079,-0.0848 0.10342,-0.18362 0.0802,-0.29867 -0.0267,-0.11969 -0.0872,-0.19988 -0.18361,-0.23823 -0.0965,-0.0407 -0.23939,-0.0407 -0.42766,-10e-4 l -0.44509,0.0941 -0.24869,-1.17257 1.30854,-0.27775 0.0813,0.38815 -0.91109,0.19523 0.0941,0.44858 0.16385,-0.0349 c 0.11622,-0.0244 0.22894,-0.0384 0.33702,-0.0407 0.1104,-0.002 0.20918,0.0139 0.30098,0.0465 0.0918,0.0337 0.17083,0.086 0.23591,0.16386 0.0674,0.0732 0.11389,0.17548 0.14178,0.3068 z"
-             id="path10673"
-             inkscape:connector-curvature="0"
-             style="fill:#cccccc;fill-rule:nonzero" />
-          <g
-             transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-             id="g10677"
-             style="fill-rule:evenodd">
-            <path
-               id="path10679"
-               class="fil33"
-               d="M 55.4003,81.1451 29.2775,112.5616 C 21.19512,107.34933 14.4439,100.2508 9.6473,91.8861 L 43.3032,70.0343 c 2.25357,5.22172 6.65677,9.29775 12.097,11.1108 z"
-               inkscape:connector-curvature="0"
-               style="fill:#ffffff;fill-opacity:0" />
-            <g
-               id="g10681">
-              <path
-                 id="path10683"
-                 class="fil34"
-                 d="M 54.5723,80.8486 27.8141,111.5848 C 20.88094,106.82254 15.0002,100.6406 10.5851,93.4594 L 43.9717,71.4339 c 2.26184,4.28982 6.0296,7.66191 10.6005,9.41468 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.035294" />
-              <path
-                 id="path10685"
-                 class="fil35"
-                 d="M 53.768,80.5191 26.3708,110.5608 C 20.55852,106.31114 15.5411,101.041 11.5761,95.0161 L 44.7466,72.7745 c 2.14727,3.40752 5.29022,6.12527 9.02137,7.74458 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.07450998" />
-              <path
-                 id="path10687"
-                 class="fil36"
-                 d="M 52.9802,80.1577 24.944,109.4848 c -4.72329,-3.67327 -8.88318,-8.03632 -12.3285,-12.938 L 45.6171,74.0489 c 1.91931,2.5831 4.44336,4.68903 7.36308,6.10874 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.10980398" />
-              <path
-                 id="path10689"
-                 class="fil37"
-                 d="m 52.2195,79.7667 -28.6752,28.5984 c -3.67091,-3.03429 -6.97686,-6.49732 -9.83752,-10.3123 l 32.8858,-22.792 c 1.5827,1.8201 3.48902,3.35083 5.62684,4.50596 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.14509798" />
-              <path
-                 id="path10691"
-                 class="fil38"
-                 d="m 51.4837,79.3486 -29.3118,27.8448 c -2.65751,-2.33389 -5.10597,-4.89809 -7.31584,-7.66191 l 32.8126,-23.1286 c 1.14568,1.12679 2.42601,2.11774 3.81501,2.94571 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.18431402" />
-            </g>
-            <path
-               id="path10693"
-               class="fil39"
-               d="m 50.7774,78.9069 -29.9449,27.0736 c -1.68545,-1.57325 -3.27996,-3.23862 -4.77644,-4.99494 l 32.789,-23.5125 c 0.614181,0.514967 1.26025,0.9945 1.93231,1.43388 z"
-               inkscape:connector-curvature="0"
-               style="fill:#ffffff;fill-opacity:0.21960802" />
-          </g>
-          <g
-             transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-             id="g10695"
-             style="fill-rule:evenodd">
-            <path
-               id="path10697"
-               class="fil33"
-               d="M 57.4318,77.1919 31.948,107.758 C 24.06286,102.68747 17.477,95.7803 12.7986,87.6424 L 45.6301,66.3823 c 2.19924,5.07998 6.49496,9.04617 11.8017,10.8096 z"
-               inkscape:connector-curvature="0"
-               style="fill:#ffffff;fill-opacity:0" />
-            <g
-               id="g10699">
-              <path
-                 id="path10701"
-                 class="fil34"
-                 d="M 56.6239,76.9025 30.52,106.8084 C 23.75692,102.1737 18.0191,96.1606 13.7127,89.1731 L 46.282,67.7429 c 2.20751,4.17407 5.88314,7.45521 10.3419,9.15956 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.035294" />
-              <path
-                 id="path10703"
-                 class="fil35"
-                 d="M 55.8397,76.5824 29.1122,105.8103 C 23.44284,101.67639 18.5471,96.54916 14.679,90.6873 L 47.0381,69.0469 c 2.0953,3.3154 5.16148,5.95992 8.80168,7.53553 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.07450998" />
-              <path
-                 id="path10705"
-                 class="fil36"
-                 d="M 55.0708,76.2316 27.7209,104.765 C 23.11218,101.19094 19.05505,96.94601 15.6936,92.1767 L 47.8885,70.2871 c 1.87207,2.51342 4.33352,4.56265 7.18237,5.94456 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.10980398" />
-              <path
-                 id="path10707"
-                 class="fil37"
-                 d="m 54.3278,75.8513 -27.9736,27.8248 c -3.58115,-2.95279 -6.80678,-6.32252 -9.59657,-10.0336 l 32.0815,-22.1767 c 1.5449,1.77168 3.4028,3.26106 5.48865,4.38549 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.14509798" />
-              <path
-                 id="path10709"
-                 class="fil38"
-                 d="M 53.6097,75.445 25.016,102.5351 c -2.59255,-2.27011 -4.98077,-4.76581 -7.13749,-7.45403 l 32.0106,-22.5038 c 1.11734,1.09726 2.36696,2.06223 3.72052,2.86775 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#ffffff;fill-opacity:0.18431402" />
-            </g>
-            <path
-               id="path10711"
-               class="fil39"
-               d="M 52.9211,75.0151 23.7085,101.3552 C 22.06439,99.82447 20.50885,98.20398 19.04899,96.4949 L 51.03719,73.619 c 0.598826,0.500794 1.22836,0.967335 1.88388,1.39608 z"
-               inkscape:connector-curvature="0"
-               style="fill:#ffffff;fill-opacity:0.21960802" />
-          </g>
-          <path
-             class="fil65"
-             d="m 270.93501,482.98976 17.70359,-32.38578 -8.17546,-7.40033 c -1.89192,-5.45845 -3.85356,-14.43809 -4.10226,-15.20161 -2.55431,-7.84542 -2.47762,-15.58277 3.35502,-23.10623 2.72399,-3.51423 5.93142,-6.12317 9.3887,-7.92561 -9.59556,-1.99186 -18.90405,-3.4108 -19.94296,-3.5642 -0.54852,0.48924 -1.09123,0.99128 -1.61999,1.51655 -10.64492,10.57753 -12.87623,22.48343 -11.27945,35.05277 0.3068,2.42881 1.07961,9.05634 1.87333,14.6089 l -16.6263,3.45496 17.55836,16.06971 c 1.37245,0.30679 0.59384,15.30156 2.14293,15.70251 0.2208,0.44857 2.4753,1.00987 9.72456,3.17837 z"
-             id="path10713"
-             style="fill:url(#linearGradient12005);fill-opacity:0.38039198;fill-rule:evenodd"
-             inkscape:connector-curvature="0" />
-          <path
-             class="fil66"
-             d="m 260.25408,479.02657 14.78787,-20.49848 14.79141,-21.64779 -17.99876,0 c -0.69029,-5.3585 -1.35618,-10.63793 -1.43637,-11.38403 -0.90528,-8.20568 -0.78442,-15.75938 6.45553,-21.94414 15.50839,-13.2388 36.95979,-5.85356 45.47228,9.17953 2.00581,-0.98199 4.96222,-2.44857 7.49446,-3.28994 -8.67517,-22.12666 -39.96858,-33.03192 -62.86219,-18.12549 -12.57289,8.18825 -18.89599,19.20621 -19.88492,31.83489 -0.18594,2.37769 -0.75769,8.35327 -1.11214,13.53742 l -15.2876,0.19175 14.78905,21.64778 14.79141,20.49848 z m 67.38857,-39.88367 c 1.64904,-2.83556 2.89715,-6.05112 3.67344,-9.71874 0.29867,-1.41662 0.50785,-2.81231 0.64032,-4.18477 -1.15977,4.38233 -2.62637,9.21556 -4.31377,13.90353 z"
-             id="path10715"
-             style="fill:url(#linearGradient12007);fill-rule:evenodd"
-             inkscape:connector-curvature="0" />
-          <path
-             class="fil67"
-             d="m 277.07097,455.46154 -0.13945,-0.3835 c -4.23706,6.19987 -9.4352,18.87503 -16.55891,19.68971 -7.12259,0.81463 -12.61589,-13.26547 -16.85644,-19.46774 l -0.7728,-0.63219 1.45728,2.34863 0.84718,0.8681 c 4.23939,6.2022 10.79369,12.89129 15.1958,18.99359 4.3986,-6.10224 11.27718,-12.82162 15.51419,-19.02025 l 1.31319,-2.39628 z"
-             id="path10717"
-             inkscape:connector-curvature="0"
-             style="fill:#91b341;fill-opacity:0.50196078;fill-rule:evenodd" />
-          <path
-             class="fil68"
-             d="m 258.58764,478.72353 0.11156,-0.15573 -0.11156,0.1534 0,0.002 z m 20.21147,-42.44735 -4.86228,0 0,0.002 4.85298,0 0.009,-0.002 z m -6.60313,-10.30911 -0.13015,-1.07495 c -0.009,0.17432 0.0384,0.54387 0.13015,1.07495 z m 7.1807,-22.99121 c 3.60022,-2.94247 3.85356,-4.96687 7.83496,-5.89307 l -0.0267,-0.0383 c -3.9779,0.93201 -4.22311,2.97152 -7.80822,5.93142 z m 0.41022,-2.38466 c -15.25385,8.38813 -11.79314,22.16847 -10.0406,35.91507 l 0.45787,0.88204 1.08309,-0.12085 1.61883,-0.54852 -1.36548,0 -0.36026,-0.12667 -0.0407,-0.31377 -0.9355,-6.16966 -0.009,-0.008 -0.60779,-4.90412 0,-0.0302 c -0.48925,-4.43114 -0.28007,-8.72398 1.03893,-12.77282 1.33876,-4.10691 4.12201,-7.45031 8.11968,-10.86109 0.95874,-0.81696 0.0767,-0.28936 1.04125,-0.94131 z m -35.51649,35.79425 -11.06101,0.19175 0.008,0.002 11.05285,-0.19175 0,-0.002 z m -4.09179,0.58686 7.50608,0.80535 0.88553,0 -0.47879,-2.75537 c 0.54387,-8.01161 1.61766,-20.72508 5.03427,-27.21436 2.70308,-9.29922 18.85181,-20.52062 29.66872,-20.32068 l -0.67054,-0.54271 c -5.92212,1.06798 -11.36199,3.17489 -15.47582,6.15803 -5.89772,3.84427 -11.64319,8.19057 -14.29286,13.22719 -4.50551,8.56013 -4.99244,20.49849 -5.59441,30.21489 l -0.14411,0.42766 -2.34281,0 -0.1441,0 -3.95119,0 z m 85.79762,1.86751 c 1.64903,-2.83556 2.89714,-6.05112 3.67343,-9.71874 0.1383,-0.65776 0.25683,-1.31087 0.36026,-1.957 l -0.30099,-0.0848 c -1.05403,3.785 -2.31609,7.8245 -3.7327,11.76057 z"
-             id="path10719"
-             style="fill:url(#linearGradient12009);fill-rule:evenodd"
-             inkscape:connector-curvature="0" />
-          <g
-             transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-             id="g10721"
-             style="fill-rule:evenodd">
-            <path
-               id="path10723"
-               class="fil69"
-               d="m 25.0314,43.6021 19.2876,0 c -0.659063,1.02639 -1.21773,2.07286 -1.67719,3.13705 -1.76931,4.11501 -2.0516,8.47806 -1.39254,12.9828 l 0,0.02953 0.814971,4.98431 0.01063,0.0083 1.25671,6.27055 0.05315,0.318902 0.375595,2.21814 2.46735,0 0.272838,1.87443 17.986,0 -14.3399,16.1104 -5.05754,5.30794 -24.1586,0 -5.054,-5.30794 -14.3363996,-16.1104 14.6032996,0 0.153545,-1.87443 2.95988,0 0.194884,-2.37759 c 0.32835,-4.0158 0.869302,-7.73986 1.22718,-11.0116 l 0,-0.0094 0.291736,-2.70121 c 0.503156,-4.88864 1.74569,-9.54342 4.06068,-13.8498 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e3ff9c;fill-opacity:0.02352899" />
-            <path
-               id="path10725"
-               class="fil70"
-               d="m 24.0653,45.5545 19.1317,0 c -0.20079,0.393312 -0.386225,0.785443 -0.555125,1.18466 -1.76931,4.11501 -2.0516,8.47806 -1.39254,12.9828 l 0,0.02953 0.814971,4.98431 0.01063,0.0083 1.25671,6.27055 0.05315,0.318902 0.375595,2.21814 2.46735,0 0.272838,1.87443 17.986,0 -14.3399,16.1104 -1.38781,1.45395 -31.4968,0 -1.38545,-1.45395 -14.3363996,-16.1104 14.6032996,0 0.153545,-1.87443 2.95988,0 0.194884,-2.37759 c 0.32835,-4.0158 0.869302,-7.73986 1.22718,-11.0116 l 0,-0.0094 0.291736,-2.70121 c 0.426383,-4.15989 1.39254,-8.14853 3.09453,-11.8974 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e3ff9c;fill-opacity:0.047059" />
-            <path
-               id="path10727"
-               class="fil71"
-               d="m 23.2597,47.4951 19.0774,0 c -1.49175,3.89296 -1.70671,7.99852 -1.08781,12.2269 l 0,0.02953 0.814971,4.98431 0.01063,0.0083 1.25671,6.27055 0.05315,0.318902 0.375595,2.21814 2.46735,0 0.272838,1.87443 17.986,0 -12.1962,13.7021 -38.5587,0 -12.1914996,-13.7021 14.6032996,0 0.153545,-1.87443 2.95988,0 0.194884,-2.37759 c 0.32835,-4.0158 0.869302,-7.73986 1.22718,-11.0116 l 0,-0.0094 0.291736,-2.70121 c 0.355516,-3.44886 1.07718,-6.78079 2.289,-9.95682 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e3ff9c;fill-opacity:0.07450998" />
-            <path
-               id="path10729"
-               class="fil72"
-               d="m 22.5818,49.438 19.1176,0 c -0.905917,3.30477 -0.964973,6.75126 -0.450006,10.284 l 0,0.02953 0.814971,4.98431 0.01063,0.0083 1.25671,6.27055 0.05315,0.318902 0.375595,2.21814 2.46735,0 0.272838,1.87443 17.986,0 -8.76153,9.84225 -45.4281,0 -8.7567996,-9.84225 14.6032996,0 0.153545,-1.87443 2.95988,0 0.194884,-2.37759 c 0.32835,-4.0158 0.869302,-7.73986 1.22718,-11.0116 l 0,-0.0094 0.291736,-2.70121 c 0.284649,-2.75318 0.801978,-5.43196 1.61104,-8.01388 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e3ff9c;fill-opacity:0.09803898" />
-            <path
-               id="path10731"
-               class="fil73"
-               d="m 22.0278,51.3963 19.2333,0 c -0.471266,2.69885 -0.428745,5.48511 -0.01181,8.32569 l 0,0.02953 0.814971,4.98431 0.01063,0.0083 1.25671,6.27055 0.05315,0.318902 0.375595,2.21814 2.46735,0 0.272838,1.87443 17.986,0 -5.33511,5.99535 -52.2773998,0 -5.33392,-5.99535 14.6032998,0 0.153545,-1.87443 2.95988,0 0.194884,-2.37759 c 0.32835,-4.0158 0.869302,-7.73986 1.22718,-11.0116 l 0,-0.0094 0.291736,-2.70121 c 0.214963,-2.06341 0.557487,-4.08548 1.0571,-6.05559 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e3ff9c;fill-opacity:0.12156899" />
-            <path
-               id="path10733"
-               class="fil74"
-               d="m 21.5885,53.3428 19.4223,0 c -0.178349,2.08467 -0.07914,4.21659 0.238586,6.37921 l 0,0.02953 0.814971,4.98431 0.01063,0.0083 1.25671,6.27055 0.05315,0.318902 0.375595,2.21814 2.46735,0 0.272838,1.87443 17.986,0 -1.89569,2.12955 -59.1597996,0 -1.89097,-2.12955 14.6032996,0 0.153545,-1.87443 2.95988,0 0.194884,-2.37759 c 0.32835,-4.0158 0.869302,-7.73986 1.22718,-11.0116 l 0,-0.0094 0.291736,-2.70121 c 0.141734,-1.38899 0.343705,-2.75909 0.617724,-4.10911 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e3ff9c;fill-opacity:0.14509798" />
-            <path
-               id="path10735"
-               class="fil75"
-               d="m 21.2483,55.2857 19.675,0 c -0.0083,1.46104 0.108663,2.9398 0.325988,4.43628 l 0,0.02953 0.814971,4.98431 0.01063,0.0083 1.25671,6.27055 0.05315,0.318902 0.375595,2.21814 2.46735,0 0.02362,0.150002 -29.9649,0 0.01063,-0.150002 2.95988,0 0.194884,-2.37759 c 0.32835,-4.0158 0.869302,-7.73986 1.22718,-11.0116 l 0,-0.0094 0.291736,-2.70121 c 0.07559,-0.726387 0.171262,-1.44923 0.277562,-2.16617 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e3ff9c;fill-opacity:0.17254902" />
-            <path
-               id="path10737"
-               class="fil76"
-               d="m 20.9944,57.2322 19.988,0 c 0.05669,0.82442 0.144096,1.65593 0.266932,2.48979 l 0,0.02953 0.814971,4.98431 0.01063,0.0083 1.02167,5.09888 -23.5267,0 c 0.32835,-3.5091 0.791348,-6.77489 1.10907,-9.68043 l 0,-0.0094 0.291736,-2.70121 0.02362,-0.219688 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e3ff9c;fill-opacity:0.19607801" />
-          </g>
-          <path
-             class="fil77"
-             d="m 321.63215,411.57552 c 0.78791,1.25741 1.48402,2.5706 2.07786,3.93607 l 7.01334,-3.44566 c -0.49854,-1.66414 -1.11562,-3.27251 -1.85356,-4.81928 l -7.12492,4.2882 -0.11272,0.0407 z"
-             id="path10739"
-             inkscape:connector-curvature="0"
-             style="fill:#acd157;fill-rule:evenodd" />
-          <rect
-             class="fil78"
-             x="231.60858"
-             y="436.8866"
-             width="16.587046"
-             height="1.0807363"
-             id="rect10741"
-             style="fill:#bfe56f;fill-rule:evenodd" />
-          <g
-             transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-             id="g10743"
-             style="fill-rule:evenodd">
-            <path
-               id="path10745"
-               class="fil79"
-               d="m 77.1954,99.4914 c 0,0 16.2179,-5.51227 23.5586,-21.4125 1.69845,-3.68272 5.24888,-19.5853 -0.89883,-27.1669"
-               inkscape:connector-curvature="0"
-               style="fill:none" />
-            <path
-               id="path10747"
-               class="fil80"
-               d="m 96.4961,52.8762 7.28395,-4.38431 0.0118,0.0094 c 0.72875,1.59451 1.33821,3.25043 1.82128,4.96896 l -7.071349,3.47603 c -0.578747,-1.41025 -1.26261,-2.77208 -2.04569,-4.07013 z"
-               inkscape:connector-curvature="0"
-               style="fill:#b3d761" />
-            <g
-               id="g10749">
-              <path
-                 id="path10751"
-                 class="fil81"
-                 d="m 98.3859,57.0952 c 2.31145,-1.30395 4.62998,-2.60791 6.94497,-3.9154 0.004,0.0024 0.006,0.0059 0.0118,0.0083 0.63899,1.51419 1.16694,3.08272 1.57443,4.70557 -2.2394,1.02521 -4.47998,2.04806 -6.72056,3.0709 -0.506698,-1.33466 -1.112609,-2.63035 -1.810649,-3.86934 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.93725502" />
-              <path
-                 id="path10753"
-                 class="fil82"
-                 d="m 99.2705,61.3956 c 2.20042,-1.15159 4.40202,-2.29963 6.60599,-3.45477 0,0.0035 0.004,0.0071 0.009,0.0094 0.55394,1.43624 0.99804,2.915 1.33112,4.441 -2.12365,0.890562 -4.24612,1.78231 -6.37213,2.66932 -0.43229,-1.26261 -0.956706,-2.49216 -1.574431,-3.66501 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.87450998" />
-              <path
-                 id="path10755"
-                 class="fil83"
-                 d="m 99.5374,65.5614 c 2.08703,-0.995682 4.17643,-1.98782 6.26464,-2.9835 0.002,0.0024 0.006,0.0059 0.0118,0.0083 0.46418,1.35002 0.82796,2.74492 1.08545,4.17761 -2.00908,0.755915 -4.0158,1.51183 -6.02133,2.26774 -0.36024,-1.19411 -0.8067,-2.35397 -1.340569,-3.47012 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.81176501" />
-              <path
-                 id="path10757"
-                 class="fil84"
-                 d="m 99.3898,69.5406 c 1.97365,-0.839774 3.94965,-1.676 5.92566,-2.51814 0.004,0.0024 0.006,0.0059 0.009,0.0083 0.37796,1.27206 0.66024,2.57956 0.84213,3.91658 -1.89215,0.62363 -3.78076,1.24135 -5.67054,1.86262 -0.28464,-1.11852 -0.653153,-2.20987 -1.106705,-3.26933 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.74901997" />
-              <path
-                 id="path10759"
-                 class="fil85"
-                 d="m 98.928,73.332 c 1.86262,-0.68741 3.72524,-1.37128 5.58668,-2.05514 0,0 0.004,0.0035 0.009,0.0071 0.28819,1.19293 0.48898,2.41066 0.5941,3.65556 -1.77286,0.487801 -3.54453,0.974421 -5.319749,1.45986 -0.210239,-1.04647 -0.500794,-2.07168 -0.870483,-3.06736 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.68627499" />
-              <path
-                 id="path10761"
-                 class="fil86"
-                 d="m 98.1154,76.8848 c 1.74805,-0.530321 3.49729,-1.05828 5.2477,-1.58624 0,0 0.004,0.0035 0.006,0.0059 0.20433,1.11261 0.32126,2.24412 0.35197,3.39217 -1.65593,0.354335 -3.31067,0.705127 -4.970141,1.05592 -0.13701,-0.972059 -0.350792,-1.93113 -0.635441,-2.86775 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.62352899" />
-              <path
-                 id="path10763"
-                 class="fil87"
-                 d="m 96.7394,80.0856 c 1.63467,-0.375595 3.27169,-0.747647 4.90872,-1.12206 0,0.0024 0,0.0024 0.006,0.0059 0.11456,1.03466 0.15,2.07522 0.10511,3.13114 -1.53781,0.218507 -3.080345,0.434651 -4.618165,0.653158 -0.06614,-0.902373 -0.198428,-1.79294 -0.40158,-2.66814 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.56078384" />
-              <path
-                 id="path10765"
-                 class="fil88"
-                 d="m 95.0988,82.9935 c 1.5201,-0.218507 3.04374,-0.437013 4.56738,-0.656701 0,0.0035 0,0.0035 0.0024,0.0059 0.02717,0.954342 -0.01417,1.9075 -0.13701,2.87011 -1.42206,0.0815 -2.84649,0.165356 -4.26738,0.245672 0.0059,-0.826782 -0.04843,-1.65238 -0.165356,-2.46499 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.50196078" />
-              <path
-                 id="path10767"
-                 class="fil89"
-                 d="m 93.261,85.6215 c 1.40553,-0.06378 2.81578,-0.12638 4.22486,-0.188979 0,0 0.0035,0.0024 0.0059,0.0059 -0.0626,0.869302 -0.185435,1.7386 -0.383863,2.60554 -1.3075,-0.05433 -2.61145,-0.105119 -3.91895,-0.155907 0.08031,-0.755915 0.103938,-1.51419 0.07205,-2.26656 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.43921599" />
-              <path
-                 id="path10769"
-                 class="fil90"
-                 d="m 91.2661,87.9932 c 1.29214,0.09331 2.59137,0.185435 3.88706,0.278744 0,0 0,0 0.0024,0.0035 -0.146458,0.791348 -0.353154,1.57089 -0.625992,2.34452 -1.19057,-0.188979 -2.37877,-0.374414 -3.56934,-0.561031 0.153545,-0.680323 0.257483,-1.37364 0.305909,-2.06577 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.37647101" />
-              <path
-                 id="path10771"
-                 class="fil91"
-                 d="m 89.1519,90.0921 c 1.17875,0.249216 2.36341,0.498431 3.54808,0.744104 0,0.0024 0,0.0024 0.0024,0.0059 -0.236223,0.711032 -0.524416,1.40317 -0.872845,2.08113 -1.07364,-0.323626 -2.14727,-0.64489 -3.21736,-0.96261 0.224412,-0.611819 0.407485,-1.23545 0.53977,-1.86853 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.31372501" />
-              <path
-                 id="path10773"
-                 class="fil92"
-                 d="m 86.9597,91.97 c 1.06773,0.40158 2.13782,0.806703 3.20909,1.20828 -0.0035,0 0,0.0024 0,0.0059 -0.323626,0.629535 -0.693316,1.23545 -1.11616,1.81774 -0.956705,-0.455911 -1.91341,-0.911822 -2.87011,-1.36773 0.303547,-0.537408 0.564574,-1.09135 0.777175,-1.66419 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.25097997" />
-              <path
-                 id="path10775"
-                 class="fil93"
-                 d="m 84.7073,93.6165 c 0.954342,0.557487 1.91105,1.11497 2.87011,1.676 -0.0024,0 -0.0024,0 0,0.0024 -0.413391,0.552763 -0.863396,1.06773 -1.36419,1.55671 -0.837412,-0.590558 -1.676,-1.18112 -2.51578,-1.76931 0.374414,-0.464179 0.713395,-0.953161 1.00985,-1.46577 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.18823499" />
-              <path
-                 id="path10777"
-                 class="fil94"
-                 d="m 82.4231,95.0527 c 0.838593,0.713395 1.68427,1.42679 2.52759,2.14373 0,0 0,0 0,0.0035 -0.498431,0.467722 -1.03112,0.89883 -1.6075,1.29214 -0.722844,-0.725206 -1.44214,-1.45159 -2.16499,-2.17444 0.446462,-0.389769 0.863396,-0.812608 1.2449,-1.26498 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.12549002" />
-              <path
-                 id="path10779"
-                 class="fil95"
-                 d="m 80.114,96.2965 c 0.728749,0.86694 1.45632,1.73742 2.18861,2.60672 -0.0035,0 -0.0035,0 0,0.0024 -0.588196,0.389769 -1.20238,0.732292 -1.85317,1.0323 -0.605913,-0.861034 -1.21183,-1.71853 -1.81774,-2.57602 0.522054,-0.321264 1.02048,-0.674418 1.4823,-1.06537 z"
-                 inkscape:connector-curvature="0"
-                 style="fill:#b3d761;fill-opacity:0.06274498" />
-            </g>
-            <path
-               id="path10781"
-               class="fil96"
-               d="m 77.7872,97.3229 1.84963,3.07209 -0.0035,0.005 c -0.673237,0.30828 -1.37128,0.56458 -2.09648,0.76773 L 76.07108,98.1854 c 0.594102,-0.244491 1.16812,-0.532684 1.71616,-0.862215 z"
-               inkscape:connector-curvature="0"
-               style="fill:#b3d761;fill-opacity:0" />
-          </g>
-          <g
-             transform="matrix(0.98390976,0,0,0.98390976,228.52142,363.22236)"
-             id="g10783"
-             style="fill-rule:evenodd">
-            <path
-               id="path10785"
-               class="fil97"
-               d="m 19.6502,63.9043 21.4054,0 c 0.04134,0.611819 0.09803,1.22954 0.171262,1.84963 0.08858,0.759458 0.800797,6.12409 1.54136,11.5702 l 20.9459,0 -2.57602,3.5717 -58.3153,0 -2.5772,-3.5717 18.24,0 c 0.363784,-5.03864 0.937807,-10.8084 1.16458,-13.4199 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e6ffa8;fill-opacity:0.02352899" />
-            <path
-               id="path10787"
-               class="fil98"
-               d="m 19.5971,64.5244 21.5058,0 0.124017,1.22954 c 0.08858,0.759458 0.800797,6.12409 1.54136,11.5702 l 20.9459,0 -1.689,2.34215 -60.0893,0 -1.69018,-2.34215 18.24,0 c 0.335437,-4.6725 0.855129,-9.96863 1.11143,-12.7998 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e6ffa8;fill-opacity:0.047059" />
-            <path
-               id="path10789"
-               class="fil99"
-               d="m 19.5404,65.1457 21.6203,0 0.06614,0.608275 c 0.08858,0.759458 0.800797,6.12409 1.541359,11.5702 l 20.945901,0 -0.800798,1.10907 -61.8656995,0 -0.801978,-1.10907 18.2400005,0 c 0.312996,-4.34887 0.785443,-9.23988 1.05474,-12.1785 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e6ffa8;fill-opacity:0.07450998" />
-            <path
-               id="path10791"
-               class="fil100"
-               d="m 19.479,65.767 21.7479,0 c 0.09449,0.791348 0.794892,6.05677 1.526,11.4344 l -24.2578,0 c 0.290555,-4.0217 0.712213,-8.48987 0.98387,-11.4344 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e6ffa8;fill-opacity:0.09803898" />
-            <path
-               id="path10793"
-               class="fil101"
-               d="m 19.4235,66.3929 21.8826,0 1.27915,9.58122 -23.9979,0 c 0.262208,-3.39689 0.595283,-6.96859 0.836231,-9.58122 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e6ffa8;fill-opacity:0.12156899" />
-            <path
-               id="path10795"
-               class="fil102"
-               d="m 19.3656,67.0142 22.0231,0 1.0323,7.72805 -23.7357,0 c 0.22205,-2.74728 0.474809,-5.51818 0.680323,-7.72805 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e6ffa8;fill-opacity:0.14509798" />
-            <path
-               id="path10797"
-               class="fil103"
-               d="m 19.3089,67.6319 22.1578,0 0.785443,5.87724 -23.4664,0 c 0.174805,-2.08113 0.362603,-4.12564 0.523235,-5.87724 z"
-               inkscape:connector-curvature="0"
-               style="fill:#e6ffa8;fill-opacity:0.17254902" />
-            <polygon
-               id="polygon10799"
-               class="fil104"
-               points="19.2522,68.2556 41.5529,68.2556 42.0879,72.2796 18.8908,72.2796 "
-               style="fill:#e6ffa8;fill-opacity:0.19607801" />
-          </g>
-          <rect
-             class="fil78"
-             x="269.52252"
-             y="436.8866"
-             width="19.26269"
-             height="1.0808249"
-             id="rect10801"
-             style="fill:#bfe56f;fill-rule:evenodd" />
-          <rect
-             class="fil105"
-             x="231.60858"
-             y="437.91272"
-             width="16.587046"
-             height="1.0807363"
-             id="rect10803"
-             style="fill:#e3ff9c;fill-rule:evenodd" />
-          <rect
-             class="fil105"
-             x="269.52252"
-             y="437.91272"
-             width="19.26269"
-             height="1.0808249"
-             id="rect10805"
-             style="fill:#e3ff9c;fill-rule:evenodd" />
-          <path
-             class="fil106"
-             d="m 260.25408,478.19025 14.38349,-19.93716 -10e-4,-10e-4 14.26611,-21.1946 -17.06798,0 -0.43115,0 -0.0558,-0.43114 -0.94363,-7.07843 c -0.26496,-2.09994 -0.45439,-3.6223 -0.4939,-3.99766 -0.45671,-4.14642 -0.65311,-8.13595 0.18245,-11.88957 0.8437,-3.785 2.73213,-7.31201 6.44159,-10.4811 1.53398,-1.3097 3.13305,-2.42532 4.77047,-3.35269 6.61823,-3.74781 13.88719,-4.43113 20.6194,-2.86112 6.7205,1.56769 12.91569,5.38406 17.40261,10.6403 1.41197,1.656 3.35385,4.01044 3.62114,6.18475 l 0.31377,-0.13713 -0.41487,0.20337 -0.22661,-0.40209 c -0.94945,-1.67576 -2.78675,-3.74084 -4.03951,-5.20975 -4.3521,-5.09819 -10.36135,-8.80184 -16.87966,-10.3219 -6.50666,-1.51772 -13.52698,-0.85997 -19.91276,2.75653 -1.57815,0.89366 -3.12491,1.97327 -4.61475,3.24578 -3.52933,3.01452 -5.32364,6.36024 -6.12316,9.94654 -0.80535,3.61766 -0.61011,7.51306 -0.16386,11.57117 l 0,10e-4 c 0.0395,0.37304 0.22777,1.8896 0.49157,3.98024 l 0.88902,6.64729 17.56653,0 0.93201,0 -0.52644,0.76932 -14.79141,21.96391 -0.008,0.009 -14.78787,20.49848 -0.39628,0.55084 -0.39861,-0.55084 -14.79141,-20.49848 -0.008,-0.009 -14.78905,-21.96391 -0.51598,-0.75654 0.91574,-0.0105 14.83441,-0.18594 c 0.24056,-3.42822 0.56246,-6.77047 0.80186,-9.50956 0.12086,-1.3806 0.2208,-2.52876 0.2789,-3.26554 0.51017,-6.51364 2.42417,-12.6089 5.86403,-18.11506 3.30389,-5.28993 8.01858,-10.03952 14.24396,-14.09293 2.48344,-1.61766 5.06565,-2.9355 7.699,-3.96745 9.76523,-3.828 20.3381,-3.79662 29.75353,-0.82859 9.42124,2.9692 17.69896,8.88552 22.86458,16.81925 1.29576,1.98954 2.08251,4.18826 2.95409,6.4137 l 0.1871,0.48111 -0.0918,0.002 0.0732,-0.0384 c -1.36664,-2.4997 -2.04649,-4.37419 -3.47123,-6.56129 -5.03776,-7.73735 -13.59783,-13.27481 -22.8088,-16.17774 -9.21556,-2.90412 -19.556,-2.93782 -29.10277,0.80534 -2.57873,1.01104 -5.10167,2.2975 -7.52236,3.87448 -6.09992,3.97211 -10.71468,8.61823 -13.94416,13.78851 -3.35386,5.36896 -5.22022,11.31438 -5.7176,17.67112 l 0,0.002 c -0.0616,0.79373 -0.16154,1.92794 -0.27891,3.27252 -0.25334,2.88785 -0.59616,6.4718 -0.83323,9.943 l -0.0302,0.45206 -0.45439,0.006 -14.37187,0.18013 14.27309,21.20857 -0.001,0.001 14.38692,19.93717 z"
-             id="path10807"
-             style="fill:url(#linearGradient12011);fill-rule:nonzero"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="matrix(0.46875,0,0,0.46875,109.69963,126.4067)"
-           id="g10811"
-           inkscape:label="Layer 1">
-          <g
-             id="g10813">
-            <rect
-               style="fill:none"
-               id="rect10815"
-               width="128"
-               height="128"
-               x="390.28571"
-               y="642.64789" />
-            <g
-               id="g10817">
-              <circle
-                 r="61.5"
-                 cy="706.64789"
-                 cx="454.28571"
-                 id="circle10819"
-                 style="fill:#2080bb;fill-opacity:1"
-                 sodipodi:cx="454.28571"
-                 sodipodi:cy="706.64789"
-                 sodipodi:rx="61.5"
-                 sodipodi:ry="61.5"
-                 d="m 515.78571,706.64789 c 0,33.96551 -27.53449,61.5 -61.5,61.5 -33.96552,0 -61.5,-27.53449 -61.5,-61.5 0,-33.96551 27.53448,-61.5 61.5,-61.5 33.96551,0 61.5,27.53449 61.5,61.5 z" />
-              <g
-                 inkscape:label="Livello 1"
-                 id="g10821"
-                 transform="matrix(0.70312499,0,0,0.70312499,346.63951,239.11394)"
-                 style="display:inline">
-                <g
-                   id="g10823"
-                   transform="matrix(0.84937381,0,0,0.84937381,44.080043,556.21737)">
-                  <path
-                     style="fill:#ffffff;stroke:none"
-                     d="m 154.72852,68.25 a 48.970612,48.9935 0 0 0 -48.97071,48.99219 48.970612,48.9935 0 0 0 48.97071,48.99414 48.970612,48.9935 0 0 0 48.9707,-48.99414 A 48.970612,48.9935 0 0 0 154.72852,68.25 z m 0,10.992188 a 38,38 0 0 1 38,38.000002 38,38 0 0 1 -38,38 38,38 0 0 1 -38,-38 38,38 0 0 1 38,-38.000002 z"
-                     id="path10825"
-                     inkscape:connector-curvature="0" />
-                  <g
-                     id="g10827"
-                     style="fill:#ffffff;fill-opacity:1"
-                     transform="matrix(1.545991,0,0,1.5467136,1793.9126,1140.4135)">
-                    <path
-                       style="fill:#ffffff;fill-opacity:1;stroke:none"
-                       d="m -1077.409,-703.2263 c -26.8785,0 -48.673,21.79451 -48.673,48.67308 0,26.87861 21.7945,48.66381 48.673,48.66381 20.6275,0 38.2524,-12.835 45.3372,-30.95267 -6.9662,8.36417 -17.451,13.68758 -29.1871,13.68758 -20.974,0 -37.9777,-16.99445 -37.9777,-37.96836 0,-20.97393 17.0037,-37.97765 37.9777,-37.97765 1.3235,0 2.6327,0.063 3.9213,0.19515 -6.1202,-2.7747 -12.9141,-4.32094 -20.0714,-4.32094 z"
-                       id="path10829"
-                       inkscape:connector-curvature="0" />
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
Not Available
benbullard79 [@T] cox.netNo Comment.46d 09hrs
benbullard79 [@T] cox.netNo Comment.46d 09hrs