diff --git a/README.md b/README.md
index e1a8198deb553be805daa808ab166ef713656d90..be7710ef590aecc9f3be35b988c3eb46bded1f9c 100644
--- a/README.md
+++ b/README.md
@@ -1,63 +1 @@
-![CI badge](https://gitlab.com/xphnx/ameixa/badges/master/build.svg)
-
-Icon pack compatible with Trebuchet, Kiss Launcher, Lawnchair Launcher, OpenLauncher, Adw, and many more launchers (basically any launcher that supports icon packs).
-It's a material design inspired theme that aims to provide a consistent and minimalistic look to your device. Code forked from [Icecons icon pack](https://github.com/1C3/ICEcons). Only [F-Droid](https://f-droid.org/) hosted apps are supported.
-
-# Contributions are welcome 
-
-For requesting icons or contributing, please use the [Issue Tracker](https://gitlab.com/xphnx/ameixa/issues) or [Merge Requests](https://gitlab.com/xphnx/ameixa/merge_requests)
-
-#### What happens?
-  
-* [ ] The activityname line is in [appfilter.xml](https://gitlab.com/xphnx/ameixa/blob/master/app/src/main/res/xml/appfilter.xml)
-* [ ] The activityname has changed or is not in [appfilter.xml](https://gitlab.com/xphnx/ameixa/blob/master/app/src/main/res/xml/appfilter.xml) --> Use [Turtl](https://f-droid.org/packages/org.xphnx.iconsubmit) to find out the activityname line to be included in appfilter.xml
-
-</br>
-* [ ] The icon is in the [icons folder](https://gitlab.com/xphnx/ameixa/tree/master/icons)
-* [ ] The icon is in the [todo/wip folder](https://gitlab.com/xphnx/ameixa/tree/master/todo/wip)
-* [ ] There is no proper icon in todo/wip or icons --> Grab a [template](https://gitlab.com/xphnx/ameixa/tree/master/templates) and draw a new icon. (More [info](https://gitlab.com/xphnx/twelf_cm12_theme/wikis/home))
-
-</br>
-* [ ] The icon file name and the drawable string in the activityname line doesn't match --> Fix activityname
-
-
-#### What to do?  (You have 4 options:)
-
-1. Write a new activityname in [Issue Tracker](https://gitlab.com/xphnx/ameixa/issues)
-2. Attach the new icon (.svg) in [Issue Tracker](https://gitlab.com/xphnx/ameixa/issues)
-3. [MR](https://gitlab.com/xphnx/ameixa/merge_requests) activityname lines into appfilter.xml and/or icon files (.svg) into todo/wip
-4. [MR](https://gitlab.com/xphnx/ameixa/merge_requests) activityname and/or icon data (.pngs and xml) after running the script [process_wipsvg-xml.sh](https://gitlab.com/xphnx/ameixa/blob/master/process_wipsvg-xml.sh)
-
-# Screenshots
-
-![screenshot1-thumb](/uploads/c1b689614b683cff658c3d8245ef6cea/screenshot1-thumb.jpg)
-![screenshot2-thumb](/uploads/833855214502447743662f1e010db19e/screenshot2-thumb.jpg)
-
-
-<!--<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/97c6faf3cad4619e8079327a5e3d3ac4/Screenshot_2015-05-23-07-53-03.png" alt="with a dark background" width="300" />
-<img src="https://gitlab.com/xphnx/ameixa/uploads/6a11ca228921b18225e700f6d37fcbe8/photo5463050469409663049.jpg" alt="with a dark background" width="300" />
-
- <img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/b0ef81d60e8f4470e41cfec54c4a85b0/Screenshot_2015-05-23-21-03-30.png" alt="into apex launcher" width="300" />
-
-<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/081953c26fe1f8d30276f1d16bb0f672/Screenshot_2015-05-22-10-51-04.png" alt="light background" width="300" />
-<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/cec2077cb5bb09008b98d7c8681af67c/Screenshot_2015-05-22-23-47-06.png" alt="apps settings" width="300" />
-
-<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/27787db387074995a36f18c262f4abba/Screenshot_2015-06-09-22-21-20.png" alt="share feneec" width="300" />
-<img src="https://gitlab.com/xphnx/twelf_cm12_theme/uploads/a49b1be4708a70c2e3c554342ba21edb/Screenshot_2015-05-22-23-55-18.png" alt="inside afw++" width="300" />
--->
-
-# Installation
-<a href="https://f-droid.org/packages/org.xphnx.ameixa">
-    <img src="https://f-droid.org/badge/get-it-on.png"
-    alt="Get it on F-Droid" height="80">
-</a>
-<a href="https://gitlab.com/xphnx/ameixa/-/jobs/artifacts/master/download?job=build">
-    <img src="https://hike.in/images/hike5.0/apk.png"
-    alt="Download the latest build" height="80">
-</a>
-
-# License
-
-<img src="https://gnu.org/graphics/gplv3-127x51.png" />
-
-[GPLv3](https://www.gnu.org/licenses/gpl-3.0.html) and other libre / open licenses for the artwork (see [CREDITS](https://gitlab.com/xphnx/ameixa/blob/master/CREDITS.md) for more details)
+forked from [ameixa](https://gitlab.com/xphnx/ameixa) to add some non free icons
diff --git a/app/build.gradle b/app/build.gradle
index 023a2e20feec7c96e3e7294047121683015c8880..4a299b67bf614386586a12bf91ac773030c8e30f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion '28.0.3'
 
     defaultConfig {
-        applicationId "org.xphnx.ameixa"
+        applicationId "org.benoitharrault.ameixanonfree"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 412
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f34411a86dac8a19525b6c26279f0c748cd149e5..8018040e7e4e75bca53cd93cb4bb57b05394c801 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.xphnx.ameixa"
+    package="org.benoitharrault.ameixanonfree"
     android:installLocation="auto">
 
     <application
@@ -33,4 +33,4 @@
         <activity android:name=".activities.LicenseActivity" />
         <activity android:name=".activities.IconActivity" />
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/org/xphnx/ameixa/activities/BaseActivity.java b/app/src/main/java/org/xphnx/ameixa/activities/BaseActivity.java
index 9281d37af85663d216d61fa4807e0ee13d48e08c..7a138e347c68e5ec674fc132917e66c5fafe162d 100644
--- a/app/src/main/java/org/xphnx/ameixa/activities/BaseActivity.java
+++ b/app/src/main/java/org/xphnx/ameixa/activities/BaseActivity.java
@@ -1,10 +1,10 @@
-package org.xphnx.ameixa.activities;
+package org.benoitharrault.ameixanonfree.activities;
 
 import android.os.Build;
 import android.os.Bundle;
 import android.view.WindowManager;
 
-import org.xphnx.ameixa.R;
+import org.benoitharrault.ameixanonfree.R;
 
 import androidx.appcompat.app.AppCompatActivity;
 
diff --git a/app/src/main/java/org/xphnx/ameixa/activities/IconActivity.java b/app/src/main/java/org/xphnx/ameixa/activities/IconActivity.java
index 850dd762b7268363ccefe86c0698792b006b8cf1..b302990e75fe4b2a2f67ee931ab8446707ccd5ea 100644
--- a/app/src/main/java/org/xphnx/ameixa/activities/IconActivity.java
+++ b/app/src/main/java/org/xphnx/ameixa/activities/IconActivity.java
@@ -1,4 +1,4 @@
-package org.xphnx.ameixa.activities;
+package org.benoitharrault.ameixanonfree.activities;
 
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -9,9 +9,9 @@ import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.ScrollView;
 
-import org.xphnx.ameixa.R;
-import org.xphnx.ameixa.utils.ImageUtils;
-import org.xphnx.ameixa.utils.ScreenUtils;
+import org.benoitharrault.ameixanonfree.R;
+import org.benoitharrault.ameixanonfree.utils.ImageUtils;
+import org.benoitharrault.ameixanonfree.utils.ScreenUtils;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/org/xphnx/ameixa/activities/LicenseActivity.java b/app/src/main/java/org/xphnx/ameixa/activities/LicenseActivity.java
index 4046f7cdec230ab319e838b674f4c86e81b654bf..c66bd0be0713ba9e8d137c3856d200905555c526 100644
--- a/app/src/main/java/org/xphnx/ameixa/activities/LicenseActivity.java
+++ b/app/src/main/java/org/xphnx/ameixa/activities/LicenseActivity.java
@@ -1,4 +1,4 @@
-package org.xphnx.ameixa.activities;
+package org.benoitharrault.ameixanonfree.activities;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -9,8 +9,8 @@ import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 
-import org.xphnx.ameixa.R;
-import org.xphnx.ameixa.utils.ScreenUtils;
+import org.benoitharrault.ameixanonfree.R;
+import org.benoitharrault.ameixanonfree.utils.ScreenUtils;
 
 public class LicenseActivity extends BaseActivity {
 
diff --git a/app/src/main/java/org/xphnx/ameixa/activities/MainActivity.java b/app/src/main/java/org/xphnx/ameixa/activities/MainActivity.java
index 142d6f7df191b9f1980f361cd41ae090a50f4332..1286af1e29c5a1c17070c88e2bbc354829c2f0b1 100644
--- a/app/src/main/java/org/xphnx/ameixa/activities/MainActivity.java
+++ b/app/src/main/java/org/xphnx/ameixa/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package org.xphnx.ameixa.activities;
+package org.benoitharrault.ameixanonfree.activities;
 
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
@@ -12,9 +12,9 @@ import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 
-import org.xphnx.ameixa.R;
-import org.xphnx.ameixa.utils.ImageUtils;
-import org.xphnx.ameixa.utils.ScreenUtils;
+import org.benoitharrault.ameixanonfree.R;
+import org.benoitharrault.ameixanonfree.utils.ImageUtils;
+import org.benoitharrault.ameixanonfree.utils.ScreenUtils;
 
 import androidx.core.content.ContextCompat;
 
diff --git a/app/src/main/java/org/xphnx/ameixa/async/BitmapLoadTask.java b/app/src/main/java/org/xphnx/ameixa/async/BitmapLoadTask.java
index dc0c0cc134bffc4c40356bdcb0004ef919626961..230ed11940c9d6e2fb60b0aa0646e086b62f19a7 100644
--- a/app/src/main/java/org/xphnx/ameixa/async/BitmapLoadTask.java
+++ b/app/src/main/java/org/xphnx/ameixa/async/BitmapLoadTask.java
@@ -1,11 +1,11 @@
-package org.xphnx.ameixa.async;
+package org.benoitharrault.ameixanonfree.async;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
 
-import org.xphnx.ameixa.interfaces.BitmapListener;
-import org.xphnx.ameixa.utils.ImageUtils;
+import org.benoitharrault.ameixanonfree.interfaces.BitmapListener;
+import org.benoitharrault.ameixanonfree.utils.ImageUtils;
 
 public class BitmapLoadTask extends AsyncTask<Integer, Void, Bitmap> {
 
diff --git a/app/src/main/java/org/xphnx/ameixa/interfaces/BitmapListener.java b/app/src/main/java/org/xphnx/ameixa/interfaces/BitmapListener.java
index f79ac2a4c3a0405f6c80d55eaf84f03e42edc499..d043db9ca80a38543fed7bb4cd5c66672e598f2b 100644
--- a/app/src/main/java/org/xphnx/ameixa/interfaces/BitmapListener.java
+++ b/app/src/main/java/org/xphnx/ameixa/interfaces/BitmapListener.java
@@ -1,4 +1,4 @@
-package org.xphnx.ameixa.interfaces;
+package org.benoitharrault.ameixanonfree.interfaces;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/org/xphnx/ameixa/utils/ImageUtils.java b/app/src/main/java/org/xphnx/ameixa/utils/ImageUtils.java
index 70f2973ca70541c5dfe11424828336de63aaa9c2..088894a8af982ba7d49a094cb2bdffbaaefa7fc4 100644
--- a/app/src/main/java/org/xphnx/ameixa/utils/ImageUtils.java
+++ b/app/src/main/java/org/xphnx/ameixa/utils/ImageUtils.java
@@ -1,4 +1,4 @@
-package org.xphnx.ameixa.utils;
+package org.benoitharrault.ameixanonfree.utils;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -8,7 +8,7 @@ import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.widget.ImageView;
 
-import org.xphnx.ameixa.async.BitmapLoadTask;
+import org.benoitharrault.ameixanonfree.async.BitmapLoadTask;
 
 import androidx.core.graphics.drawable.DrawableCompat;
 
diff --git a/app/src/main/java/org/xphnx/ameixa/utils/ScreenUtils.java b/app/src/main/java/org/xphnx/ameixa/utils/ScreenUtils.java
index 729ab46f57533a6e56a41a594f8b4d6f2431a80c..bbaa8218c2af09a104ca5dee967c1b8eb3542887 100644
--- a/app/src/main/java/org/xphnx/ameixa/utils/ScreenUtils.java
+++ b/app/src/main/java/org/xphnx/ameixa/utils/ScreenUtils.java
@@ -1,4 +1,4 @@
-package org.xphnx.ameixa.utils;
+package org.benoitharrault.ameixanonfree.utils;
 
 import android.content.Context;
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 53adf7c4ca3c75b9cd4af4198bef48147dceebce..4ffd7841d626528679253901cd49cf792df05cc2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,11 +3,10 @@
     <string name="icons">Iconos</string>
     <string name="sourcecodetext">Código Fuente</string>
     <string name="licensetext">Licencia</string>
-    <string name="sourcecodelink">https://gitlab.com/xphnx/ameixa</string>
+    <string name="sourcecodelink">https://git.harrault.fr/android/ameixa-nonfree</string>
     <string name="codelicense">El código fuente de este programa está disponible bajo la GNU General Public License v3.</string>
     <string name="imageslicense">Las imágenes incluidas en este programa están disponibles bajo la licencia Creative Commons Attribution Share Alike 4.0, excepto para aquellos trabajos derivados que no sean compatibles con la misma (ver créditos).</string>
     <string name="urlgplv3">https://choosealicense.com/licenses/gpl-3.0</string>
     <string name="urlccbysa4">https://creativecommons.org/licenses/by-sa/4.0</string>
     <bool name="config_iconpack">true</bool>
 </resources>
-
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01bb406e8ce420aa527cb5f2ed15a4886397d747..22c07e277d8b9fa1dd047df11493e3f1027fca4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">Ameixa</string>
+    <string name="app_name" translatable="false">Ameixa non-free</string>
     <string name="icons">Icons</string>
     <string name="sourcecodetext">Source Code</string>
     <string name="licensetext">License</string>
-    <string name="sourcecodelink">https://gitlab.com/xphnx/ameixa</string>
+    <string name="sourcecodelink">https://git.harrault.fr/android/ameixa-nonfree</string>
     <string name="codelicense">This program\'s source code is available under the GNU General Public License v3.</string>
     <string name="imageslicense">The images included in this program are available under the Creative Commons Attribution Share Alike 4.0 license, except for non-compatible derivative licenses (see credits).</string>
     <string name="urlgplv3">https://choosealicense.com/licenses/gpl-3.0</string>
     <string name="urlccbysa4">https://creativecommons.org/licenses/by-sa/4.0</string>
     <bool name="config_iconpack">true</bool>
-</resources>
\ No newline at end of file
+</resources>