diff --git a/app/build.gradle b/app/build.gradle
index 973172b..f3e576b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
     defaultConfig {
-        applicationId "com.thegreek.niko.logviewer_for_openHAB"
+        applicationId "com.cyb3rko.logviewerforopenhab"
         minSdkVersion 23
         targetSdkVersion 29
         versionCode 6
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5303064..8dba8b7 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="com.thegreek.niko.logviewer_for_openHAB" >
+    package="com.cyb3rko.logviewerforopenhab" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/About.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/About.java
similarity index 98%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/About.java
rename to app/src/main/java/com/cyb3rko/logviewerforopenhab/About.java
index b9cfd49..b4f5a6e 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/About.java
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/About.java
@@ -1,4 +1,4 @@
-package com.thegreek.niko.logviewer_for_openHAB;
+package com.cyb3rko.logviewerforopenhab;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/EndUserConsent.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/EndUserConsent.java
similarity index 99%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/EndUserConsent.java
rename to app/src/main/java/com/cyb3rko/logviewerforopenhab/EndUserConsent.java
index 01602d9..8f40da8 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/EndUserConsent.java
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/EndUserConsent.java
@@ -1,4 +1,4 @@
-package com.thegreek.niko.logviewer_for_openHAB;
+package com.cyb3rko.logviewerforopenhab;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/IconCredits.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/IconCredits.java
similarity index 98%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/IconCredits.java
rename to app/src/main/java/com/cyb3rko/logviewerforopenhab/IconCredits.java
index 4a34eb4..bf1afe5 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/IconCredits.java
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/IconCredits.java
@@ -1,4 +1,4 @@
-package com.thegreek.niko.logviewer_for_openHAB;
+package com.cyb3rko.logviewerforopenhab;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainActivity.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/MainActivity.java
similarity index 98%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainActivity.java
rename to app/src/main/java/com/cyb3rko/logviewerforopenhab/MainActivity.java
index 9e628df..bd78673 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainActivity.java
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/MainActivity.java
@@ -1,4 +1,4 @@
-package com.thegreek.niko.logviewer_for_openHAB;
+package com.cyb3rko.logviewerforopenhab;
 
 import android.Manifest;
 import android.app.Activity;
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainFragment.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/MainFragment.java
similarity index 99%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainFragment.java
rename to app/src/main/java/com/cyb3rko/logviewerforopenhab/MainFragment.java
index 376b5db..e963019 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainFragment.java
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/MainFragment.java
@@ -1,4 +1,4 @@
-package com.thegreek.niko.logviewer_for_openHAB;
+package com.cyb3rko.logviewerforopenhab;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/PrivacyPolicy.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/PrivacyPolicy.java
similarity index 97%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/PrivacyPolicy.java
rename to app/src/main/java/com/cyb3rko/logviewerforopenhab/PrivacyPolicy.java
index 3d96952..41cb3af 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/PrivacyPolicy.java
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/PrivacyPolicy.java
@@ -1,4 +1,4 @@
-package com.thegreek.niko.logviewer_for_openHAB;
+package com.cyb3rko.logviewerforopenhab;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/TermsOfUse.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/TermsOfUse.java
similarity index 97%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/TermsOfUse.java
rename to app/src/main/java/com/cyb3rko/logviewerforopenhab/TermsOfUse.java
index 1f64966..00e548c 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/TermsOfUse.java
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/TermsOfUse.java
@@ -1,4 +1,4 @@
-package com.thegreek.niko.logviewer_for_openHAB;
+package com.cyb3rko.logviewerforopenhab;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/UpdateDialog.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/UpdateDialog.java
similarity index 99%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/UpdateDialog.java
rename to app/src/main/java/com/cyb3rko/logviewerforopenhab/UpdateDialog.java
index 3bcb5d5..07dc11f 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/UpdateDialog.java
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/UpdateDialog.java
@@ -1,4 +1,4 @@
-package com.thegreek.niko.logviewer_for_openHAB;
+package com.cyb3rko.logviewerforopenhab;
 
 import android.Manifest;
 import android.app.AlertDialog;
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/WebViewFragment.java b/app/src/main/java/com/cyb3rko/logviewerforopenhab/WebViewFragment.java
similarity index 99%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/WebViewFragment.java
rename to app/src/main/java/com/cyb3rko/logviewerforopenhab/WebViewFragment.java
index bc521de..149b886 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/WebViewFragment.java
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/WebViewFragment.java
@@ -1,4 +1,4 @@
-package com.thegreek.niko.logviewer_for_openHAB;
+package com.cyb3rko.logviewerforopenhab;
 
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d537c05..9a6de18 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,27 +24,27 @@
     <string name="update_dialog_button_2">Cancel</string>
     <string name="update_dialog_changelog">changelog</string>
     <string name="update_dialog_error">Missing permission, give it on next app start</string>
-    <string name="update_check_link" translatable="false">https://raw.githubusercontent.com/nikothegreek/logviewer-for-openhab-app/master/app/build.gradle</string>
-    <string name="update_download_link" translatable="false">https://github.com/nikothegreek/logviewer-for-openhab-app/releases/download/v%1$s/LogViewerforopenHAB_%1$s.apk</string>
-    <string name="update_changelog_link" translatable="false">https://github.com/nikothegreek/logviewer-for-openhab-app/releases/latest</string>
+    <string name="update_check_link" translatable="false">https://raw.githubusercontent.com/cyb3rko/logviewer-for-openhab-app/master/app/build.gradle</string>
+    <string name="update_download_link" translatable="false">https://github.com/cyb3rko/logviewer-for-openhab-app/releases/download/v%1$s/LogViewerforopenHAB_%1$s.apk</string>
+    <string name="update_changelog_link" translatable="false">https://github.com/cyb3rko/logviewer-for-openhab-app/releases/latest</string>
 
     <string name="about_description">This is a simple and easy to use android app to simplify the mobile access to the log of an openHAB instance (running frontail) on your tablet or your
         smartphone.
     </string>
     <string name="about">About</string>
-    <string name="about_changelog_link" translatable="false">https://github.com/nikothegreek/logviewer-for-openhab-app/releases</string>
+    <string name="about_changelog_link" translatable="false">https://github.com/cyb3rko/logviewer-for-openhab-app/releases</string>
     <string name="about_group_1">Legal</string>
     <string name="about_group_2">Connect with me</string>
     <string name="about_element_1">Version %1$s (%2$d)</string>
     <string name="about_element_2">Used Libraries</string>
     <string name="about_element_3">Used Icons</string>
-    <string name="about_element_email_value">nikodiamond3@gmail.com</string>
+    <string name="about_element_email_value">niko@cyb3rko.de</string>
     <string name="about_element_email_text">Contact me</string>
     <string name="about_element_website_value">https://nikothegreek.jimdofree.com</string>
     <string name="about_element_website_text">Visit my website (currently only in German!)</string>
     <string name="about_element_youtube_value">UCue_SZXdF8yZByavetBU1ZQ</string>
     <string name="about_element_youtube_text">Watch my tutorial videos</string>
-    <string name="about_element_github_value">nikothegreek</string>
+    <string name="about_element_github_value">cyb3rko</string>
     <string name="about_element_github_text">Take a look at my other projects</string>
     <string name="about_element_instagram_value">cyb3rko</string>
     <string name="about_element_instagram_text">Follow m</string>
@@ -95,7 +95,7 @@
     <string name="end_user_consent">Privacy Policy\nTerms of Use</string>
 
     <string name="send_mail">Send me a mail…</string>
-    <string name="mail_info">mailto:?subject=%1$s - %2$s &amp;body="" &amp;to= nikodiamond3@gmail.com</string>
+    <string name="mail_info">mailto:?subject=%1$s - %2$s &amp;body="" &amp;to= niko@cyb3rko.de</string>
 
     <string-array name="privacy_policy" translatable="false">
         <item>Privacy Policy</item>
@@ -140,7 +140,7 @@
         Policy on this page. These changes are effective immediately after they are posted on this page.
         \nThis policy is effective as of 2020-04-24</item>
         <item>Contact me</item>
-        <item>If you have any questions or suggestions about my Privacy Policy, do not hesitate to contact me at nikodiamond3@gmail.com.</item>
+        <item>If you have any questions or suggestions about my Privacy Policy, do not hesitate to contact me at niko@cyb3rko.de.</item>
         <item>This privacy policy page was created at privacypolicytemplate.net and modified/generated by App Privacy Policy Generator (app-privacy-policy-generator.firebaseapp.com) and me.</item>
     </string-array>
 
@@ -179,7 +179,7 @@
         posting the new Terms of Use on this page.
         \nThese Terms of Use are effective as of 2020-04-24.</item>
         <item>Contact Me</item>
-        <item>If you have any questions or suggestions about my Terms of Use, do not hesitate to contact me at nikodiamond3@gmail.com.</item>
+        <item>If you have any questions or suggestions about my Terms of Use, do not hesitate to contact me at niko@cyb3rko.de.</item>
         <item>This Terms of Use page was generated by App Privacy Policy Generator (app-privacy-policy-generator.firebaseapp.com) and modified by me.</item>
     </string-array>
 </resources>