diff --git a/app/src/main/java/de/jrpie/android/launcher/preferences/Preferences.kt b/app/src/main/java/de/jrpie/android/launcher/preferences/Preferences.kt
index 34cf569..fd86d79 100644
--- a/app/src/main/java/de/jrpie/android/launcher/preferences/Preferences.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/preferences/Preferences.kt
@@ -16,6 +16,7 @@ import de.jrpie.android.launcher.preferences.legacy.migratePreferencesFromVersio
 import de.jrpie.android.launcher.preferences.legacy.migratePreferencesFromVersionUnknown
 import de.jrpie.android.launcher.ui.HomeActivity
 import de.jrpie.android.launcher.widgets.ClockWidget
+import de.jrpie.android.launcher.widgets.DebugInfoWidget
 import de.jrpie.android.launcher.widgets.WidgetPanel
 import de.jrpie.android.launcher.widgets.WidgetPosition
 import de.jrpie.android.launcher.widgets.deleteAllWidgets
@@ -95,17 +96,33 @@ fun resetPreferences(context: Context) {
         )
     )
 
+    if (BuildConfig.DEBUG) {
+        LauncherPreferences.widgets().widgets(
+            LauncherPreferences.widgets().widgets().also {
+                it.add(
+                    DebugInfoWidget(
+                        (context.applicationContext as Application).appWidgetHost.allocateAppWidgetId(),
+                        WidgetPosition(1, 1, 10, 4),
+                        WidgetPanel.HOME.id
+                    )
+                )
+            }
+        )
+    }
 
     val hidden: MutableSet<AbstractAppInfo> = mutableSetOf()
-    val launcher = DetailedAppInfo.fromAppInfo(
-        AppInfo(
-            BuildConfig.APPLICATION_ID,
-            HomeActivity::class.java.name,
-            INVALID_USER
-        ), context
-    )
-    launcher?.getRawInfo()?.let { hidden.add(it) }
-    Log.i(TAG,"Hiding ${launcher?.getRawInfo()}")
+
+    if (!BuildConfig.DEBUG) {
+        val launcher = DetailedAppInfo.fromAppInfo(
+            AppInfo(
+                BuildConfig.APPLICATION_ID,
+                HomeActivity::class.java.name,
+                INVALID_USER
+            ), context
+        )
+        launcher?.getRawInfo()?.let { hidden.add(it) }
+        Log.i(TAG, "Hiding ${launcher?.getRawInfo()}")
+    }
     LauncherPreferences.apps().hidden(hidden)
 
     Action.resetToDefaultActions(context)
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
index 957c902..f501107 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
@@ -12,11 +12,10 @@ import android.view.MotionEvent
 import android.view.View
 import android.window.OnBackInvokedDispatcher
 import de.jrpie.android.launcher.Application
