diff --git a/apk-viewer-plugin/build.gradle.kts b/apk-viewer-plugin/build.gradle.kts
index 19c38b0db9..27fdbdf08b 100644
--- a/apk-viewer-plugin/build.gradle.kts
+++ b/apk-viewer-plugin/build.gradle.kts
@@ -35,6 +35,8 @@ android {
         jvmTarget = "17"
     }
 
+
+
     packaging {
         resources {
             excludes += setOf(
diff --git a/apk-viewer-plugin/src/main/AndroidManifest.xml b/apk-viewer-plugin/src/main/AndroidManifest.xml
index efdbf27972..19a896415b 100644
--- a/apk-viewer-plugin/src/main/AndroidManifest.xml
+++ b/apk-viewer-plugin/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
 
     <application
         android:label="APK Viewer"
-        android:theme="@style/Theme.AppCompat">
+        android:theme="@style/PluginTheme">
 
         <!-- Plugin metadata -->
         <meta-data
@@ -16,7 +16,7 @@
 
         <meta-data
             android:name="plugin.version"
-            android:value="1.0.2" />
+            android:value="1.0.3" />
 
         <meta-data
             android:name="plugin.description"
diff --git a/keystore-generator-plugin/build.gradle.kts b/keystore-generator-plugin/build.gradle.kts
index 65814cefe3..e116c4c0d2 100644
--- a/keystore-generator-plugin/build.gradle.kts
+++ b/keystore-generator-plugin/build.gradle.kts
@@ -35,6 +35,8 @@ android {
         jvmTarget = "17"
     }
 
+
+
     packaging {
         resources {
             excludes += setOf(
diff --git a/keystore-generator-plugin/src/main/AndroidManifest.xml b/keystore-generator-plugin/src/main/AndroidManifest.xml
index 2a185d29ed..6db498bbfe 100644
--- a/keystore-generator-plugin/src/main/AndroidManifest.xml
+++ b/keystore-generator-plugin/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
 
     <application
         android:label="Keystore Generator Plugin"
-        android:theme="@style/Theme.AppCompat">
+        android:theme="@style/PluginTheme">
 
         <!-- Plugin metadata -->
         <meta-data
@@ -16,7 +16,7 @@
 
         <meta-data
             android:name="plugin.version"
-            android:value="1.0.3" />
+            android:value="1.0.4" />
 
         <meta-data
             android:name="plugin.description"
diff --git a/keystore-generator-plugin/src/main/kotlin/com/appdevforall/keygen/plugin/fragments/KeystoreGeneratorFragment.kt b/keystore-generator-plugin/src/main/kotlin/com/appdevforall/keygen/plugin/fragments/KeystoreGeneratorFragment.kt
index 798ee247d2..3c49265912 100644
--- a/keystore-generator-plugin/src/main/kotlin/com/appdevforall/keygen/plugin/fragments/KeystoreGeneratorFragment.kt
+++ b/keystore-generator-plugin/src/main/kotlin/com/appdevforall/keygen/plugin/fragments/KeystoreGeneratorFragment.kt
@@ -4,14 +4,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.EditText
 import android.widget.LinearLayout
-import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.progressindicator.LinearProgressIndicator
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
 import com.appdevforall.keygen.plugin.KeystoreConfig
 import com.appdevforall.keygen.plugin.KeystoreGenerator
 import com.appdevforall.keygen.plugin.KeystoreGenerationResult
@@ -22,18 +23,17 @@ import com.itsaky.androidide.plugins.services.IdeTooltipService
 import com.itsaky.androidide.plugins.services.IdeFileService
 import com.itsaky.androidide.plugins.services.IdeBuildService
 import com.itsaky.androidide.plugins.services.BuildStatusListener
-import kotlinx.coroutines.CoroutineScope
+import android.util.Log
+import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
 
-/**
- * Reusable fragment for keystore generation that can be used in editor tabs, bottom sheet, etc.
- */
 class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
 
     companion object {
+        private const val TAG = "KeystoreGenerator"
         private const val PLUGIN_ID = "com.appdevforall.keygen.plugin"
     }
 
@@ -42,32 +42,33 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
     private var fileService: IdeFileService? = null
     private var buildService: IdeBuildService? = null
 
-    // Build status tracking
     private var isBuildRunning = false
     private var lastBuildFailed = false
 
-    // UI Components
     private lateinit var statusContainer: LinearLayout
-    private lateinit var headerContainer: LinearLayout
     private lateinit var statusText: TextView
-    private lateinit var progressBar: ProgressBar
-    private lateinit var keystoreNameInput: EditText
-    private lateinit var keystorePasswordInput: EditText
-    private lateinit var keyAliasInput: EditText
-    private lateinit var keyPasswordInput: EditText
-    private lateinit var certificateNameInput: EditText
-    private lateinit var organizationalUnitInput: EditText
-    private lateinit var organizationInput: EditText
-    private lateinit var cityInput: EditText
-    private lateinit var stateInput: EditText
-    private lateinit var countryInput: EditText
-    private lateinit var btnGenerate: Button
-    private lateinit var btnClear: Button
+    private lateinit var progressBar: LinearProgressIndicator
+    private lateinit var tilKeystoreName: TextInputLayout
+    private lateinit var tilKeystorePassword: TextInputLayout
+    private lateinit var tilKeyAlias: TextInputLayout
+    private lateinit var tilKeyPassword: TextInputLayout
+    private lateinit var tilCertificateName: TextInputLayout
+    private lateinit var tilCountry: TextInputLayout
+    private lateinit var keystoreNameInput: TextInputEditText
+    private lateinit var keystorePasswordInput: TextInputEditText
+    private lateinit var keyAliasInput: TextInputEditText
+    private lateinit var keyPasswordInput: TextInputEditText
+    private lateinit var certificateNameInput: TextInputEditText
+    private lateinit var organizationalUnitInput: TextInputEditText
+    private lateinit var organizationInput: TextInputEditText
+    private lateinit var cityInput: TextInputEditText
+    private lateinit var stateInput: TextInputEditText
+    private lateinit var countryInput: TextInputEditText
+    private lateinit var btnGenerate: MaterialButton
+    private lateinit var btnClear: MaterialButton
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        // Get services from the plugin's service registry
         try {
             val serviceRegistry = PluginFragmentHelper.getServiceRegistry(PLUGIN_ID)
             projectService = serviceRegistry?.get(IdeProjectService::class.java)
@@ -75,7 +76,7 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
             fileService = serviceRegistry?.get(IdeFileService::class.java)
             buildService = serviceRegistry?.get(IdeBuildService::class.java)
         } catch (e: Exception) {
-            // Services might not be available yet, we'll handle this gracefully
+            Log.w(TAG, "Services not yet available", e)
         }
     }
 
@@ -94,7 +95,6 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
         initializeViews(view)
         setupClickListeners()
         updateButtonStates()
@@ -102,13 +102,11 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
 
     override fun onResume() {
         super.onResume()
-        // Register for build status updates
         buildService?.addBuildStatusListener(this)
     }
 
     override fun onPause() {
         super.onPause()
-        // Unregister from build status updates
         buildService?.removeBuildStatusListener(this)
     }
 
@@ -117,6 +115,13 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
         statusText = view.findViewById(R.id.tv_status)
         progressBar = view.findViewById(R.id.progress_bar)
 
+        tilKeystoreName = view.findViewById(R.id.til_keystore_name)
+        tilKeystorePassword = view.findViewById(R.id.til_keystore_password)
+        tilKeyAlias = view.findViewById(R.id.til_key_alias)
+        tilKeyPassword = view.findViewById(R.id.til_key_password)
+        tilCertificateName = view.findViewById(R.id.til_certificate_name)
+        tilCountry = view.findViewById(R.id.til_country)
+
         keystoreNameInput = view.findViewById(R.id.et_keystore_name)
         keystorePasswordInput = view.findViewById(R.id.et_keystore_password)
         keyAliasInput = view.findViewById(R.id.et_key_alias)
@@ -143,73 +148,81 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
             clearForm()
         }
 
-        // Add long press tooltips for help documentation
         setupTooltipHandlers()
     }
 
     private fun setupTooltipHandlers() {
-        // Generate button tooltip
         btnGenerate.setOnLongClickListener { button ->
             tooltipService?.showTooltip(
                 anchorView = button,
                 category = "plugin_keystore_generator",
                 tag = "keystore_generator.main_feature"
             ) ?: run {
-                showToast("Long press detected! Tooltip service not available.")
+                showToast(getString(R.string.tooltip_not_available))
             }
-            true // Consume the long click
+            true
         }
 
-        // Main interface tooltip (on the header area)
         statusContainer.setOnLongClickListener { view ->
             tooltipService?.showTooltip(
                 anchorView = view,
                 category = "plugin_keystore_generator",
                 tag = "keystore_generator.editor_tab"
             ) ?: run {
-                showToast("Long press detected! Documentation not available.")
+                showToast(getString(R.string.docs_not_available))
             }
             true
         }
     }
 
+    private fun clearValidationErrors() {
+        tilKeystoreName.error = null
+        tilKeystorePassword.error = null
+        tilKeyAlias.error = null
+        tilKeyPassword.error = null
+        tilCertificateName.error = null
+        tilCountry.error = null
+    }
+
     private fun validateForm(): Boolean {
-        val errors = mutableListOf<String>()
+        var valid = true
+        clearValidationErrors()
 
         if (keystoreNameInput.text.toString().trim().isEmpty()) {
-            errors.add("Keystore name is required")
+            tilKeystoreName.error = getString(R.string.error_required)
+            valid = false
         }
 
         if (keystorePasswordInput.text.toString().isEmpty()) {
-            errors.add("Keystore password is required")
+            tilKeystorePassword.error = getString(R.string.error_required)
+            valid = false
         }
 
         if (keyAliasInput.text.toString().trim().isEmpty()) {
-            errors.add("Key alias is required")
+            tilKeyAlias.error = getString(R.string.error_required)
+            valid = false
         }
 
         if (keyPasswordInput.text.toString().isEmpty()) {
-            errors.add("Key password is required")
+            tilKeyPassword.error = getString(R.string.error_required)
+            valid = false
         }
 
         if (certificateNameInput.text.toString().trim().isEmpty()) {
-            errors.add("Certificate name is required")
+            tilCertificateName.error = getString(R.string.error_required)
+            valid = false
         }
 
-        if (countryInput.text.toString().trim().length != 2) {
-            errors.add("Country code must be exactly 2 characters")
+        val countryCode = countryInput.text.toString().trim()
+        if (countryCode.length != 2) {
+            tilCountry.error = getString(R.string.error_country_length)
+            valid = false
         }
 
-        if (errors.isNotEmpty()) {
-            showError("Validation failed:\n${errors.joinToString("\n")}")
-            return false
-        }
-
-        return true
+        return valid
     }
 
     private fun generateKeystore() {
-        // Check if action should be disabled
         if (!isKeystoreGenerationEnabled()) {
             showActionDisabledMessage()
             return
@@ -227,12 +240,10 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
             country = countryInput.text.toString().trim()
         )
 
-        // Show progress
-        showProgress("Generating keystore...")
+        showProgress(getString(R.string.generating_keystore))
         btnGenerate.isEnabled = false
 
-        // Generate keystore asynchronously
-        CoroutineScope(Dispatchers.IO).launch {
+        viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
             try {
                 val result = performKeystoreGeneration(config)
 
@@ -242,16 +253,14 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
 
                     when (result) {
                         is KeystoreGenerationResult.Success -> {
-                            // Update build file on main thread
                             val currentProject = projectService?.getCurrentProject()
                             if (currentProject != null) {
                                 addSigningConfigToBuildFile(currentProject.rootDir, config, result.keystoreFile)
                             }
-
-                            showSuccess("✅ Keystore generated successfully!\nLocation: ${result.keystoreFile.absolutePath}\n📝 Build file updated with signing configuration")
+                            showSuccess(getString(R.string.success_message) + "\n${result.keystoreFile.absolutePath}")
                         }
                         is KeystoreGenerationResult.Error -> {
-                            showError("❌ Generation failed: ${result.message}")
+                            showError(getString(R.string.error_generation_failed) + ": ${result.message}")
                         }
                     }
                 }
@@ -259,52 +268,42 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
                 withContext(Dispatchers.Main) {
                     hideProgress()
                     btnGenerate.isEnabled = true
-                    showError("❌ Unexpected error: ${e.message}")
+                    showError(getString(R.string.error_generation_failed) + (e.message?.let { ": $it" } ?: ""))
                 }
             }
         }
     }
 
     private fun performKeystoreGeneration(config: KeystoreConfig): KeystoreGenerationResult {
-        // Validate configuration
         val validationErrors = KeystoreGenerator.validateConfig(config)
         if (validationErrors.isNotEmpty()) {
-            return KeystoreGenerationResult.Error("Validation failed: ${validationErrors.joinToString(", ")}")
+            return KeystoreGenerationResult.Error(getString(R.string.error_validation_failed, validationErrors.joinToString(", ")))
         }
 
-        // Get project directory
         if (projectService == null) {
-            // Try to get it again in case it's available now
             try {
                 val serviceRegistry = PluginFragmentHelper.getServiceRegistry(PLUGIN_ID)
                 projectService = serviceRegistry?.get(IdeProjectService::class.java)
                 fileService = serviceRegistry?.get(IdeFileService::class.java)
             } catch (e: Exception) {
-                return KeystoreGenerationResult.Error("IDE project service not available")
+                Log.e(TAG, "Failed to get project service", e)
+                return KeystoreGenerationResult.Error(getString(R.string.error_project_service_unavailable))
             }
         }
 
         val currentProject = projectService?.getCurrentProject()
-        if (currentProject == null) {
-            return KeystoreGenerationResult.Error("No current project available")
-        }
+            ?: return KeystoreGenerationResult.Error(getString(R.string.error_no_project))
 
         return try {
-            // Create keystore in the project's app directory
             val appDirectory = File(currentProject.rootDir, "app")
             if (!appDirectory.exists()) {
                 appDirectory.mkdirs()
             }
-
-            // Generate the keystore
-            val result = KeystoreGenerator.generateKeystore(config, appDirectory)
-
-            result
-
+            KeystoreGenerator.generateKeystore(config, appDirectory)
         } catch (e: SecurityException) {
-            KeystoreGenerationResult.Error("Permission denied: ${e.message}", e)
+            KeystoreGenerationResult.Error(getString(R.string.error_permission_denied, e.message ?: ""), e)
         } catch (e: Exception) {
-            KeystoreGenerationResult.Error("Generation error: ${e.message}", e)
+            KeystoreGenerationResult.Error(getString(R.string.error_generation, e.message ?: ""), e)
         }
     }
 
@@ -320,8 +319,10 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
         stateInput.setText("")
         countryInput.setText("US")
 
+        clearValidationErrors()
+
         hideStatus()
-        showToast("Form cleared")
+        showToast(getString(R.string.form_cleared))
     }
 
     private fun showProgress(message: String) {
@@ -365,12 +366,12 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
 
     private fun addSigningConfigToBuildFile(projectDir: File, config: KeystoreConfig, keystoreFile: File) {
         if (fileService == null) {
-            // Try to get it again in case it's available now
             try {
                 val serviceRegistry = PluginFragmentHelper.getServiceRegistry(PLUGIN_ID)
                 fileService = serviceRegistry?.get(IdeFileService::class.java)
             } catch (e: Exception) {
-                showToast("ERROR: IdeFileService not available")
+                Log.e(TAG, "Failed to get file service", e)
+                showToast(getString(R.string.error_file_service_unavailable))
                 return
             }
         }
@@ -381,13 +382,13 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
         )
 
         val buildFile = buildFiles.find { it.exists() } ?: run {
-            showToast("ERROR: No build.gradle found in app directory")
+            showToast(getString(R.string.error_no_build_gradle))
             return
         }
 
         try {
             val isKotlinDsl = buildFile.name.endsWith(".kts")
-            val keystoreRelativePath = "${keystoreFile.name}"
+            val keystoreRelativePath = keystoreFile.name
             val currentContent = fileService?.readFile(buildFile) ?: ""
 
             val hasReleaseConfig = if (isKotlinDsl) {
@@ -404,7 +405,7 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
             }
 
         } catch (e: Exception) {
-            showToast("Error modifying build file: ${e.message}")
+            showToast(getString(R.string.error_build_file, e.message ?: ""))
         }
     }
 
@@ -418,9 +419,9 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
         val updatedContent = updateExistingSigningConfig(currentContent, config, keystoreRelativePath, isKotlinDsl)
 
         when {
-            updatedContent == currentContent -> showToast("Could not update signing config - pattern not found")
-            fileService?.writeFile(buildFile, updatedContent) == true -> showToast("Updated existing release signing config")
-            else -> showToast("Failed to update signing config")
+            updatedContent == currentContent -> showToast(getString(R.string.error_signing_pattern_not_found))
+            fileService?.writeFile(buildFile, updatedContent) == true -> showToast(getString(R.string.success_signing_updated))
+            else -> showToast(getString(R.string.error_signing_update_failed))
         }
     }
 
@@ -466,19 +467,13 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
         }
 
         val success = fileService?.insertAfterPattern(buildFile, "signingConfigs {", releaseConfig) == true
