diff --git a/smali/res/drawable/edit_text_standard_bg.xml b/smali/res/drawable/edit_text_standard_bg.xml
index 20dad8e5a..772b694eb 100644
--- a/smali/res/drawable/edit_text_standard_bg.xml
+++ b/smali/res/drawable/edit_text_standard_bg.xml
@@ -3,7 +3,7 @@
     <item android:state_focused="true">
         <inset android:insetLeft="-10.0dip" android:insetRight="-10.0dip" android:insetTop="-10.0dip" android:insetBottom="4.0dip">
             <shape>
-                <stroke android:width="2.0dip" android:color="#ff5793d9" />
+                <stroke android:width="2.0dip" android:color="?accent" />
                 <solid android:color="@android:color/transparent" />
             </shape>
         </inset>
diff --git a/smali/res/drawable/material_edit_text.xml b/smali/res/drawable/material_edit_text.xml
index bde0588c8..8a28d319a 100644
--- a/smali/res/drawable/material_edit_text.xml
+++ b/smali/res/drawable/material_edit_text.xml
@@ -5,7 +5,7 @@
             <item android:left="-3.0dip" android:top="-3.0dip" android:right="-3.0dip" android:bottom="4.0dip">
                 <shape>
                     <solid android:color="@android:color/transparent" />
-                    <stroke android:width="2.0dip" android:color="#ff5793d9" />
+                    <stroke android:width="2.0dip" android:color="?accent" />
                 </shape>
             </item>
         </layer-list>
diff --git a/smali/res/drawable/registration_window_bg.xml b/smali/res/drawable/registration_window_bg.xml
index 8aa9b73c9..a5837d27d 100644
--- a/smali/res/drawable/registration_window_bg.xml
+++ b/smali/res/drawable/registration_window_bg.xml
@@ -7,7 +7,7 @@
     </item>
     <item android:top="25.0dip">
         <shape>
-            <solid android:color="@color/cards_bg" />
+            <solid android:color="?background_content" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/smali/res/layout-sw600dp/group_banned_user.xml b/smali/res/layout-sw600dp/group_banned_user.xml
index 3978dcdc6..9ea82fc50 100644
--- a/smali/res/layout-sw600dp/group_banned_user.xml
+++ b/smali/res/layout-sw600dp/group_banned_user.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:background="@color/cards_bg"
+<ScrollView android:background="?background_content"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/smali/res/layout-xlarge/group_banned_user.xml b/smali/res/layout-xlarge/group_banned_user.xml
index 3978dcdc6..9ea82fc50 100644
--- a/smali/res/layout-xlarge/group_banned_user.xml
+++ b/smali/res/layout-xlarge/group_banned_user.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:background="@color/cards_bg"
+<ScrollView android:background="?background_content"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/smali/res/layout/group_banned_user.xml b/smali/res/layout/group_banned_user.xml
index 5fc9258d9..1469b1ee1 100644
--- a/smali/res/layout/group_banned_user.xml
+++ b/smali/res/layout/group_banned_user.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:background="@color/cards_bg"
+<ScrollView android:background="?background_content"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/smali/res/layout/group_edit_manager.xml b/smali/res/layout/group_edit_manager.xml
index 3b16cc26d..c442064e4 100644
--- a/smali/res/layout/group_edit_manager.xml
+++ b/smali/res/layout/group_edit_manager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:background="@color/cards_bg"
+<ScrollView android:background="?background_content"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/smali/res/layout/installed_game_settings.xml b/smali/res/layout/installed_game_settings.xml
index ce15faf1c..5969a7a68 100644
--- a/smali/res/layout/installed_game_settings.xml
+++ b/smali/res/layout/installed_game_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:orientation="vertical"
-    android:background="@color/cards_bg"
+    android:background="?background_content"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/smali/res/layout/market_fragment.xml b/smali/res/layout/market_fragment.xml
index 2d4d6c8c5..1d03b2585 100644
--- a/smali/res/layout/market_fragment.xml
+++ b/smali/res/layout/market_fragment.xml
@@ -79,7 +79,7 @@
 
             <FrameLayout
                 android:id="@id/appkit_loader_content"
-                android:background="@color/cards_bg"
+                android:background="?background_content"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:layout_below="@id/filter_block">
diff --git a/smali/res/layout/photo_album_edit.xml b/smali/res/layout/photo_album_edit.xml
index c1412e5f3..148b61afe 100644
--- a/smali/res/layout/photo_album_edit.xml
+++ b/smali/res/layout/photo_album_edit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:background="@color/cards_bg"
+<ScrollView android:background="?background_content"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/smali/res/layout/poll_edit.xml b/smali/res/layout/poll_edit.xml
index 0b1ad7fc6..2e10f6a05 100644
--- a/smali/res/layout/poll_edit.xml
+++ b/smali/res/layout/poll_edit.xml
@@ -8,7 +8,7 @@
     <include layout="@layout/toolbar" />
 
     <ScrollView
-        android:background="@color/cards_bg"
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fillViewport="true">
diff --git a/smali/res/layout/two_f_a_fragment.xml b/smali/res/layout/two_f_a_fragment.xml
index 99ae04ef1..1e3a82858 100644
--- a/smali/res/layout/two_f_a_fragment.xml
+++ b/smali/res/layout/two_f_a_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:background="@color/cards_bg"
+<ScrollView android:background="?background_content"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/smali/res/layout/video_album_edit.xml b/smali/res/layout/video_album_edit.xml
index 6440468a8..b20a3a777 100644
--- a/smali/res/layout/video_album_edit.xml
+++ b/smali/res/layout/video_album_edit.xml
@@ -7,7 +7,7 @@
     <include layout="@layout/toolbar" />
 
     <ScrollView
-        android:background="@color/cards_bg"
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fillViewport="true">
diff --git a/smali/res/layout/video_edit.xml b/smali/res/layout/video_edit.xml
index c65de20e6..e0b5e1924 100644
--- a/smali/res/layout/video_edit.xml
+++ b/smali/res/layout/video_edit.xml
@@ -7,7 +7,7 @@
     <include layout="@layout/toolbar" />
 
     <ScrollView
-        android:background="@color/cards_bg"
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fillViewport="true">
diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml
index 42b44c73c..0403f4ac8 100644
--- a/smali/res/values/styles.xml
+++ b/smali/res/values/styles.xml
@@ -2159,8 +2159,8 @@
 
     <style name="EditTextStandard" parent="@android:style/Widget.EditText">
         <item name="android:textSize">16.0dip</item>
-        <item name="android:textColor">@color/almost_black</item>
-        <item name="android:textColorHint">@color/gray</item>
+        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColorHint">?text_secondary</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:background">@drawable/edit_text_standard_bg</item>
         <item name="android:paddingLeft">0.0dip</item>
@@ -3360,7 +3360,7 @@
         <item name="android:layout_gravity">center_horizontal</item>
         <item name="android:orientation">vertical</item>
         <item name="android:id">@id/top_block</item>
-        <item name="android:background">#ffffffff</item>
+        <item name="android:background">?background_content</item>
         <item name="android:clipToPadding">false</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -3375,7 +3375,7 @@
 
     <style name="RegistrationTextInfo" parent="@android:style/Widget.TextView">
         <item name="android:textSize">15.0dip</item>
-        <item name="android:textColor">#ff909499</item>
+        <item name="android:textColor">?text_primary</item>
         <item name="android:gravity">center</item>
         <item name="android:paddingTop">24.0dip</item>
         <item name="android:paddingBottom">24.0dip</item>