diff --git a/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java b/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java
index 88de6d1c..8924fd6d 100644
--- a/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java
+++ b/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java
@@ -21,10 +21,12 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.appcompat.app.AppCompatActivity;
 import android.webkit.WebView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.android.material.snackbar.Snackbar;
+
 public class AboutActivity extends AppCompatActivity {
 
     @Override
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/ClientItem.java b/Snapcast/src/main/java/de/badaix/snapcast/ClientItem.java
index 96c8713e..761e6594 100644
--- a/Snapcast/src/main/java/de/badaix/snapcast/ClientItem.java
+++ b/Snapcast/src/main/java/de/badaix/snapcast/ClientItem.java
@@ -19,7 +19,6 @@
 package de.badaix.snapcast;
 
 import android.content.Context;
-import androidx.appcompat.widget.PopupMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -29,6 +28,8 @@
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.PopupMenu;
+
 import de.badaix.snapcast.control.json.Client;
 import de.badaix.snapcast.control.json.Volume;
 
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/ClientSettingsActivity.java b/Snapcast/src/main/java/de/badaix/snapcast/ClientSettingsActivity.java
index 62105516..06e7ab8b 100644
--- a/Snapcast/src/main/java/de/badaix/snapcast/ClientSettingsActivity.java
+++ b/Snapcast/src/main/java/de/badaix/snapcast/ClientSettingsActivity.java
@@ -21,9 +21,10 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * Created by johannes on 11.01.16.
  */
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/GroupListFragment.java b/Snapcast/src/main/java/de/badaix/snapcast/GroupListFragment.java
index 717a475e..eded6b1d 100644
--- a/Snapcast/src/main/java/de/badaix/snapcast/GroupListFragment.java
+++ b/Snapcast/src/main/java/de/badaix/snapcast/GroupListFragment.java
@@ -20,9 +20,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,7 +27,11 @@
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
+
 import de.badaix.snapcast.control.json.Client;
 import de.badaix.snapcast.control.json.Group;
 import de.badaix.snapcast.control.json.ServerStatus;
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/GroupSettingsActivity.java b/Snapcast/src/main/java/de/badaix/snapcast/GroupSettingsActivity.java
index 370977b0..dc36c7e1 100644
--- a/Snapcast/src/main/java/de/badaix/snapcast/GroupSettingsActivity.java
+++ b/Snapcast/src/main/java/de/badaix/snapcast/GroupSettingsActivity.java
@@ -21,9 +21,10 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * Created by johannes on 06.12.16.
  */
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java b/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
index 12d1473f..8161bb1b 100644
--- a/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
+++ b/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
@@ -32,12 +32,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -46,6 +40,14 @@
 import android.view.WindowManager;
 import android.widget.Button;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
+import com.google.android.material.snackbar.Snackbar;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java b/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java
index 7c23aa93..27a5cafe 100644
--- a/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java
+++ b/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java
@@ -24,8 +24,6 @@
 import android.content.DialogInterface;
 import android.net.nsd.NsdServiceInfo;
 import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -35,6 +33,9 @@
 import android.widget.EditText;
 import android.widget.Spinner;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 import de.badaix.snapcast.utils.NsdHelper;
 import de.badaix.snapcast.utils.Settings;
 
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java b/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java
index e0885c85..0506f389 100644
--- a/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java
+++ b/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java
@@ -35,9 +35,10 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
+import android.util.Log;
+
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.TaskStackBuilder;
-import android.util.Log;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/control/json/Group.java b/Snapcast/src/main/java/de/badaix/snapcast/control/json/Group.java
index ee3a6f6a..1c2ef82a 100644
--- a/Snapcast/src/main/java/de/badaix/snapcast/control/json/Group.java
+++ b/Snapcast/src/main/java/de/badaix/snapcast/control/json/Group.java
@@ -18,9 +18,10 @@
 
 package de.badaix.snapcast.control.json;
 
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;