-        val message = when (success) {
-            true -> "Added release signing config"
-            false -> "Failed to add release config to signingConfigs block"
-        }
+        val message = if (success) getString(R.string.success_signing_added) else getString(R.string.error_signing_add_failed)
         showToast(message)
     }
 
     private fun insertNewSigningConfigsBlock(buildFile: File, signingConfig: String) {
         val success = fileService?.insertAfterPattern(buildFile, "android {", signingConfig) == true
-        val message = when (success) {
-            true -> "Build file updated with signing config"
-            false -> "Could not find android block in ${buildFile.name}"
-        }
+        val message = if (success) getString(R.string.success_build_file_updated) else getString(R.string.error_no_android_block, buildFile.name)
         showToast(message)
     }
 
@@ -491,8 +486,6 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
         var result = content
 
         if (isKotlinDsl) {
-            // Update Kotlin DSL patterns
-            // Pattern 1: create("release") { ... }
             val createPattern = """create\("release"\)\s*\{[^}]*\}""".toRegex(RegexOption.DOT_MATCHES_ALL)
             if (createPattern.containsMatchIn(result)) {
                 val newConfig = """create("release") {
@@ -503,7 +496,6 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
         }"""
                 result = result.replace(createPattern, newConfig)
             } else {
-                // Pattern 2: getByName("release") { ... }
                 val getByNamePattern = """getByName\("release"\)\s*\{[^}]*\}""".toRegex(RegexOption.DOT_MATCHES_ALL)
                 if (getByNamePattern.containsMatchIn(result)) {
                     val newConfig = """getByName("release") {
@@ -516,7 +508,6 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
                 }
             }
         } else {
-            // Update Groovy DSL pattern
             val groovyPattern = """release\s*\{[^}]*\}""".toRegex(RegexOption.DOT_MATCHES_ALL)
             if (groovyPattern.containsMatchIn(result)) {
                 val newConfig = """release {
@@ -560,16 +551,15 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
 """
     }
 
-    // Build status checking methods
     private fun isKeystoreGenerationEnabled(): Boolean {
         return !isBuildRunning && !lastBuildFailed
     }
 
     private fun showActionDisabledMessage() {
         val message = when {
-            isBuildRunning -> "Cannot generate keystore while project is building or syncing"
-            lastBuildFailed -> "Cannot generate keystore - please fix build errors first"
-            else -> "Keystore generation is currently unavailable"
+            isBuildRunning -> getString(R.string.error_build_running)
+            lastBuildFailed -> getString(R.string.error_build_failed)
+            else -> getString(R.string.error_unavailable)
         }
         showToast(message)
     }
@@ -580,28 +570,21 @@ class KeystoreGeneratorFragment : Fragment(), BuildStatusListener {
         btnGenerate.alpha = if (isEnabled) 1.0f else 0.6f
     }
 
-    // BuildStatusListener implementation
     override fun onBuildStarted() {
         isBuildRunning = true
         lastBuildFailed = false
-        activity?.runOnUiThread {
-            updateButtonStates()
-        }
+        activity?.runOnUiThread { updateButtonStates() }
     }
 
     override fun onBuildFinished() {
         isBuildRunning = false
         lastBuildFailed = false
-        activity?.runOnUiThread {
-            updateButtonStates()
-        }
+        activity?.runOnUiThread { updateButtonStates() }
     }
 
     override fun onBuildFailed(error: String?) {
         isBuildRunning = false
         lastBuildFailed = true
-        activity?.runOnUiThread {
-            updateButtonStates()
-        }
+        activity?.runOnUiThread { updateButtonStates() }
     }
-}
\ No newline at end of file
+}
diff --git a/keystore-generator-plugin/src/main/res/layout/fragment_keystore_generator.xml b/keystore-generator-plugin/src/main/res/layout/fragment_keystore_generator.xml
index 0414c7439f..a32cc571c0 100644
--- a/keystore-generator-plugin/src/main/res/layout/fragment_keystore_generator.xml
+++ b/keystore-generator-plugin/src/main/res/layout/fragment_keystore_generator.xml
@@ -1,273 +1,273 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="?android:attr/colorBackground">
+    android:orientation="vertical">
 
-    <!-- Main Content -->
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:fillViewport="true">
+        android:layout_weight="1">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingTop="16dp">
 
-            <!-- Keystore Details Section -->
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="12dp"
-                android:text="Keystore Details"
-                android:textSize="18sp"
+                android:text="@string/keystore_details"
+                android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="Keystore Name:"
-                android:textSize="14sp" />
-
-            <EditText
-                android:id="@+id/et_keystore_name"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/til_keystore_name"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:hint="release.jks"
-                android:inputType="text"
-                android:singleLine="true"
-                android:text="release.jks" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="Keystore Password:"
-                android:textSize="14sp" />
-
-            <EditText
-                android:id="@+id/et_keystore_password"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/keystore_name">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_keystore_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:singleLine="true"
+                    android:text="release.jks" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/til_keystore_password"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:hint="Enter password"
-                android:inputType="textPassword"
-                android:singleLine="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/keystore_password"
+                app:endIconMode="password_toggle">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_keystore_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textPassword"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/til_key_alias"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="Key Alias:"
-                android:textSize="14sp" />
-
-            <EditText
-                android:id="@+id/et_key_alias"
+                android:layout_marginBottom="8dp"
+                android:hint="@string/key_alias">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_key_alias"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:singleLine="true"
+                    android:text="release" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/til_key_password"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:hint="release"
-                android:inputType="text"
-                android:singleLine="true"
-                android:text="release" />
+                android:layout_marginBottom="20dp"
+                android:hint="@string/key_password"
+                app:endIconMode="password_toggle">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="Key Password:"
-                android:textSize="14sp" />
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_key_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textPassword"
+                    android:singleLine="true" />
 
-            <EditText
-                android:id="@+id/et_key_password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:hint="Enter password"
-                android:inputType="textPassword"
-                android:singleLine="true" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <!-- Certificate Details Section -->
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="12dp"
-                android:text="Certificate Details"
-                android:textSize="18sp"
+                android:text="@string/certificate_details"
+                android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <TextView
-                android:layout_width="wrap_content"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/til_certificate_name"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="Certificate Name (CN):"
-                android:textSize="14sp" />
+                android:layout_marginBottom="8dp"
+                android:hint="@string/certificate_name">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_certificate_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textPersonName"
+                    android:singleLine="true" />
 
-            <EditText
-                android:id="@+id/et_certificate_name"
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:hint="Your Name"
-                android:inputType="textPersonName"
-                android:singleLine="true" />
+                android:layout_marginBottom="8dp"
+                android:hint="@string/organizational_unit">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="Organizational Unit (OU):"
-                android:textSize="14sp" />
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_organizational_unit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:singleLine="true" />
 
-            <EditText
-                android:id="@+id/et_organizational_unit"
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:hint="Development (optional)"
-                android:inputType="text"
-                android:singleLine="true" />
+                android:layout_marginBottom="8dp"
+                android:hint="@string/organization">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="Organization (O):"
-                android:textSize="14sp" />
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_organization"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <EditText
-                android:id="@+id/et_organization"
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:hint="Your Company (optional)"
-                android:inputType="text"
-                android:singleLine="true" />
+                android:layout_marginBottom="8dp"
+                android:hint="@string/city">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="City (L):"
-                android:textSize="14sp" />
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_city"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <EditText
-                android:id="@+id/et_city"
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:hint="Your City (optional)"
-                android:inputType="text"
-                android:singleLine="true" />
+                android:layout_marginBottom="8dp"
+                android:hint="@string/state">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="State (ST):"
-                android:textSize="14sp" />
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_state"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <EditText
-                android:id="@+id/et_state"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/til_country"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:hint="Your State (optional)"
-                android:inputType="text"
-                android:singleLine="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
+                android:layout_marginBottom="16dp"
+                app:counterEnabled="true"
+                app:counterMaxLength="2"
+                android:hint="@string/country">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_country"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textCapCharacters"
+                    android:maxLength="2"
+                    android:singleLine="true"
+                    android:text="US" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <LinearLayout
+                android:id="@+id/status_container"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="Country (C):"
-                android:textSize="14sp" />
+                android:orientation="vertical"
+                android:visibility="gone"
+                android:layout_marginBottom="16dp">
 
-            <EditText
-                android:id="@+id/et_country"
+                <TextView
+                    android:id="@+id/tv_status"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="12dp"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/progress_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
-                android:hint="US"
-                android:inputType="text"
-                android:maxLength="2"
-                android:singleLine="true"
-                android:text="US" />
+                android:layout_marginBottom="16dp"
+                android:visibility="gone"
+                android:indeterminate="true" />
 
         </LinearLayout>
 
     </ScrollView>
 
-    <!-- Status and Progress Section -->
-    <LinearLayout
-        android:id="@+id/status_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp">
-
-        <TextView
-            android:id="@+id/tv_status"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:textSize="14sp"
-            android:background="?android:attr/selectableItemBackground" />
-
-    </LinearLayout>
-
-    <!-- Progress Bar -->
-    <ProgressBar
-        android:id="@+id/progress_bar"
+    <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        android:visibility="gone"
-        android:indeterminate="true" />
-
-    <!-- Action Buttons -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/dividerHorizontal" />
+        android:layout_height="wrap_content" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
         android:gravity="end">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_clear"
-            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:text="Clear"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:text="@string/cancel" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_generate"
-            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Generate Keystore"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textStyle="bold" />
+            android:text="@string/generate_keystore" />
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="16dp" />
+
+</LinearLayout>
diff --git a/keystore-generator-plugin/src/main/res/values-night/colors.xml b/keystore-generator-plugin/src/main/res/values-night/colors.xml
index d78de65d82..e3e590bc65 100644
--- a/keystore-generator-plugin/src/main/res/values-night/colors.xml
+++ b/keystore-generator-plugin/src/main/res/values-night/colors.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="plugin_primary">#B1C5FF</color>
-    <color name="plugin_on_primary">#172E60</color>
-    <color name="plugin_primary_container">#304578</color>
-    <color name="plugin_on_primary_container">#DAE2FF</color>
+    <color name="plugin_primary">#88D6B8</color>
+    <color name="plugin_on_primary">#00382A</color>
+    <color name="plugin_primary_container">#00513D</color>
+    <color name="plugin_on_primary_container">#A4F2D3</color>
+    <color name="plugin_secondary">#B3CCBF</color>
+    <color name="plugin_on_secondary">#1F352C</color>
+    <color name="plugin_surface">#191C1A</color>
+    <color name="plugin_on_surface">#E1E3DF</color>
+    <color name="plugin_on_surface_variant">#BFC9C1</color>
+    <color name="plugin_outline">#89938C</color>
+    <color name="plugin_outline_variant">#404943</color>
 
-    <color name="status_text">#E4E2E6</color>
-    <color name="status_background">#44464F</color>
-
-    <color name="status_success_text">#81C784</color>
-    <color name="status_success_background">#1B3A1B</color>
-
-    <color name="status_error_text">#F2B8B5</color>
-    <color name="status_error_background">#8C1D18</color>
+    <color name="status_text">#E1E3DF</color>
+    <color name="status_background">#2E3230</color>
+    <color name="status_success_text">#88D6B8</color>
+    <color name="status_success_background">#0D2E22</color>
+    <color name="status_error_text">#FFB4AB</color>
+    <color name="status_error_background">#690005</color>
 </resources>
diff --git a/keystore-generator-plugin/src/main/res/values/colors.xml b/keystore-generator-plugin/src/main/res/values/colors.xml
index eb2b2edfae..b520b25246 100644
--- a/keystore-generator-plugin/src/main/res/values/colors.xml
+++ b/keystore-generator-plugin/src/main/res/values/colors.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="plugin_primary">#485D92</color>
+    <color name="plugin_primary">#1A6B52</color>
     <color name="plugin_on_primary">#FFFFFF</color>
-    <color name="plugin_primary_container">#DAE2FF</color>
-    <color name="plugin_on_primary_container">#001847</color>
+    <color name="plugin_primary_container">#A4F2D3</color>
+    <color name="plugin_on_primary_container">#002117</color>
+    <color name="plugin_secondary">#4C6359</color>
+    <color name="plugin_on_secondary">#FFFFFF</color>
+    <color name="plugin_surface">#FBFDF9</color>
+    <color name="plugin_on_surface">#191C1A</color>
+    <color name="plugin_on_surface_variant">#404943</color>
+    <color name="plugin_outline">#707973</color>
+    <color name="plugin_outline_variant">#BFC9C1</color>
 
-    <color name="status_text">#1B1B1F</color>
-    <color name="status_background">#E1E2EC</color>
-
-    <color name="status_success_text">#2E7D32</color>
-    <color name="status_success_background">#E8F5E9</color>
-
-    <color name="status_error_text">#B3261E</color>
-    <color name="status_error_background">#F9DEDC</color>
+    <color name="status_text">#191C1A</color>
+    <color name="status_background">#E1E7E2</color>
+    <color name="status_success_text">#1A6B52</color>
+    <color name="status_success_background">#D4F5E6</color>
+    <color name="status_error_text">#BA1A1A</color>
+    <color name="status_error_background">#FFDAD6</color>
 </resources>
diff --git a/keystore-generator-plugin/src/main/res/values/strings.xml b/keystore-generator-plugin/src/main/res/values/strings.xml
index 32c8c50bed..6aab2e4bd9 100644
--- a/keystore-generator-plugin/src/main/res/values/strings.xml
+++ b/keystore-generator-plugin/src/main/res/values/strings.xml
@@ -30,4 +30,28 @@
     <string name="error_invalid_input">Please fill in all required fields</string>
     <string name="error_generation_failed">Failed to generate keystore</string>
     <string name="error_no_project">No project is currently open</string>
-</resources>
\ No newline at end of file
+
+    <string name="error_required">Required</string>
+    <string name="error_country_length">Must be exactly 2 characters</string>
+    <string name="generating_keystore">Generating keystore…</string>
+    <string name="form_cleared">Form cleared</string>
+    <string name="tooltip_not_available">Long press detected! Tooltip service not available.</string>
+    <string name="docs_not_available">Long press detected! Documentation not available.</string>
+    <string name="error_validation_failed">Validation failed: %s</string>
+    <string name="error_project_service_unavailable">IDE project service not available</string>
+    <string name="error_permission_denied">Permission denied: %s</string>
+    <string name="error_generation">Generation error: %s</string>
+    <string name="error_build_file">Error modifying build file: %s</string>
+    <string name="error_file_service_unavailable">IdeFileService not available</string>
+    <string name="error_no_build_gradle">No build.gradle or build.gradle.kts found in app directory</string>
+    <string name="error_signing_pattern_not_found">Could not update signing config - pattern not found</string>
+    <string name="success_signing_updated">Updated existing release signing config</string>
+    <string name="error_signing_update_failed">Failed to update signing config</string>
+    <string name="success_signing_added">Added release signing config</string>
+    <string name="error_signing_add_failed">Failed to add release config to signingConfigs block</string>
+    <string name="success_build_file_updated">Build file updated with signing config</string>
+    <string name="error_no_android_block">Could not find android block in %s</string>
+    <string name="error_build_running">Cannot generate keystore while project is building or syncing</string>
+    <string name="error_build_failed">Cannot generate keystore - please fix build errors first</string>
+    <string name="error_unavailable">Keystore generation is currently unavailable</string>
+</resources>
diff --git a/keystore-generator-plugin/src/main/res/values/styles.xml b/keystore-generator-plugin/src/main/res/values/styles.xml
index fdc86fa776..f38efd3427 100644
--- a/keystore-generator-plugin/src/main/res/values/styles.xml
+++ b/keystore-generator-plugin/src/main/res/values/styles.xml
@@ -5,7 +5,12 @@
         <item name="colorOnPrimary">@color/plugin_on_primary</item>
         <item name="colorPrimaryContainer">@color/plugin_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/plugin_on_primary_container</item>
-        <item name="android:colorPrimary">@color/plugin_primary</item>
-        <item name="android:colorAccent">@color/plugin_primary</item>
+        <item name="colorSecondary">@color/plugin_secondary</item>
+        <item name="colorOnSecondary">@color/plugin_on_secondary</item>
+        <item name="colorSurface">@color/plugin_surface</item>
+        <item name="colorOnSurface">@color/plugin_on_surface</item>
+        <item name="colorOnSurfaceVariant">@color/plugin_on_surface_variant</item>
+        <item name="colorOutline">@color/plugin_outline</item>
+        <item name="colorOutlineVariant">@color/plugin_outline_variant</item>
     </style>
 </resources>
diff --git a/markdown-preview-plugin/build.gradle.kts b/markdown-preview-plugin/build.gradle.kts
index e697a907d3..c9fc0538d2 100644
--- a/markdown-preview-plugin/build.gradle.kts
+++ b/markdown-preview-plugin/build.gradle.kts
@@ -35,6 +35,8 @@ android {
         jvmTarget = "17"
     }
 
+
+
     packaging {
         resources {
             excludes += setOf(
diff --git a/markdown-preview-plugin/src/main/AndroidManifest.xml b/markdown-preview-plugin/src/main/AndroidManifest.xml
index 42774f7ac1..09fd39140f 100644
--- a/markdown-preview-plugin/src/main/AndroidManifest.xml
+++ b/markdown-preview-plugin/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
 
     <application
         android:label="Markdown Previewer"
-        android:theme="@style/Theme.AppCompat">
+        android:theme="@style/Theme.MarkdownPreviewer">
 
         <!-- Plugin metadata -->
         <meta-data
@@ -16,7 +16,7 @@
 
         <meta-data
             android:name="plugin.version"
-            android:value="1.0.0" />
+            android:value="1.0.1" />
 
         <meta-data
             android:name="plugin.description"
diff --git a/plugin-api/plugin-builder/src/main/kotlin/com/itsaky/androidide/plugins/build/PluginBuilder.kt b/plugin-api/plugin-builder/src/main/kotlin/com/itsaky/androidide/plugins/build/PluginBuilder.kt
index fa07842f8e..41509b8976 100644
--- a/plugin-api/plugin-builder/src/main/kotlin/com/itsaky/androidide/plugins/build/PluginBuilder.kt
+++ b/plugin-api/plugin-builder/src/main/kotlin/com/itsaky/androidide/plugins/build/PluginBuilder.kt
@@ -1,11 +1,27 @@
 package com.itsaky.androidide.plugins.build
 
+import com.android.build.api.dsl.ApplicationExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import java.io.File
 
 class PluginBuilder : Plugin<Project> {
 
+    private enum class BuildVariant(
+        val variantName: String,
+        val taskName: String,
+        val fileSuffix: String
+    ) {
+        DEBUG("debug", "assemblePluginDebug", "-debug"),
+        RELEASE("release", "assemblePlugin", "")
+    }
+
+    companion object {
+        private const val POSITIVE_HASH_MASK = 0x7FFFFFFF
+        private const val PACKAGE_ID_RANGE = 0x7D
+        private const val MIN_PACKAGE_ID = 0x02
+    }
+
     override fun apply(target: Project) {
         val extension = target.extensions.create(
             "pluginBuilder",
@@ -13,50 +29,48 @@ class PluginBuilder : Plugin<Project> {
         )
 
         target.afterEvaluate {
-            createDebugTask(target, extension)
-            createReleaseTask(target, extension)
+            configurePackageId(target)
+            BuildVariant.values().forEach { variant ->
+                createAssembleTask(target, extension, variant)
+            }
         }
     }
 
-    private fun createDebugTask(project: Project, extension: PluginBuilderExtension) {
-        val task = project.tasks.create("assemblePluginDebug")
-        task.group = "build"
-        task.description = "Assembles the debug plugin and creates .cgp file"
-        task.dependsOn("assembleDebug")
+    private fun configurePackageId(project: Project) {
+        val android = project.extensions.findByType(ApplicationExtension::class.java) ?: return
 
-        val pluginName = extension.pluginName.getOrElse(project.name)
-        val apkDir = File(project.buildDir, "outputs/apk/debug")
-        val outputDir = File(project.buildDir, "plugin")
+        val existingParams = android.androidResources.additionalParameters
+        val alreadyConfigured = existingParams.any { it == "--package-id" }
+        if (alreadyConfigured) {
+            project.logger.lifecycle("Plugin package-id already configured manually, skipping auto-assignment")
+            return
+        }
 
-        task.doLast(object : org.gradle.api.Action<org.gradle.api.Task> {
-            override fun execute(t: org.gradle.api.Task) {
-                outputDir.mkdirs()
+        val applicationId = android.defaultConfig.applicationId ?: project.group.toString()
+        val packageId = generatePackageId(applicationId)
+        val packageIdHex = "0x${packageId.toString(16).uppercase().padStart(2, '0')}"
 
-                t.logger.lifecycle("Looking for APK in: ${apkDir.absolutePath}")
+        android.androidResources.additionalParameters(
+            "--package-id", packageIdHex, "--allow-reserved-package-id"
+        )
 
-                val apkFile = apkDir.listFiles()?.firstOrNull { it.extension == "apk" }
-                if (apkFile == null) {
-                    t.logger.warn("No APK found in ${apkDir.absolutePath}")
-                    return
-                }
+        project.logger.lifecycle("Auto-assigned plugin package-id: $packageIdHex (from applicationId: $applicationId)")
+    }
 
-                val outputFile = File(outputDir, "$pluginName-debug.cgp")
-                apkFile.copyTo(outputFile, overwrite = true)
-                apkFile.delete()
-                t.logger.lifecycle("Plugin assembled: ${outputFile.absolutePath}")
-            }
-        })
+    private fun generatePackageId(applicationId: String): Int {
+        val hash = applicationId.hashCode() and POSITIVE_HASH_MASK
+        return (hash % PACKAGE_ID_RANGE) + MIN_PACKAGE_ID
     }
 
-    private fun createReleaseTask(project: Project, extension: PluginBuilderExtension) {
-        val task = project.tasks.create("assemblePlugin")
+    private fun createAssembleTask(project: Project, extension: PluginBuilderExtension, variant: BuildVariant) {
+        val task = project.tasks.create(variant.taskName)
         task.group = "build"
-        task.description = "Assembles the release plugin and creates .cgp file"
-        task.dependsOn("assembleRelease")
+        task.description = "Assembles the ${variant.variantName} plugin and creates .cgp file"
+        task.dependsOn("assemble${variant.variantName.replaceFirstChar { it.uppercase() }}")
 
         val pluginName = extension.pluginName.getOrElse(project.name)
-        val apkDir = File(project.buildDir, "outputs/apk/release")
-        val outputDir = File(project.buildDir, "plugin")
+        val apkDir = File(project.layout.buildDirectory.asFile.get(), "outputs/apk/${variant.variantName}")
+        val outputDir = File(project.layout.buildDirectory.asFile.get(), "plugin")
 
         task.doLast(object : org.gradle.api.Action<org.gradle.api.Task> {
             override fun execute(t: org.gradle.api.Task) {
@@ -70,11 +84,11 @@ class PluginBuilder : Plugin<Project> {
                     return
                 }
 
-                val outputFile = File(outputDir, "$pluginName.cgp")
+                val outputFile = File(outputDir, "$pluginName${variant.fileSuffix}.cgp")
                 apkFile.copyTo(outputFile, overwrite = true)
                 apkFile.delete()
                 t.logger.lifecycle("Plugin assembled: ${outputFile.absolutePath}")
             }
         })
     }
-}
\ No newline at end of file
+}
diff --git a/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/IPlugin.kt b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/IPlugin.kt
index 5b957bd73c..c4050b5b3d 100644
--- a/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/IPlugin.kt
+++ b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/IPlugin.kt
@@ -29,7 +29,8 @@ enum class PluginPermission(val key: String, val description: String) {
     NETWORK_ACCESS("network.access", "Access network resources"),
     SYSTEM_COMMANDS("system.commands", "Execute system commands"),
     IDE_SETTINGS("ide.settings", "Modify IDE settings"),
-    PROJECT_STRUCTURE("project.structure", "Modify project structure")
+    PROJECT_STRUCTURE("project.structure", "Modify project structure"),
+    NATIVE_CODE("native.code", "Execute native machine code")
 }
 
 data class PluginInfo(
diff --git a/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/base/PluginFragment.kt b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/base/PluginFragment.kt
index c2a793162a..f6c4dc9bc0 100644
--- a/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/base/PluginFragment.kt
+++ b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/base/PluginFragment.kt
@@ -1,8 +1,10 @@
 package com.itsaky.androidide.plugins.base
 
 import android.content.Context
+import android.content.res.Resources
 import android.view.LayoutInflater
 import com.itsaky.androidide.plugins.ServiceRegistry
+import java.lang.ref.WeakReference
 
 /**
  * Base class for plugin fragments that ensures proper resource context.
@@ -13,12 +15,24 @@ import com.itsaky.androidide.plugins.ServiceRegistry
  */
 object PluginFragmentHelper {
 
-    // Map of plugin IDs to their resource contexts
     private val pluginContexts = mutableMapOf<String, Context>()
-
-    // Map of plugin IDs to their service registries
     private val serviceRegistries = mutableMapOf<String, ServiceRegistry>()
 
+    private data class ActivitySnapshot(
+        val contextRef: WeakReference<Context>,
+        val themeRef: WeakReference<Resources.Theme>
+    )
+
+    private val activitySnapshots = mutableMapOf<String, ActivitySnapshot>()
+
+    @JvmStatic
+    fun getCurrentActivityTheme(pluginId: String): Resources.Theme? =
+        activitySnapshots[pluginId]?.themeRef?.get()
+
+    @JvmStatic
+    fun getCurrentActivityContext(pluginId: String): Context? =
+        activitySnapshots[pluginId]?.contextRef?.get()
+
     /**
      * Register a plugin's resource context.
      * Called by the plugin manager when loading APK-based plugins.
@@ -35,6 +49,7 @@ object PluginFragmentHelper {
     @JvmStatic
     fun unregisterPluginContext(pluginId: String) {
         pluginContexts.remove(pluginId)
+        activitySnapshots.remove(pluginId)
     }
 
     /**
@@ -69,6 +84,7 @@ object PluginFragmentHelper {
     fun clearAllContexts() {
         pluginContexts.clear()
         serviceRegistries.clear()
+        activitySnapshots.clear()
     }
 
     /**
@@ -82,10 +98,10 @@ object PluginFragmentHelper {
     @JvmStatic
     fun getPluginInflater(pluginId: String, defaultInflater: LayoutInflater): LayoutInflater {
         val pluginContext = getPluginContext(pluginId) ?: return defaultInflater
-
-        pluginContext.theme
-
-        val inflater = pluginContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
-        return inflater ?: defaultInflater.cloneInContext(pluginContext)
+        activitySnapshots[pluginId] = ActivitySnapshot(
+            contextRef = WeakReference(defaultInflater.context),
+            themeRef = WeakReference(defaultInflater.context.theme)
+        )
+        return defaultInflater.cloneInContext(pluginContext)
     }
 }
\ No newline at end of file
diff --git a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt
index fdadcfb064..f0364e8669 100644
--- a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt
+++ b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/core/PluginManager.kt
@@ -312,8 +312,25 @@ class PluginManager private constructor(
                 }.toSet()
             }.getOrElse { emptySet() }
 
-            // Load plugin classes
-            val classLoader = pluginLoader.loadPluginClasses(this::class.java.classLoader!!)
+            var nativeLibPath: String? = try {
+                pluginLoader.extractNativeLibs(manifest.id)?.absolutePath
+            } catch (e: Exception) {
+                logger.warn("Failed to extract native libs for plugin: ${manifest.id}", e)
+                null
+            }
+
+            if (nativeLibPath != null && !permissions.contains(PluginPermission.NATIVE_CODE)) {
+                File(nativeLibPath).deleteRecursively()
+                if (manifest.sidebarItems > 0) {
+                    SidebarSlotManager.releasePluginSlots(manifest.id)
+                }
+                return Result.failure(SecurityException(
+                    "Plugin '${manifest.name}' bundles native libraries but does not declare " +
+                    "'native.code' permission. Add 'native.code' to plugin.permissions in the manifest."
+                ))
+            }
+
+            val classLoader = pluginLoader.loadPluginClasses(this::class.java.classLoader!!, nativeLibPath)
             if (classLoader == null) {
                 if (manifest.sidebarItems > 0) {
                     SidebarSlotManager.releasePluginSlots(manifest.id)
@@ -342,7 +359,7 @@ class PluginManager private constructor(
             }
 
             // Create plugin context with  resources
-            val ctx = pluginLoader.createPluginContext()
+            val ctx = pluginLoader.createPluginContext(manifest.id)
             if (ctx == null) {
                 if (manifest.sidebarItems > 0) {
                     SidebarSlotManager.releasePluginSlots(manifest.id)
@@ -451,9 +468,12 @@ class PluginManager private constructor(
             // Unregister the plugin's resource context
             PluginFragmentHelper.unregisterPluginContext(pluginId)
 
-            // Unregister all fragment classloaders for this plugin to avoid leaks
             PluginFragmentFactory.unregisterAllClassLoadersForPlugin(pluginId)
 
+            File(context.getDir("plugin_native_libs", Context.MODE_PRIVATE), pluginId).let { dir ->
+                if (dir.exists()) dir.deleteRecursively()
+            }
+
             logger.info("Unloaded plugin: $pluginId")
             return true
         } catch (e: Exception) {
@@ -676,6 +696,8 @@ class PluginManager private constructor(
     fun setActivityProvider(provider: ActivityProvider?) {
         this.activityProvider = provider
     }
+
+    fun getCurrentActivity(): Activity? = activityProvider?.getCurrentActivity()
     
     /**
      * Set the path validator for validating plugin file access
@@ -1016,13 +1038,16 @@ class PluginManager private constructor(
         executeWithErrorHandling("cleanup plugin cache files", pluginId) {
             logger.debug("Cleaning up ALL files and cache for plugin: $pluginId")
 
-            // Clean up plugin's own directory if it exists
             val pluginDir = File(pluginsDir, pluginId)
             if (pluginDir.exists()) {
                 val deleted = pluginDir.deleteRecursively()
                 logger.debug("Deleted plugin directory: ${pluginDir.absolutePath} (success: $deleted)")
             }
 
+            File(context.getDir("plugin_native_libs", Context.MODE_PRIVATE), pluginId).let { dir ->
+                if (dir.exists()) dir.deleteRecursively()
+            }
+
             // Clean up ART cache files in oat directory
             try {
                 val oatDir = File(pluginsDir, "oat")
diff --git a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/loaders/PluginLoader.kt b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/loaders/PluginLoader.kt
index da40724b86..4e8749e967 100644
--- a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/loaders/PluginLoader.kt
+++ b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/loaders/PluginLoader.kt
@@ -5,12 +5,11 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.AssetManager
 import android.content.res.Resources
+import android.os.Build
 import android.util.Log
-import com.itsaky.androidide.plugins.manager.loaders.PluginManifest
-import com.itsaky.androidide.plugins.manager.loaders.PluginManifestParser
-import com.itsaky.androidide.plugins.manager.loaders.PluginResourceContext
 import dalvik.system.DexClassLoader
 import java.io.File
+import java.util.zip.ZipFile
 
 /**
  * Loader for APK-based plugins with full resource support
@@ -26,6 +25,7 @@ class PluginLoader(
     private var pluginResources: Resources? = null
     private var pluginPackageInfo: PackageInfo? = null
     private var pluginClassLoader: DexClassLoader? = null
+    private var nativeLibDir: File? = null
 
     /**
      * Load plugin resources from APK
@@ -88,7 +88,7 @@ class PluginLoader(
     /**
      * Load plugin classes from APK
      */
-    fun loadPluginClasses(parentClassLoader: ClassLoader): DexClassLoader? {
+    fun loadPluginClasses(parentClassLoader: ClassLoader, nativeLibPath: String? = null): DexClassLoader? {
         if (pluginClassLoader != null) {
             return pluginClassLoader
         }
@@ -102,11 +102,11 @@ class PluginLoader(
             pluginClassLoader = DexClassLoader(
                 pluginApk.absolutePath,
                 optimizedDir.absolutePath,
-                null,
+                nativeLibPath,
                 parentClassLoader
             )
 
-            Log.i(TAG, "Successfully created DexClassLoader for plugin APK")
+            Log.i(TAG, "Successfully created DexClassLoader for plugin APK (nativeLibPath=$nativeLibPath)")
             return pluginClassLoader
         } catch (e: Exception) {
             Log.e(TAG, "Failed to create DexClassLoader: ${e.message}", e)
@@ -117,7 +117,7 @@ class PluginLoader(
     /**
      * Create a Context with plugin resources
      */
-    fun createPluginContext(): Context? {
+    fun createPluginContext(pluginId: String): Context? {
         // Ensure we have loaded resources first
         val resources = loadPluginResources()
         if (resources == null) {
@@ -131,17 +131,53 @@ class PluginLoader(
             return null
         }
 
-        // Create the plugin context with proper theming
         return PluginResourceContext(
             context,
+            pluginId,
             resources,
-            packageInfo
+            packageInfo,
+            pluginClassLoader
         )
     }
 
-    /**
-     * Get plugin metadata from AndroidManifest
-     */
+    fun extractNativeLibs(pluginId: String): File? {
+        val pluginNativeDir = File(context.getDir("plugin_native_libs", Context.MODE_PRIVATE), pluginId)
+        if (pluginNativeDir.exists()) {
+            nativeLibDir = pluginNativeDir
+            return pluginNativeDir
+        }
+
+        val libPrefix = "lib/${Build.SUPPORTED_ABIS[0]}/"
+        val targetPath = pluginNativeDir.toPath().toAbsolutePath().normalize()
+        pluginNativeDir.mkdirs()
+
+        var found = false
+        ZipFile(pluginApk).use { zip ->
+            zip.entries().asSequence()
+                .filter { !it.isDirectory && it.name.startsWith(libPrefix) && it.name.endsWith(".so") }
+                .forEach { entry ->
+                    val outPath = targetPath.resolve(entry.name.substringAfterLast("/")).normalize()
+                    if (outPath.startsWith(targetPath)) {
+                        zip.getInputStream(entry).use { input ->
+                            outPath.toFile().outputStream().use { output ->
+                                input.copyTo(output)
+                            }
+                        }
+                        outPath.toFile().setExecutable(true, false)
+                        found = true
+                    }
+                }
+        }
+
+        if (!found) {
+            pluginNativeDir.deleteRecursively()
+            return null
+        }
+
+        nativeLibDir = pluginNativeDir
+        return pluginNativeDir
+    }
+
     fun getPluginMetadata(): PluginManifest? {
         try {
             val packageInfo = pluginPackageInfo ?: context.packageManager.getPackageArchiveInfo(
@@ -221,4 +257,4 @@ class PluginLoader(
         pluginPackageInfo = null
         pluginClassLoader = null
     }
-}
\ No newline at end of file
+}
diff --git a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/loaders/PluginResourceContext.kt b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/loaders/PluginResourceContext.kt
index e9c76e5d90..f2afced0f1 100644
--- a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/loaders/PluginResourceContext.kt
+++ b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/loaders/PluginResourceContext.kt
@@ -4,155 +4,181 @@ import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.res.AssetManager
-import android.content.res.Configuration
 import android.content.res.Resources
 import android.content.res.Resources.Theme
-import android.util.AttributeSet
+import android.content.res.loader.ResourcesLoader
+import android.content.res.loader.ResourcesProvider
+import android.os.Build
+import android.os.ParcelFileDescriptor
+import android.util.Log
 import android.view.ContextThemeWrapper
 import android.view.LayoutInflater
-import android.view.View
-import androidx.appcompat.app.AppCompatDelegate
+import com.itsaky.androidide.plugins.base.PluginFragmentHelper
+import com.itsaky.androidide.plugins.manager.core.PluginManager
+import java.io.File
 
 class PluginResourceContext(
     baseContext: Context,
-    pluginResources: Resources,
-    private val pluginPackageInfo: PackageInfo? = null
+    private val pluginId: String,
+    private val pluginResources: Resources,
+    private val pluginPackageInfo: PackageInfo? = null,
+    private val pluginClassLoader: ClassLoader? = null
 ) : ContextThemeWrapper(baseContext, 0) {
 
-    private var pluginResources: Resources = pluginResources
+    companion object {
+        private const val TAG = "PluginResourceContext"
+        private const val PLUGIN_THEME_NAME = "PluginTheme"
+        private val ADD_ASSET_PATH_METHOD = AssetManager::class.java.getMethod("addAssetPath", String::class.java)
+    }
+
     private var inflater: LayoutInflater? = null
-    private var lastNightMode: Int = -1
     private var pluginTheme: Theme? = null
+    private var lastActivityTheme: Theme? = null
+    private var usesCustomPackageId = false
+    private val pluginSourceDir: String? = pluginPackageInfo?.applicationInfo?.sourceDir
+    private val appThemeResId: Int = pluginPackageInfo?.applicationInfo?.theme ?: 0
+    private var pluginThemeResId: Int = 0
+    private var pluginThemeResIdResolved = false
+
+    init {
+        usesCustomPackageId = detectCustomPackageId()
+    }
 
-    override fun getResources(): Resources {
-        return pluginResources
+    private fun detectCustomPackageId(): Boolean {
+        val cl = pluginClassLoader ?: return false
+        val pkg = pluginPackageInfo?.packageName ?: return false
+        return try {
+            val rClass = cl.loadClass("$pkg.R")
+            rClass.declaredClasses.asSequence()
+                .flatMap { it.declaredFields.asSequence() }
+                .filter { it.type == Int::class.javaPrimitiveType }
+                .map { it.getInt(null) }
+                .firstOrNull { it != 0 }
+                ?.let { (it ushr 24) != 0x7F } ?: false
+        } catch (e: ReflectiveOperationException) {
+            Log.w(TAG, "Failed to detect custom package ID for $pkg", e)
+            false
+        }
     }
 
-    override fun getAssets(): AssetManager {
-        return pluginResources.assets
+    private var patchedResources: Resources? = null
+    private var cachedLoader: ResourcesLoader? = null
+    private var cachedProvider: ResourcesProvider? = null
+
+    @Suppress("NewApi")
+    private fun ensurePluginResourcesAdded(targetResources: Resources) {
+        if (patchedResources === targetResources) return
+        val sourceDir = pluginSourceDir ?: return
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            try {
+                if (cachedLoader == null) {
+                    val pfd = ParcelFileDescriptor.open(File(sourceDir), ParcelFileDescriptor.MODE_READ_ONLY)
+                    cachedProvider = ResourcesProvider.loadFromApk(pfd)
+                    pfd.close()
+                    cachedLoader = ResourcesLoader().also { it.addProvider(cachedProvider!!) }
+                }
+                targetResources.addLoaders(cachedLoader!!)
+                patchedResources = targetResources
+                Log.d(TAG, "Added plugin resources via ResourcesLoader for ${pluginPackageInfo?.packageName}")
+            } catch (e: Exception) {
+                Log.e(TAG, "ResourcesLoader failed, falling back to addAssetPath", e)
+                addAssetPathFallback(targetResources.assets, sourceDir)
+                patchedResources = targetResources
+            }
+        } else {
+            addAssetPathFallback(targetResources.assets, sourceDir)
+            patchedResources = targetResources
+        }
     }
 
-    private fun recreatePluginResources(newConfig: Configuration) {
-        val sourceDir = pluginPackageInfo?.applicationInfo?.sourceDir ?: return
-        @Suppress("DEPRECATION")
-        val assetManager = AssetManager::class.java.getDeclaredConstructor().newInstance()
-        val addAssetPath = AssetManager::class.java.getMethod("addAssetPath", String::class.java)
-        addAssetPath.invoke(assetManager, sourceDir)
-        @Suppress("DEPRECATION")
-        pluginResources = Resources(assetManager, baseContext.resources.displayMetrics, newConfig)
+    private fun addAssetPathFallback(assets: AssetManager, pluginSourceDir: String) {
+        try {
+            ADD_ASSET_PATH_METHOD.invoke(assets, pluginSourceDir)
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to add plugin asset path", e)
+        }
     }
 
-    private fun resolveCurrentNightMode(): Int {
-        return when (AppCompatDelegate.getDefaultNightMode()) {
-            AppCompatDelegate.MODE_NIGHT_YES -> Configuration.UI_MODE_NIGHT_YES
-            AppCompatDelegate.MODE_NIGHT_NO -> Configuration.UI_MODE_NIGHT_NO
-            else -> baseContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+    private fun resolveActivityContextAndTheme(): Pair<Context, Theme>? {
+        val fragmentCtx = PluginFragmentHelper.getCurrentActivityContext(pluginId)
+        val fragmentTheme = PluginFragmentHelper.getCurrentActivityTheme(pluginId)
+        if (fragmentCtx != null && fragmentTheme != null) {
+            return fragmentCtx to fragmentTheme
         }
+        val activity = PluginManager.getInstance()?.getCurrentActivity() ?: return null
+        return activity to activity.theme
     }
 
+    override fun getResources(): Resources {
+        if (!usesCustomPackageId) return pluginResources
+
+        val (actCtx, _) = resolveActivityContextAndTheme() ?: return pluginResources
+        ensurePluginResourcesAdded(actCtx.resources)
+        return actCtx.resources
+    }
+
+    override fun getAssets(): AssetManager = getResources().assets
+
     override fun getTheme(): Theme {
-        val currentNightMode = resolveCurrentNightMode()
+        if (!usesCustomPackageId) return baseContext.theme
 
-        if (currentNightMode != lastNightMode || pluginTheme == null) {
-            lastNightMode = currentNightMode
-            val correctedConfig = Configuration(baseContext.resources.configuration).apply {
-                uiMode = (uiMode and Configuration.UI_MODE_NIGHT_MASK.inv()) or currentNightMode
-            }
-            recreatePluginResources(correctedConfig)
+        val (actCtx, actTheme) = resolveActivityContextAndTheme() ?: return pluginTheme ?: baseContext.theme
+        ensurePluginResourcesAdded(actCtx.resources)
+        if (pluginTheme == null || lastActivityTheme !== actTheme) {
+            lastActivityTheme = actTheme
             inflater = null
 
-            val pluginThemeResId = pluginResources.getIdentifier(
-                "PluginTheme",
-                "style",
-                pluginPackageInfo?.packageName
-            )
-
-            val themeResId = if (pluginThemeResId != 0) {
-                pluginThemeResId
-            } else if (currentNightMode == Configuration.UI_MODE_NIGHT_YES) {
-                android.R.style.Theme_Material
-            } else {
-                android.R.style.Theme_Material_Light
+            if (!pluginThemeResIdResolved) {
+                pluginThemeResId = actCtx.resources.getIdentifier(
+                    PLUGIN_THEME_NAME, "style", pluginPackageInfo?.packageName
+                )
+                pluginThemeResIdResolved = true
             }
 
-            pluginTheme = pluginResources.newTheme().apply {
-                applyStyle(themeResId, true)
+            pluginTheme = actCtx.resources.newTheme().apply {
+                setTo(actTheme)
+
+                if (appThemeResId != 0) {
+                    applyStyle(appThemeResId, false)
+                }
+
+                if (pluginThemeResId != 0) {
+                    applyStyle(pluginThemeResId, true)
+                }
             }
         }
-        return pluginTheme!!
+        return pluginTheme ?: baseContext.theme
     }
 
     override fun getClassLoader(): ClassLoader {
-        // Use the base context's class loader to ensure Android framework classes can be loaded
-        // This is critical for LayoutInflater to find system widget classes
-        return baseContext.classLoader
+        return pluginClassLoader ?: baseContext.classLoader
     }
 
     override fun getPackageName(): String {
-        // Return plugin's package name if available
         return pluginPackageInfo?.packageName ?: super.getPackageName()
     }
 
     override fun getApplicationInfo(): ApplicationInfo {
-        // Return plugin's application info if available
         return pluginPackageInfo?.applicationInfo ?: super.getApplicationInfo()
     }
 
     override fun getSystemService(name: String): Any? {
         if (Context.LAYOUT_INFLATER_SERVICE == name) {
             if (inflater == null) {
-                // Create a custom LayoutInflater that can properly handle system widgets
-                val baseInflater = LayoutInflater.from(baseContext)
-                inflater = object : LayoutInflater(baseInflater, this) {
-                    override fun cloneInContext(newContext: Context): LayoutInflater {
-                        return getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
-                    }
-
-                    override fun onCreateView(name: String, attrs: AttributeSet): View? {
-                        if (name.indexOf('.') == -1) {
-                            try {
-                                val view = createView(name, "android.widget.", attrs)
-                                return view
-                            } catch (e: ClassNotFoundException) {
-                                try {
-                                    val view = createView(name, "android.view.", attrs)
-                                    return view
-                                } catch (e2: ClassNotFoundException) {
-                                    try {
-                                        val view = createView(name, "android.webkit.", attrs)
-                                        return view
-                                    } catch (e3: ClassNotFoundException) {
-                                        // Let parent handle it
-                                    }
-                                }
-                            }
-                        }
-                        return super.onCreateView(name, attrs)
-                    }
-                }
+                inflater = LayoutInflater.from(baseContext).cloneInContext(this)
             }
             return inflater
         }
         return super.getSystemService(name)
     }
 
-    /**
-     * Get the plugin's package info
-     */
-    fun getPluginPackageInfo(): PackageInfo? {
-        return pluginPackageInfo
-    }
+    fun getPluginPackageInfo(): PackageInfo? = pluginPackageInfo
 
-    /**
-     * Helper to get resource ID by name
-     */
     fun getResourceId(name: String, type: String): Int {
-        return pluginResources.getIdentifier(name, type, packageName)
+        return getResources().getIdentifier(name, type, packageName)
     }
 
-    /**
-     * Helper to inflate layout
-     */
     fun inflateLayout(layoutResId: Int, root: android.view.ViewGroup? = null, attachToRoot: Boolean = false): android.view.View {
         val inflater = getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         return inflater.inflate(layoutResId, root, attachToRoot)
diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/pluginProject/PluginTemplateData.kt b/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/pluginProject/PluginTemplateData.kt
index 3e583d4a5f..d84889c62d 100644
--- a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/pluginProject/PluginTemplateData.kt
+++ b/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/pluginProject/PluginTemplateData.kt
@@ -22,7 +22,8 @@ enum class PluginPermission(val value: String, val displayName: String) {
 	NETWORK_ACCESS("network.access", "Network Access"),
 	SYSTEM_COMMANDS("system.commands", "System Commands"),
 	IDE_SETTINGS("ide.settings", "IDE Settings"),
-	PROJECT_STRUCTURE("project.structure", "Project Structure")
+	PROJECT_STRUCTURE("project.structure", "Project Structure"),
+	NATIVE_CODE("native.code", "Native Code")
 }
 
 enum class PluginExtension(val interfaceName: String, val displayName: String) {