diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
index 15722d7e..a973b2a7 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
@@ -6,7 +6,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -45,7 +44,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
index 2c301ab3..62fa57e1 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
@@ -8,7 +8,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -42,7 +41,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
diff --git a/app/src/main/res/layout/activity_create_issue.xml b/app/src/main/res/layout/activity_create_issue.xml
index 1bec3f36..b294f387 100644
--- a/app/src/main/res/layout/activity_create_issue.xml
+++ b/app/src/main/res/layout/activity_create_issue.xml
@@ -45,7 +45,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -142,16 +142,25 @@
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
-            <Spinner
-                android:id="@+id/newIssueMilestoneSpinner"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:spinnerMode="dropdown"
+                android:background="@drawable/shape_dropdown"
                 android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:paddingStart="5dp" />
+                android:layout_marginBottom="10dp" >
+
+                <Spinner
+                    android:id="@+id/newIssueMilestoneSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingStart="5dp" />
+
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_create_new_user.xml b/app/src/main/res/layout/activity_create_new_user.xml
index 33f6f27e..bd704a6c 100644
--- a/app/src/main/res/layout/activity_create_new_user.xml
+++ b/app/src/main/res/layout/activity_create_new_user.xml
@@ -44,7 +44,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_create_release.xml b/app/src/main/res/layout/activity_create_release.xml
index 9ce162a0..86c13542 100644
--- a/app/src/main/res/layout/activity_create_release.xml
+++ b/app/src/main/res/layout/activity_create_release.xml
@@ -44,7 +44,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -79,20 +79,29 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseBranchText"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:layout_marginTop="10dp"
                 android:textSize="16sp" />
 
-            <Spinner
-                android:id="@+id/releaseBranch"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:spinnerMode="dropdown"
+                android:background="@drawable/shape_dropdown"
                 android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:paddingStart="5dp" />
+                android:layout_marginBottom="10dp" >
+
+                <Spinner
+                    android:id="@+id/releaseBranch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingStart="5dp" />
+
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
@@ -151,10 +160,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseTypeText"
-                android:checked="false"
+                android:checked="true"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
-                android:theme="@style/checkBoxTheme"
                 android:textColor="?attr/primaryTextColor"/>
 
             <CheckBox
@@ -162,10 +170,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseDraftText"
-                android:checked="false"
+                android:checked="true"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
-                android:theme="@style/checkBoxTheme"
                 android:textColor="?attr/primaryTextColor"/>
 
             <Button
diff --git a/app/src/main/res/layout/activity_edit_issue.xml b/app/src/main/res/layout/activity_edit_issue.xml
index 457e20de..75478043 100644
--- a/app/src/main/res/layout/activity_edit_issue.xml
+++ b/app/src/main/res/layout/activity_edit_issue.xml
@@ -45,7 +45,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -59,8 +59,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueTitle"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                />
+                android:textSize="16sp" />
 
             <EditText
                 android:id="@+id/editIssueTitle"
@@ -70,12 +69,11 @@
                 android:padding="10dp"
                 android:textSize="14sp"
                 tools:ignore="Autofill"
-                android:inputType="textCapSentences|text"
                 android:labelFor="@+id/editIssueTitle"
                 android:background="@drawable/shape_inputs"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHint="?attr/primaryBackgroundColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                android:textColorHighlight="?attr/primaryTextColor" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -100,10 +98,10 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="?attr/primaryTextColor"
-                android:textColorHint="?attr/primaryTextColor"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="?attr/primaryTextColor" />
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|textMultiLine" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -133,20 +131,29 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueMilestoneTitle"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
-            <Spinner
-                android:id="@+id/editIssueMilestoneSpinner"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:spinnerMode="dropdown"
+                android:background="@drawable/shape_dropdown"
                 android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:paddingStart="5dp" />
+                android:layout_marginBottom="10dp" >
+
+                <Spinner
+                    android:id="@+id/editIssueMilestoneSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingStart="5dp" />
+
+            </RelativeLayout>
 
             <Button
                 android:id="@+id/editIssueButton"
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 3923c14f..12bc2386 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -37,8 +37,7 @@
     <RelativeLayout
         android:id="@+id/relativeMainLayoutFrame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:theme="@style/AppTheme">
+        android:layout_height="match_parent">
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/pullToRefresh"
@@ -193,7 +192,7 @@
                         android:layout_height="1dp"
                         android:id="@+id/divider"
                         android:layout_marginTop="15dp"
