diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cabc2051..fdab5a4c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,7 +62,7 @@
         tools:targetApi="tiramisu">
 
         <receiver
-            android:name=".widgets.UpcomingWidget"
+            android:name=".widgets.upcoming.UpcomingWidget"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -73,7 +73,7 @@
                 android:resource="@xml/upcoming_widget_info" />
         </receiver>
         <activity
-            android:name=".widgets.UpcomingWidgetConfigureActivity"
+            android:name=".widgets.upcoming.UpcomingWidgetConfigureActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -347,7 +347,7 @@
         </provider>
 
         <service
-            android:name=".widgets.UpcomingRemoteViewsService"
+            android:name=".widgets.upcoming.UpcomingRemoteViewsService"
             android:exported="true"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
         <service
diff --git a/app/src/main/java/ani/dantotsu/util/BitmapUtil.kt b/app/src/main/java/ani/dantotsu/util/BitmapUtil.kt
new file mode 100644
index 00000000..b3592291
--- /dev/null
+++ b/app/src/main/java/ani/dantotsu/util/BitmapUtil.kt
@@ -0,0 +1,33 @@
+package ani.dantotsu.util
+
+import android.graphics.Bitmap
+import android.graphics.BitmapShader
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.RectF
+import android.graphics.Shader
+import android.graphics.drawable.Drawable
+
+class BitmapUtil {
+    companion object {
+        fun roundCorners(bitmap: Bitmap, cornerRadius: Float = 20f): Bitmap {
+            val output = Bitmap.createBitmap(bitmap.width, bitmap.height, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(output)
+            val paint = Paint()
+            paint.isAntiAlias = true
+            paint.shader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
+            val rect = RectF(0f, 0f, bitmap.width.toFloat(), bitmap.height.toFloat())
+            canvas.drawRoundRect(rect, cornerRadius, cornerRadius, paint)
+
+            return output
+        }
+
+        fun convertDrawableToBitmap(drawable: Drawable): Bitmap {
+            val bitmap = Bitmap.createBitmap(100, 300, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(bitmap)
+            drawable.setBounds(0, 0, canvas.width, canvas.height)
+            drawable.draw(canvas)
+            return bitmap
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ani/dantotsu/widgets/UpcomingRemoteViewsFactory.kt b/app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingRemoteViewsFactory.kt
similarity index 85%
rename from app/src/main/java/ani/dantotsu/widgets/UpcomingRemoteViewsFactory.kt
rename to app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingRemoteViewsFactory.kt
index e8142e67..0991b2a4 100644
--- a/app/src/main/java/ani/dantotsu/widgets/UpcomingRemoteViewsFactory.kt
+++ b/app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingRemoteViewsFactory.kt
@@ -1,21 +1,17 @@
-package ani.dantotsu.widgets
+package ani.dantotsu.widgets.upcoming
 
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.BitmapShader
-import android.graphics.Canvas
 import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.RectF
-import android.graphics.Shader
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.settings.saving.PrefName
+import ani.dantotsu.util.BitmapUtil.Companion.roundCorners
 import ani.dantotsu.util.Logger
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
@@ -123,18 +119,7 @@ class UpcomingRemoteViewsFactory(private val context: Context) :
         return bitmap?.let { roundCorners(it) }
     }
 
-    private fun roundCorners(bitmap: Bitmap): Bitmap {
-        val cornerRadius = 20f
-        val output = Bitmap.createBitmap(bitmap.width, bitmap.height, Bitmap.Config.ARGB_8888)
-        val canvas = Canvas(output)
-        val paint = Paint()
-        paint.isAntiAlias = true
-        paint.shader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
-        val rect = RectF(0f, 0f, bitmap.width.toFloat(), bitmap.height.toFloat())
-        canvas.drawRoundRect(rect, cornerRadius, cornerRadius, paint)
 
-        return output
-    }
 
 
     override fun getLoadingView(): RemoteViews {
diff --git a/app/src/main/java/ani/dantotsu/widgets/UpcomingRemoteViewsService.kt b/app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingRemoteViewsService.kt
similarity index 90%
rename from app/src/main/java/ani/dantotsu/widgets/UpcomingRemoteViewsService.kt
rename to app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingRemoteViewsService.kt
index 95e563c3..7e704fc2 100644
--- a/app/src/main/java/ani/dantotsu/widgets/UpcomingRemoteViewsService.kt
+++ b/app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingRemoteViewsService.kt
@@ -1,4 +1,4 @@
-package ani.dantotsu.widgets
+package ani.dantotsu.widgets.upcoming
 
 import android.content.Intent
 import android.widget.RemoteViewsService
diff --git a/app/src/main/java/ani/dantotsu/widgets/UpcomingWidget.kt b/app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingWidget.kt
similarity index 91%
rename from app/src/main/java/ani/dantotsu/widgets/UpcomingWidget.kt
rename to app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingWidget.kt
index b3a4dad6..f9d6735c 100644
--- a/app/src/main/java/ani/dantotsu/widgets/UpcomingWidget.kt
+++ b/app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingWidget.kt
@@ -1,14 +1,11 @@
-package ani.dantotsu.widgets
+package ani.dantotsu.widgets.upcoming
 
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.Canvas
 import android.graphics.Color
-import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.net.Uri
 import android.widget.RemoteViews
@@ -16,6 +13,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import ani.dantotsu.MainActivity
 import ani.dantotsu.R
+import ani.dantotsu.util.BitmapUtil.Companion.convertDrawableToBitmap
 
 /**
  * Implementation of App Widget functionality.
@@ -110,14 +108,6 @@ class UpcomingWidget : AppWidgetProvider() {
 
         }
 
-        private fun convertDrawableToBitmap(drawable: Drawable): Bitmap {
-            val bitmap = Bitmap.createBitmap(100, 300, Bitmap.Config.ARGB_8888)
-            val canvas = Canvas(bitmap)
-            drawable.setBounds(0, 0, canvas.width, canvas.height)
-            drawable.draw(canvas)
-            return bitmap
-        }
-
         const val PREFS_NAME = "ani.dantotsu.widgets.UpcomingWidget"
         const val PREF_BACKGROUND_COLOR = "background_color"
         const val PREF_BACKGROUND_FADE = "background_fade"
diff --git a/app/src/main/java/ani/dantotsu/widgets/UpcomingWidgetConfigureActivity.kt b/app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingWidgetConfigureActivity.kt
similarity index 99%
rename from app/src/main/java/ani/dantotsu/widgets/UpcomingWidgetConfigureActivity.kt
rename to app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingWidgetConfigureActivity.kt
index 5ef8e4d9..f14efaa7 100644
--- a/app/src/main/java/ani/dantotsu/widgets/UpcomingWidgetConfigureActivity.kt
+++ b/app/src/main/java/ani/dantotsu/widgets/upcoming/UpcomingWidgetConfigureActivity.kt
@@ -1,4 +1,4 @@
-package ani.dantotsu.widgets
+package ani.dantotsu.widgets.upcoming
 
 import android.appwidget.AppWidgetManager
 import android.content.Context
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 517c8008..9c5aff6a 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -8,4 +8,14 @@
         <item name="appWidgetRadius">@android:dimen/system_app_widget_background_radius</item>
         <item name="appWidgetInnerRadius">@android:dimen/system_app_widget_inner_radius</item>
     </style>
+
+    <style name="Theme.Dantotsu.AppWidgetContainer" parent="Theme.Dantotsu.AppWidgetContainerParent">
+        <item name="appWidgetRadius">
+            @android:dimen/system_app_widget_background_radius
+        </item>
+        <item name="appWidgetInnerRadius">
+            @android:dimen/system_app_widget_inner_radius
+        </item>
+        <item name="appWidgetPadding">16dp</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index fd5798c0..7ccb02ce 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -101,5 +101,5 @@
     </style>
 
 
-    <style name="ThemeOverlay_Dantotsu_MediaRouter" parent="ThemeOverlay.AppCompat"></style>
+    <style name="ThemeOverlay_Dantotsu_MediaRouter" parent="ThemeOverlay.AppCompat"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml-v31/upcoming_widget_info.xml b/app/src/main/res/xml-v31/upcoming_widget_info.xml
index a35ddf7a..e8376331 100644
--- a/app/src/main/res/xml-v31/upcoming_widget_info.xml
+++ b/app/src/main/res/xml-v31/upcoming_widget_info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:description="@string/upcoming_anime"
-    android:configure="ani.dantotsu.widgets.UpcomingWidgetConfigureActivity"
+    android:configure="ani.dantotsu.widgets.upcoming.UpcomingWidgetConfigureActivity"
     android:initialKeyguardLayout="@layout/upcoming_widget"
     android:initialLayout="@layout/upcoming_widget"
     android:minWidth="160dp"
diff --git a/app/src/main/res/xml/upcoming_widget_info.xml b/app/src/main/res/xml/upcoming_widget_info.xml
index f5ba402c..e82356cc 100644
--- a/app/src/main/res/xml/upcoming_widget_info.xml
+++ b/app/src/main/res/xml/upcoming_widget_info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:description="@string/upcoming_anime"
-    android:configure="ani.dantotsu.widgets.UpcomingWidgetConfigureActivity"
+    android:configure="ani.dantotsu.widgets.upcoming.UpcomingWidgetConfigureActivity"
     android:initialKeyguardLayout="@layout/upcoming_widget"
     android:initialLayout="@layout/upcoming_widget"
     android:minWidth="160dp"