diff --git a/.gitignore b/.gitignore
index aa724b770..a68e5b575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,30 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
 local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d33521a..000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index e533d4203..000000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-LibreTube
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8a4..000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 6f44777cd..000000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetsSelectedWithDialog>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="3100ad43a3044300" />
-          </Key>
-        </deviceKey>
-      </Target>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_5_API_22.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetsSelectedWithDialog>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 526b4c25c..000000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 6bb60df3e..000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="app/src/main/res/drawable/ic_close.xml" value="0.17135416666666667" />
-        <entry key="app/src/main/res/drawable/ic_libretube_foreground.xml" value="0.17135416666666667" />
-        <entry key="app/src/main/res/drawable/ic_like.xml" value="0.329" />
-        <entry key="app/src/main/res/drawable/ic_play.xml" value="0.17135416666666667" />
-        <entry key="app/src/main/res/drawable/ic_search.xml" value="0.329" />
-        <entry key="app/src/main/res/drawable/ic_search2.xml" value="0.17135416666666667" />
-        <entry key="app/src/main/res/drawable/ic_settings.xml" value="0.186" />
-        <entry key="app/src/main/res/drawable/ic_share.xml" value="0.329" />
-        <entry key="app/src/main/res/drawable/libretube.xml" value="0.17135416666666667" />
-        <entry key="app/src/main/res/layout-land/fragment_player.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.18703703703703703" />
-        <entry key="app/src/main/res/layout/activity_player.xml" value="0.27685185185185185" />
-        <entry key="app/src/main/res/layout/channel_search_row.xml" value="0.33" />
-        <entry key="app/src/main/res/layout/exo_styled_player_control_view.xml" value="0.12" />
-        <entry key="app/src/main/res/layout/fragment_home.xml" value="0.35208333333333336" />
-        <entry key="app/src/main/res/layout/fragment_library.xml" value="0.11956521739130435" />
-        <entry key="app/src/main/res/layout/fragment_player.xml" value="0.2" />
-        <entry key="app/src/main/res/layout/fragment_search.xml" value="0.25" />
-        <entry key="app/src/main/res/layout/fragment_subscriptions.xml" value="0.22" />
-        <entry key="app/src/main/res/layout/playlist_search_row.xml" value="0.33" />
-        <entry key="app/src/main/res/layout/styled_quality_list.xml" value="0.15520833333333334" />
-        <entry key="app/src/main/res/layout/styled_quality_list_item.xml" value="0.15520833333333334" />
-        <entry key="app/src/main/res/layout/trending_row.xml" value="0.33" />
-        <entry key="app/src/main/res/layout/video_search_row.xml" value="0.25" />
-        <entry key="app/src/main/res/menu/action_bar.xml" value="0.2" />
-        <entry key="app/src/main/res/menu/bottom_menu.xml" value="0.15520833333333334" />
-        <entry key="app/src/main/res/mipmap-anydpi-v26/ic_libretube.xml" value="0.1" />
-        <entry key="app/src/main/res/xml-land/player_scene.xml" value="0.13139329805996472" />
-        <entry key="app/src/main/res/xml/network_security_config.xml" value="0.15520833333333334" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file