-                        android:background="@color/divider" />
+                        android:background="?attr/inputBackgroundColor" />
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:layout_below="@+id/divider"
diff --git a/app/src/main/res/layout/activity_new_file.xml b/app/src/main/res/layout/activity_new_file.xml
index d3b8b6bd..612defba 100644
--- a/app/src/main/res/layout/activity_new_file.xml
+++ b/app/src/main/res/layout/activity_new_file.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -46,7 +46,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -122,16 +122,25 @@
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
-            <Spinner
-                android:id="@+id/newFileBranchesSpinner"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:spinnerMode="dropdown"
+                android:background="@drawable/shape_dropdown"
                 android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:paddingStart="5dp" />
+                android:layout_marginBottom="10dp" >
+
+                <Spinner
+                    android:id="@+id/newFileBranchesSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingStart="5dp" />
+
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_new_milestone.xml b/app/src/main/res/layout/activity_new_milestone.xml
index 3de39038..6f53d581 100644
--- a/app/src/main/res/layout/activity_new_milestone.xml
+++ b/app/src/main/res/layout/activity_new_milestone.xml
@@ -46,7 +46,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_new_organization.xml b/app/src/main/res/layout/activity_new_organization.xml
index 7d26710e..38ae4a01 100644
--- a/app/src/main/res/layout/activity_new_organization.xml
+++ b/app/src/main/res/layout/activity_new_organization.xml
@@ -46,7 +46,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_org_detail.xml b/app/src/main/res/layout/activity_org_detail.xml
index ffd5933b..c9b25083 100644
--- a/app/src/main/res/layout/activity_org_detail.xml
+++ b/app/src/main/res/layout/activity_org_detail.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     tools:context=".activities.OrgDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -21,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_weight="1"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             app:layout_scrollFlags="enterAlways"
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:title="@string/app_name">
@@ -32,6 +32,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:textSize="18sp"
+                android:textColor="?attr/primaryTextColor"
                 android:id="@+id/toolbar_title" />
 
         </androidx.appcompat.widget.Toolbar>
@@ -40,6 +41,7 @@
             android:id="@+id/tabs"
             app:tabTextAppearance="@style/customTabLayout"
             app:tabMode="scrollable"
+            app:tabTextColor="?attr/primaryTextColor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/activity_reply_to_issue.xml b/app/src/main/res/layout/activity_reply_to_issue.xml
index 81456f22..9e1141a7 100644
--- a/app/src/main/res/layout/activity_reply_to_issue.xml
+++ b/app/src/main/res/layout/activity_reply_to_issue.xml
@@ -57,7 +57,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -80,10 +80,10 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="@color/white" />
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|textMultiLine" />
 
             <Button
                 android:id="@+id/replyButton"
diff --git a/app/src/main/res/layout/activity_repo_detail.xml b/app/src/main/res/layout/activity_repo_detail.xml
index 184d4b0c..fce878b7 100644
--- a/app/src/main/res/layout/activity_repo_detail.xml
+++ b/app/src/main/res/layout/activity_repo_detail.xml
@@ -42,6 +42,7 @@
             app:tabTextAppearance="@style/customTabLayout"
             android:layout_width="match_parent"
             android:background="?attr/primaryBackgroundColor"
+            app:tabTextColor="?attr/primaryTextColor"
             android:layout_height="wrap_content">
 
             <com.google.android.material.tabs.TabItem
diff --git a/app/src/main/res/layout/custom_multi_select.xml b/app/src/main/res/layout/custom_multi_select.xml
index 65395ee5..b698e24a 100644
--- a/app/src/main/res/layout/custom_multi_select.xml
+++ b/app/src/main/res/layout/custom_multi_select.xml
@@ -24,7 +24,6 @@
         android:layout_marginBottom="5dp"
         android:layout_marginTop="5dp"
         android:iconifiedByDefault="true"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark"
         android:queryHint="Search" />
 
     <LinearLayout
@@ -41,7 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:theme="@style/checkBoxTheme"
+            android:textColor="?attr/primaryTextColor"
             android:clickable="false" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_explore_repo.xml b/app/src/main/res/layout/fragment_explore_repo.xml
index f3b872f1..5147d415 100644
--- a/app/src/main/res/layout/fragment_explore_repo.xml
+++ b/app/src/main/res/layout/fragment_explore_repo.xml
@@ -47,7 +47,7 @@
         android:id="@+id/recyclerViewReposSearch"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorPrimary"
+        android:background="?attr/primaryBackgroundColor"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
         android:layout_marginTop="5dp"
diff --git a/app/src/main/res/layout/fragment_members_by_org.xml b/app/src/main/res/layout/fragment_members_by_org.xml
index db759240..809289c2 100644
--- a/app/src/main/res/layout/fragment_members_by_org.xml
+++ b/app/src/main/res/layout/fragment_members_by_org.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <GridView
@@ -23,7 +23,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataMembers"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_organization_info.xml b/app/src/main/res/layout/fragment_organization_info.xml
index a016e6fb..d9ec7c9c 100644
--- a/app/src/main/res/layout/fragment_organization_info.xml
+++ b/app/src/main/res/layout/fragment_organization_info.xml
@@ -40,7 +40,7 @@
                 android:textIsSelectable="true"
                 android:textSize="16sp"
                 android:paddingTop="5dp"
