diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..20da5f3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,46 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: [ "bug", "triage me" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Is there a StackOverflow question about this issue?
+      description: Please search StackOverflow if an issue with an answer already exists for the bug you encountered.
+      options:
+        - label: I have searched StackOverflow
+          required: false
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant logcat output
+      description: Please copy and paste any relevant logcat output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our Code of Conduct
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..8775570
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,46 @@
+name: Feature request
+description: File a feature request
+title: "[FR]: "
+labels: [ "enhancement", "triage me" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for this feature request.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    id: describe-problem
+    attributes:
+      label: Describe the problem
+      description: Is your feature request related to a problem? Please describe.
+      placeholder: I'm always frustrated when...
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution
+      description: Please describe the solution you'd like. A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
\ No newline at end of file
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index aa46aec..b3b6d73 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -3,6 +3,20 @@
   <component name="AppInsightsSettings">
     <option name="tabSettings">
       <map>
+        <entry key="Android Vitals">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="com.d4rk.musicsleeptimer.plus" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="SEVEN_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
         <entry key="Firebase Crashlytics">
           <value>
             <InsightsFilterSettings>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index fe63bb6..6d0ee1c 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.23" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2b0893..e1298c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# Version 3.0.2:
+
+- Modernized project structure
+- Upgraded the Android Gradle Plugin
+- Enhanced issue tracking with templates
+- Updated dependencies
+
+# Version 3.0.1:
+
+- Updated the Android Gradle Plugin
+
+# Version 3.0.0:
+
+- Updated all project props to match the other projects
+- Updated the README.md
+- Small code reformat
+
 # Version 2.6_r1:
 
 - Made various project structure enhancements for better readability and maintainability.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ca4c750..ec9f7f4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "com.d4rk.musicsleeptimer.plus"
         minSdk = 26
         targetSdk = 34
-        versionCode = 28
-        versionName = "3.0.1"
+        versionCode = 29
+        versionName = "3.0.2"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(
             "en",
@@ -31,7 +31,7 @@ android {
             "sv",
             "bg",
             "pl",
-            "uk"
+            "uk",
         )
     }
 
@@ -41,7 +41,6 @@ android {
             isMinifyEnabled = true
             isShrinkResources = true
             isDebuggable = false
-            versionNameSuffix = null
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -50,7 +49,6 @@ android {
         debug {
             multiDexEnabled = true
             isDebuggable = true
-            versionNameSuffix = null
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -68,7 +66,6 @@ android {
     }
 
     buildFeatures {
-        viewBinding = true
         buildConfig = true
     }
 
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
similarity index 100%
rename from app/src/main/res/values-bg/strings.xml
rename to app/src/main/res/values-bg-rBG/strings.xml
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
similarity index 100%
rename from app/src/main/res/values-de/strings.xml
rename to app/src/main/res/values-de-rDE/strings.xml
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es-rGQ/strings.xml
similarity index 100%
rename from app/src/main/res/values-es/strings.xml
rename to app/src/main/res/values-es-rGQ/strings.xml
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
similarity index 100%
rename from app/src/main/res/values-fr/strings.xml
rename to app/src/main/res/values-fr-rFR/strings.xml
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
similarity index 100%
rename from app/src/main/res/values-hi/strings.xml
rename to app/src/main/res/values-hi-rIN/strings.xml
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
similarity index 100%
rename from app/src/main/res/values-hu/strings.xml
rename to app/src/main/res/values-hu-rHU/strings.xml
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in-rID/strings.xml
similarity index 100%
rename from app/src/main/res/values-in/strings.xml
rename to app/src/main/res/values-in-rID/strings.xml
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
similarity index 100%
rename from app/src/main/res/values-it/strings.xml
rename to app/src/main/res/values-it-rIT/strings.xml
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
similarity index 100%
rename from app/src/main/res/values-ja/strings.xml
rename to app/src/main/res/values-ja-rJP/strings.xml
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
similarity index 100%
rename from app/src/main/res/values-pl/strings.xml
rename to app/src/main/res/values-pl-rPL/strings.xml
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
similarity index 100%
rename from app/src/main/res/values-ro/strings.xml
rename to app/src/main/res/values-ro-rRO/strings.xml
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
similarity index 100%
rename from app/src/main/res/values-ru/strings.xml
rename to app/src/main/res/values-ru-rRU/strings.xml
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
similarity index 100%
rename from app/src/main/res/values-sv/strings.xml
rename to app/src/main/res/values-sv-rSE/strings.xml
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
similarity index 100%
rename from app/src/main/res/values-tr/strings.xml
rename to app/src/main/res/values-tr-rTR/strings.xml
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
similarity index 100%
rename from app/src/main/res/values-uk/strings.xml
rename to app/src/main/res/values-uk-rUA/strings.xml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d33d01..3bae827 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
-agp = "8.5.1"
+agp = "8.6.0"
 appcompat = "1.7.0"
 espressoCore = "3.6.1"
-firebaseBom = "33.1.2"
+firebaseBom = "33.2.0"
 kotlin = "2.0.0"
 google-firebase-crashlytics = "3.0.2"
 google-services = "4.4.2"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 multidex = "2.0.1"
-workRuntimeKtx = "2.9.0"
+workRuntimeKtx = "2.9.1"
 
 [libraries]
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 32f0c80..cfd20b4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 22 18:40:01 EEST 2024
+#Mon Sep 02 23:36:22 EEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists