diff --git a/app/src/main/java/com/fox2code/mmm/ModuleViewAdapter.java b/app/src/main/java/com/fox2code/mmm/ModuleViewAdapter.java
index accb39c..ead9ff1 100644
--- a/app/src/main/java/com/fox2code/mmm/ModuleViewAdapter.java
+++ b/app/src/main/java/com/fox2code/mmm/ModuleViewAdapter.java
@@ -267,7 +267,7 @@ public final class ModuleViewAdapter extends RecyclerView.Adapter<ModuleViewAdap
                 this.descriptionText.setText(" ");
                 this.switchMaterial.setEnabled(false);
                 this.actionButtonsTypes.clear();
-                for (ImageButton button:this.actionsButtons) {
+                for (ImageButton button : this.actionsButtons) {
                     button.setVisibility(View.GONE);
                     button.setImportantForAccessibility(
                             View.IMPORTANT_FOR_ACCESSIBILITY_NO);
@@ -318,7 +318,11 @@ public final class ModuleViewAdapter extends RecyclerView.Adapter<ModuleViewAdap
                 theme.resolveAttribute(foregroundAttr, value, true);
                 @ColorInt int fgColor = value.data;
                 // Fix card background being invisible on light theme
-                if (bgColor == Color.WHITE) bgColor = 0xFFF8F8F8;
+                if (bgColor == Color.WHITE) {
+                    bgColor = 0xFFF8F8F8;
+                } else {
+                    bgColor = 0xFF1E1E1E;
+                };
                 this.titleText.setTextColor(fgColor);
                 this.buttonAction.setColorFilter(fgColor);
                 this.cardView.setCardBackgroundColor(bgColor);
diff --git a/app/src/main/res/layout/markdown_view.xml b/app/src/main/res/layout/markdown_view.xml
index a7616e7..81e1391 100644
--- a/app/src/main/res/layout/markdown_view.xml
+++ b/app/src/main/res/layout/markdown_view.xml
@@ -1,37 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/markdownBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
-    android:id="@+id/markdownBackground"
     app:fitsSystemWindowsInsets="top|left|right">
-    <com.google.android.material.card.MaterialCardView
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        app:cardCornerRadius="@dimen/card_corner_radius">
-        <ScrollView
+        android:layout_height="wrap_content">
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/markdownView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/markdown_border_content"
+                android:text="@string/loading" />
+            <TextView
+                android:id="@+id/markdownFooter"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
-                <TextView
-                    android:id="@+id/markdownView"
-                    android:text="@string/loading"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/markdown_border_content" />
-
-                <TextView
-                    android:id="@+id/markdownFooter"
-                    android:text=""
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-        </ScrollView>
-    </com.google.android.material.card.MaterialCardView>
+                android:text="" />
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/module_entry.xml b/app/src/main/res/layout/module_entry.xml
index 43e2ad6..ecbed94 100644
--- a/app/src/main/res/layout/module_entry.xml
+++ b/app/src/main/res/layout/module_entry.xml
@@ -8,9 +8,8 @@
     android:layout_marginRight="8dp"
     android:layout_marginTop="2dp"
     android:layout_marginBottom="2dp"
-    android:gravity="center_vertical"
-    android:background="@null">
-    <com.google.android.material.card.MaterialCardView
+    android:gravity="center_vertical">
+    <androidx.cardview.widget.CardView
         android:id="@+id/card_view"
         android:layout_gravity="center"
         android:layout_width="match_parent"
@@ -23,8 +22,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:background="@null">
+            android:layout_margin="8dp">
 
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/button_action"
@@ -190,5 +188,5 @@
                     tools:ignore="RtlHardcoded" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </com.google.android.material.card.MaterialCardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b2f9c0c..6e14f32 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,48 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.MagiskModuleManager.Dark" parent="Theme.MaterialComponents">
+        <item name="android:isLightTheme"
+            tools:targetApi="q">false</item>
+        <item name="isLightTheme">false</item>
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/orange_200</item>
+        <item name="colorPrimaryVariant">@color/black</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/orange_200</item>
+        <item name="colorSecondaryVariant">@color/orange_200</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/status_bar_color</item>
+        <item name="android:navigationBarColor">@color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
+        <!-- Customize your theme here. -->
+        <item name="android:windowActivityTransitions">true</item>
+        <!-- <item name="android:activityOpenEnterAnimation">@*android:anim/slide_in_right</item>
+        <item name="android:activityOpenExitAnimation">@*android:anim/slide_out_left</item>
+        <item name="android:activityCloseEnterAnimation">@*android:anim/slide_in_left</item>
+        <item name="android:activityCloseExitAnimation">@*android:anim/slide_out_right</item> -->
+        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
+        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
+        <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/card_corner_radius</item>
+        <item name="dialogCornerRadius">@dimen/card_corner_radius</item>
+    </style>
+
+    <!-- Base application theme. -->
+    <style name="Theme.MagiskModuleManager.Transparent.Dark" parent="Theme.MagiskModuleManager.Dark">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <style name="Theme.MagiskModuleManager"
         parent="Theme.MagiskModuleManager.Dark" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0e8aa5b..7d9abcb 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Theme.MagiskModuleManager.Light" parent="Theme.MaterialComponents.Light">
         <item name="android:isLightTheme"
-            tools:targetApi="q">true</item>
-        <item name="isLightTheme">true</item>
+            tools:targetApi="q">false</item>
+        <item name="isLightTheme">false</item>
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/orange_200</item>
         <item name="colorPrimaryVariant">@color/white</item>
@@ -28,50 +28,6 @@
         <item name="dialogCornerRadius">@dimen/card_corner_radius</item>
     </style>
 
-    <style name="Theme.MagiskModuleManager.Dark" parent="Theme.MaterialComponents">
-        <item name="android:isLightTheme"
-            tools:targetApi="q">false</item>
-        <item name="isLightTheme">false</item>
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/orange_200</item>
-        <item name="colorPrimaryVariant">@color/black</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/orange_200</item>
-        <item name="colorSecondaryVariant">@color/orange_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">@color/status_bar_color</item>
-        <item name="android:navigationBarColor">@color/transparent</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
-        <!-- Customize your theme here. -->
-        <item name="android:windowActivityTransitions">true</item>
-        <!-- <item name="android:activityOpenEnterAnimation">@*android:anim/slide_in_right</item>
-        <item name="android:activityOpenExitAnimation">@*android:anim/slide_out_left</item>
-        <item name="android:activityCloseEnterAnimation">@*android:anim/slide_in_left</item>
-        <item name="android:activityCloseExitAnimation">@*android:anim/slide_out_right</item> -->
-        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
-        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
-        <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/card_corner_radius</item>
-        <item name="dialogCornerRadius">@dimen/card_corner_radius</item>
-    </style>
-
-    <!-- Base application theme. -->
-    <style name="Theme.MagiskModuleManager.Transparent.Dark" parent="Theme.MagiskModuleManager.Dark">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
     <style name="Theme.MagiskModuleManager.Transparent.Light" parent="Theme.MagiskModuleManager.Light">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>