-                android:textColor="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -57,7 +57,7 @@
                 android:textIsSelectable="true"
                 android:textSize="16sp"
                 android:paddingTop="5dp"
-                android:textColor="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -76,7 +76,7 @@
                 android:paddingTop="5dp"
                 android:textColorLink="@color/lightBlue"
                 android:autoLink="web"
-                android:textColor="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -94,7 +94,7 @@
                 android:textSize="16sp"
                 android:paddingTop="5dp"
                 android:autoLink="web"
-                android:textColor="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index be864935..c136ebde 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -79,6 +79,7 @@
             app:tabMode="scrollable"
             app:tabTextAppearance="@style/customTabLayout"
             android:layout_width="match_parent"
+            app:tabTextColor="?attr/primaryTextColor"
             android:layout_height="wrap_content">
 
             <com.google.android.material.tabs.TabItem
diff --git a/app/src/main/res/layout/fragment_repositories_by_org.xml b/app/src/main/res/layout/fragment_repositories_by_org.xml
index 985f484a..7af02963 100644
--- a/app/src/main/res/layout/fragment_repositories_by_org.xml
+++ b/app/src/main/res/layout/fragment_repositories_by_org.xml
@@ -14,7 +14,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -28,7 +28,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noData"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/multi_select_item.xml b/app/src/main/res/layout/multi_select_item.xml
index cae3d01b..f13767a4 100644
--- a/app/src/main/res/layout/multi_select_item.xml
+++ b/app/src/main/res/layout/multi_select_item.xml
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:theme="@style/checkBoxTheme"
+        android:textColor="?attr/primaryTextColor"
         android:clickable="false" />
 
     <TextView
diff --git a/app/src/main/res/layout/repo_bottom_sheet_layout.xml b/app/src/main/res/layout/repo_bottom_sheet_layout.xml
index be4e01c2..44e9f2ef 100644
--- a/app/src/main/res/layout/repo_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/repo_bottom_sheet_layout.xml
@@ -77,7 +77,13 @@
                 android:textSize="16sp"
                 android:padding="16dp" />
 
-            <View style="@style/lineDividerHorizontal" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="64dp"
+                android:background="?attr/inputBackgroundColor" />
 
             <TextView
                 android:id="@+id/addCollaborator"
@@ -139,7 +145,13 @@
                 android:textSize="16sp"
                 android:padding="16dp" />
 
-            <View style="@style/lineDividerHorizontal" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="64dp"
+                android:background="?attr/inputBackgroundColor" />
 
             <TextView
                 android:id="@+id/openWebRepo"
diff --git a/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml b/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
index 9a944dfb..cf15a6f3 100644
--- a/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
@@ -90,7 +90,13 @@
                 android:textSize="16sp"
                 android:padding="16dp" />
 
-            <View style="@style/lineDividerHorizontal" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="64dp"
+                android:background="?attr/inputBackgroundColor" />
 
             <TextView
                 android:id="@+id/copyIssueUrl"
@@ -104,7 +110,13 @@
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
-            <View style="@style/lineDividerHorizontal" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="64dp"
+                android:background="?attr/inputBackgroundColor" />
 
             <TextView
                 android:id="@+id/closeIssue"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f4fc7905..4f9088db 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,11 +5,6 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="checkBoxTheme" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="colorControlNormal">@color/white</item>
-        <item name="colorControlActivated">@color/white</item>
-    </style>
-
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -19,21 +14,10 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-
-
     <style name="customTabLayout" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="lineDividerHorizontal">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:background">@color/divider</item>
-        <item name="android:layout_marginStart">64dp</item>
-        <item name="android:layout_marginTop">10dp</item>
-        <item name="android:layout_marginBottom">10dp</item>
-    </style>
-
     <style name="radioButtonsInDarkTheme" parent="Theme.AppCompat.Dialog.Alert">
         <item name="colorControlNormal">@color/white</item>
         <item name="colorControlActivated">@color/white</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8c7a462e..40beb351 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -17,6 +17,7 @@
         <item name="dialogTheme">@style/AppThemeConfirmDialog</item>
         <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
     </style>
+    <!-- Dark theme - default -->
 
     <!-- Light theme -->
     <style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@@ -34,6 +35,7 @@
         <item name="dialogTheme">@style/AppThemeLightConfirmDialog</item>
         <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
     </style>
+    <!-- Light theme -->
 
     <style name="AppThemeConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
         <item name="android:background">@color/colorPrimary</item>