diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..aff0e9d
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,31 @@
+FROM mcr.microsoft.com/devcontainers/java:dev-17-jdk-trixie
+
+# Install Android SDK command-line tools
+# ARG ANDROID_CMDLINE_TOOLS_VERSION=11076708
+ARG ANDROID_BUILD_TOOLS_VERSION=34.0.0
+ARG ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip"
+
+RUN mkdir -p /usr/local/android-sdk/cmdline-tools && \
+    cd /tmp && \
+    curl -fsSL "$ANDROID_SDK_URL" -o cmdline-tools.zip && \
+    unzip -q cmdline-tools.zip -d /usr/local/android-sdk/cmdline-tools && \
+    mv /usr/local/android-sdk/cmdline-tools/cmdline-tools /usr/local/android-sdk/cmdline-tools/latest && \
+    rm cmdline-tools.zip
+
+# Set Android SDK paths and environment
+ENV ANDROID_HOME=/usr/local/android-sdk
+ENV ANDROID_COMMAND_LINE_TOOL=/usr/local/android-sdk/cmdline-tools/latest/bin
+ENV PATH=${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}
+
+# Accept licenses and install required SDK packages
+RUN mkdir -p $ANDROID_HOME/.android && \
+    touch $ANDROID_HOME/.android/repositories.cfg && \
+    yes | ${ANDROID_COMMAND_LINE_TOOL}/sdkmanager --licenses 2>/dev/null || true && \
+    ${ANDROID_COMMAND_LINE_TOOL}/sdkmanager \
+    "platforms;android-34" \
+    "build-tools;33.0.1" \
+    "platform-tools" \
+    2>&1 | tee /dev/null
+
+# Grant execute permission to gradlew
+RUN chmod +x /workspaces/*/gradlew 2>/dev/null || true
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..5169cae
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,19 @@
+{
+    "name": "Bong Hit Timer Android",
+    "dockerFile": "Dockerfile",
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "redhat.vscode-xml",
+                "redhat.vscode-yaml",
+                "felipecaslazana.vscode-android-logcat",
+                "ms-azuretools.vscode-docker"
+            ]
+        }
+    },
+    "forwardPorts": [
+        5554,
+        5555
+    ],
+    "postCreateCommand": "./gradlew --version"
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..c5f3f6b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 57d73ce..0d2e564 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.countdowntimer"
-        minSdk 24
+        minSdk 34
         targetSdk 34
         versionCode 1
         versionName "1.0"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 315b814..0484d98 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_timer"
-        android:label="Countdown Timer"
+        android:label="Bong Hit Timer"
         android:supportsRtl="true"
         android:theme="@style/Theme.CountdownTimer">
         <activity