Trying to fix a crash w.r.t. too many levels of redirected attrs

app/src/main/res/layout-sw600dp-land/activity_setup.xml

@@ -14,8 +14,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="right|bottom"
-    android:layout_marginBottom="16dp"
-    android:layout_marginRight="80dp"
+    android:layout_marginBottom="24dp"
+    android:layout_marginRight="24dp"
     android:tint="#ffffff"
     app:backgroundTint="#8A000000"
     app:elevation="0dip"

app/src/main/res/layout-sw600dp-land/setup_slide.xml

@@ -21,8 +21,8 @@
       android:layout_height="wrap_content"
       android:layout_gravity="end"
       android:gravity="end"
+      android:textColor="?android:attr/textColorPrimaryInverse"
       android:textSize="28sp"
-      android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
       tools:text="Connection" />
 
     <android.support.v4.widget.Space
@@ -36,8 +36,8 @@
       android:layout_height="wrap_content"
       android:layout_gravity="end"
       android:gravity="end"
+      android:textColor="?android:attr/textColorSecondaryInverse"
       android:textSize="16sp"
-      android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
       tools:text="First, please choose which server your core is hosted on." />
 
   </LinearLayout>

app/src/main/res/layout-sw600dp/activity_setup.xml

@@ -9,18 +9,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
 
-  <FrameLayout
-    android:layout_width="400dp"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom|center">
-
   <android.support.design.widget.FloatingActionButton
     android:id="@+id/next_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="right|bottom"
-      android:layout_marginBottom="16dp"
-      android:layout_marginRight="16dp"
+    android:layout_marginBottom="24dp"
+    android:layout_marginRight="24dp"
     android:tint="#ffffff"
     app:backgroundTint="#8A000000"
     app:elevation="0dip"
@@ -28,6 +23,4 @@
     app:pressedTranslationZ="0dip"
     tools:ignore="RtlHardcoded" />
 
-  </FrameLayout>
-
 </merge>

app/src/main/res/layout-sw600dp/setup_slide.xml

@@ -24,16 +24,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:textSize="28sp"
-        android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
         tools:text="Connection" />
 
       <TextView
         android:id="@+id/description"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textColor="?android:attr/textColorSecondaryInverse"
         android:textSize="16sp"
-        android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
         tools:text="First, please choose which server your core is hosted on." />
 
     </LinearLayout>

app/src/main/res/layout/setup_slide.xml

@@ -44,8 +44,8 @@
           android:layout_marginRight="48dp"
           android:layout_marginStart="32dp"
           android:layout_marginTop="8dp"
+          android:textColor="?android:attr/textColorSecondaryInverse"
           android:textSize="16sp"
-          android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse"
           tools:text="First, please choose which server your core is hosted on." />
       </LinearLayout>
 

app/src/main/res/layout/widget_core_account.xml

@@ -20,6 +20,7 @@
       android:layout_width="48dp"
       android:layout_height="48dp"
       android:layout_gravity="center_vertical"
+      android:background="@null"
       android:clickable="false" />
 
   </LinearLayout>