-import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.actions.Action
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.actions.LauncherAction
-import de.jrpie.android.launcher.databinding.HomeBinding
+import de.jrpie.android.launcher.databinding.ActivityHomeBinding
 import de.jrpie.android.launcher.openTutorial
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.ui.tutorial.TutorialActivity
@@ -35,7 +34,7 @@ import de.jrpie.android.launcher.ui.tutorial.TutorialActivity
  */
 class HomeActivity : UIObject, Activity() {
 
-    private lateinit var binding: HomeBinding
+    private lateinit var binding: ActivityHomeBinding
     private var touchGestureDetector: TouchGestureDetector? = null
 
     private var sharedPreferencesListener =
@@ -60,7 +59,7 @@ class HomeActivity : UIObject, Activity() {
 
 
         // Initialise layout
-        binding = HomeBinding.inflate(layoutInflater)
+        binding = ActivityHomeBinding.inflate(layoutInflater)
 
         setContentView(binding.root)
 
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/widgets/ClockView.kt b/app/src/main/java/de/jrpie/android/launcher/ui/widgets/ClockView.kt
index 33c4888..54d3869 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/widgets/ClockView.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/widgets/ClockView.kt
@@ -6,13 +6,13 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
 import de.jrpie.android.launcher.actions.Gesture
-import de.jrpie.android.launcher.databinding.ClockBinding
+import de.jrpie.android.launcher.databinding.WidgetClockBinding
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import java.util.Locale
 
 class ClockView(context: Context, attrs: AttributeSet? = null, val appWidgetId: Int): ConstraintLayout(context, attrs) {
 
-    val binding: ClockBinding = ClockBinding.inflate(LayoutInflater.from(context), this, true)
+    val binding: WidgetClockBinding = WidgetClockBinding.inflate(LayoutInflater.from(context), this, true)
     init {
         initClock()
         setOnClicks()
diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/widgets/DebugInfoView.kt b/app/src/main/java/de/jrpie/android/launcher/ui/widgets/DebugInfoView.kt
new file mode 100644
index 0000000..d0ab70a
--- /dev/null
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/widgets/DebugInfoView.kt
@@ -0,0 +1,17 @@
+package de.jrpie.android.launcher.ui.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import de.jrpie.android.launcher.databinding.WidgetDebugInfoBinding
+import de.jrpie.android.launcher.getDeviceInfo
+
+class DebugInfoView(context: Context, attrs: AttributeSet? = null, val appWidgetId: Int): ConstraintLayout(context, attrs) {
+
+    val binding: WidgetDebugInfoBinding = WidgetDebugInfoBinding.inflate(LayoutInflater.from(context), this, true)
+
+    init {
+        binding.debugInfoText.text = getDeviceInfo()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/jrpie/android/launcher/widgets/DebugInfoWidget.kt b/app/src/main/java/de/jrpie/android/launcher/widgets/DebugInfoWidget.kt
new file mode 100644
index 0000000..01ecddc
--- /dev/null
+++ b/app/src/main/java/de/jrpie/android/launcher/widgets/DebugInfoWidget.kt
@@ -0,0 +1,42 @@
+package de.jrpie.android.launcher.widgets
+
+import android.app.Activity
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.view.View
+import de.jrpie.android.launcher.ui.widgets.DebugInfoView
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+@SerialName("widget:debuginfo")
+class DebugInfoWidget(
+    override val id: Int,
+    override var position: WidgetPosition,
+    override val panelId: Int,
+    override var allowInteraction: Boolean = true
+) : Widget() {
+
+    override fun createView(activity: Activity): View {
+        return DebugInfoView(activity, null, id)
+    }
+
+    override fun findView(views: Sequence<View>): DebugInfoView? {
+        return views.mapNotNull { it as? DebugInfoView }.firstOrNull { it.appWidgetId == id }
+    }
+
+    override fun getPreview(context: Context): Drawable? {
+        return null
+    }
+
+    override fun getIcon(context: Context): Drawable? {
+        return null
+    }
+
+    override fun isConfigurable(context: Context): Boolean {
+        return false
+    }
+
+    override fun configure(activity: Activity, requestCode: Int) { }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/jrpie/android/launcher/widgets/LauncherWidgetProvider.kt b/app/src/main/java/de/jrpie/android/launcher/widgets/LauncherWidgetProvider.kt
index 018b29b..92f33a9 100644
--- a/app/src/main/java/de/jrpie/android/launcher/widgets/LauncherWidgetProvider.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/widgets/LauncherWidgetProvider.kt
@@ -37,13 +37,14 @@ class LauncherAppWidgetProvider(val info: AppWidgetProviderInfo) : LauncherWidge
     }
 
 }
-class LauncherClockWidgetProvider : LauncherWidgetProvider() {
 
-    override fun loadLabel(context: Context): CharSequence? {
+data object LauncherClockWidgetProvider : LauncherWidgetProvider() {
+
+    override fun loadLabel(context: Context): CharSequence {
         return context.getString(R.string.widget_clock_label)
     }
 
-    override fun loadDescription(context: Context): CharSequence? {
+    override fun loadDescription(context: Context): CharSequence {
         return context.getString(R.string.widget_clock_description)
     }
 
@@ -54,5 +55,4 @@ class LauncherClockWidgetProvider : LauncherWidgetProvider() {
     override fun loadIcon(context: Context): Drawable? {
         return AppCompatResources.getDrawable(context, R.drawable.baseline_clock_24)
     }
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/jrpie/android/launcher/widgets/Widget.kt b/app/src/main/java/de/jrpie/android/launcher/widgets/Widget.kt
index e31250b..28539a2 100644
--- a/app/src/main/java/de/jrpie/android/launcher/widgets/Widget.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/widgets/Widget.kt
@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.view.View
-import de.jrpie.android.launcher.Application
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
diff --git a/app/src/main/java/de/jrpie/android/launcher/widgets/Widgets.kt b/app/src/main/java/de/jrpie/android/launcher/widgets/Widgets.kt
index b7f140b..cded50c 100644
--- a/app/src/main/java/de/jrpie/android/launcher/widgets/Widgets.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/widgets/Widgets.kt
@@ -53,7 +53,7 @@ fun bindAppWidgetOrRequestPermission(activity: Activity, providerInfo: AppWidget
 
 
 fun getAppWidgetProviders( context: Context ): List<LauncherWidgetProvider> {
-    val list = mutableListOf<LauncherWidgetProvider>(LauncherClockWidgetProvider())
+    val list = mutableListOf<LauncherWidgetProvider>(LauncherClockWidgetProvider)
     val appWidgetManager = context.getAppWidgetManager()
     val profiles =
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -68,11 +68,9 @@ fun getAppWidgetProviders( context: Context ): List<LauncherWidgetProvider> {
         }.flatten()
     )
 
-
     return list
 }
 
-
 fun updateWidget(widget: Widget) {
     LauncherPreferences.widgets().widgets(
         (LauncherPreferences.widgets().widgets() ?: setOf())
diff --git a/app/src/main/res/layout/home.xml b/app/src/main/res/layout/activity_home.xml
similarity index 100%
rename from app/src/main/res/layout/home.xml
rename to app/src/main/res/layout/activity_home.xml
diff --git a/app/src/main/res/layout/clock.xml b/app/src/main/res/layout/widget_clock.xml
similarity index 100%
rename from app/src/main/res/layout/clock.xml
rename to app/src/main/res/layout/widget_clock.xml
diff --git a/app/src/main/res/layout/widget_debug_info.xml b/app/src/main/res/layout/widget_debug_info.xml
new file mode 100644
index 0000000..1de9e43
--- /dev/null
+++ b/app/src/main/res/layout/widget_debug_info.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:longClickable="false"
+    android:fitsSystemWindows="true"
+    tools:context=".ui.widgets.DebugInfoView">
+
+    <TextView
+        android:id="@+id/debugInfoText"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file