diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java
index 5d4832ed..5d0eb20a 100644
--- a/app/src/main/java/io/lbry/browser/MainActivity.java
+++ b/app/src/main/java/io/lbry/browser/MainActivity.java
@@ -95,6 +95,7 @@ import io.lbry.browser.data.DatabaseHelper;
 import io.lbry.browser.dialog.ContentScopeDialogFragment;
 import io.lbry.browser.exceptions.LbryUriException;
 import io.lbry.browser.listener.CameraPermissionListener;
+import io.lbry.browser.listener.DarkThemeChangeListener;
 import io.lbry.browser.listener.DownloadActionListener;
 import io.lbry.browser.listener.FetchChannelsListener;
 import io.lbry.browser.listener.SdkStatusListener;
@@ -774,6 +775,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
         applyNavbarSigninPadding();
         checkFirstRun();
         checkNowPlaying();
+        if (Lbryio.totalUnclaimedRewardAmount > 0) {
+            showFloatingUnclaimedRewards();
+        }
 
         // check (and start) the LBRY SDK service
         serviceRunning = isServiceRunning(this, LbrynetService.class);
@@ -962,9 +966,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
 
     public void clearWunderbarFocus(View view) {
         findViewById(R.id.wunderbar).clearFocus();
-        findViewById(R.id.wunderbar_container).requestFocus();
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        findViewById(R.id.app_bar_main_container).requestFocus();
     }
     public View getWunderbar() {
         return findViewById(R.id.wunderbar);
@@ -2486,7 +2488,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
                 return;
             }
 
-            fragment.setRetainInstance(true);
+            //fragment.setRetainInstance(true);
             FragmentManager manager = getSupportFragmentManager();
             FragmentTransaction transaction = manager.beginTransaction().replace(R.id.content_main, fragment);
             if (allowNavigateBack) {
@@ -2554,6 +2556,16 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
         return (ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED);
     }
 
+    public void onThemeChanged() {
+        FragmentManager manager = getSupportFragmentManager();
+        for (int i  = 0; i < manager.getFragments().size(); i++) {
+            Fragment f = manager.getFragments().get(i);
+            if (f instanceof DarkThemeChangeListener) {
+                ((DarkThemeChangeListener) f).onDarkThemeToggled();
+            }
+        }
+    }
+
     public interface BackPressInterceptor {
         boolean onBackPressed();
     }
diff --git a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
index 75a64bdf..b2ac5c4e 100644
--- a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
@@ -92,6 +92,19 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
         return null;
     }
 
+    public void removeFeaturedItem() {
+        int featuredIndex = -1;
+        for (int i = 0; i < items.size(); i++) {
+            if (items.get(i).isFeatured()) {
+                featuredIndex = i;
+                break;
+            }
+        }
+        if (featuredIndex > -1) {
+            items.remove(featuredIndex);
+        }
+    }
+
     public List<Claim> getItems() {
         return new ArrayList<>(this.items);
     }
@@ -325,7 +338,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
                 }
 
                 if (inSelectionMode) {
-                    toggleSelectedClaim(item);
+                    toggleSelectedClaim(original);
                 } else {
                     if (listener != null) {
                         listener.onClaimClicked(item);
@@ -351,7 +364,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
                         selectionModeListener.onEnterSelectionMode();
                     }
                 }
-                toggleSelectedClaim(item);
+                toggleSelectedClaim(original);
                 return true;
             }
         });
diff --git a/app/src/main/java/io/lbry/browser/listener/DarkThemeChangeListener.java b/app/src/main/java/io/lbry/browser/listener/DarkThemeChangeListener.java
new file mode 100644
index 00000000..3d7cd886
--- /dev/null
+++ b/app/src/main/java/io/lbry/browser/listener/DarkThemeChangeListener.java
@@ -0,0 +1,5 @@
+package io.lbry.browser.listener;
+
+public interface DarkThemeChangeListener {
+    void onDarkThemeToggled();
+}
diff --git a/app/src/main/java/io/lbry/browser/model/Claim.java b/app/src/main/java/io/lbry/browser/model/Claim.java
index 615c2920..31e8b5fb 100644
--- a/app/src/main/java/io/lbry/browser/model/Claim.java
+++ b/app/src/main/java/io/lbry/browser/model/Claim.java
@@ -19,6 +19,7 @@ import java.util.stream.Stream;
 
 import io.lbry.browser.utils.Helper;
 import io.lbry.browser.utils.LbryUri;
+import io.lbry.browser.utils.Predefined;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -156,6 +157,17 @@ public class Claim {
         }
         return false;
     }
+    public boolean isMature() {
+        List<String> tags = getTags();
+        if (tags != null && tags.size() > 0) {
+            for (String tag : tags) {
+                if (Predefined.MATURE_TAGS.contains(tag.toLowerCase())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
     public String getThumbnailUrl() {
         if (value != null && value.getThumbnail() != null) {
diff --git a/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java b/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java
index 2a8df44e..ae9af238 100644
--- a/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java
@@ -109,7 +109,7 @@ public class MergeSubscriptionsTask extends AsyncTask<Void, Void, List<Subscript
                     }
                 }
             }
-        } catch (ClassCastException | LbryioRequestException | LbryioResponseException | JSONException | SQLiteException ex) {
+        } catch (ClassCastException | LbryioRequestException | LbryioResponseException | JSONException | IllegalStateException | SQLiteException ex) {
             error = ex;
             return null;
         } finally {
diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java
new file mode 100644
index 00000000..650ee98d
--- /dev/null
+++ b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java
@@ -0,0 +1,65 @@
+package io.lbry.browser.tasks.claim;
+
+import android.os.AsyncTask;
+import android.view.View;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.lbry.browser.exceptions.ApiCallException;
+import io.lbry.browser.tasks.GenericTaskHandler;
+import io.lbry.browser.utils.Helper;
+import io.lbry.browser.utils.Lbry;
+
+public class AbandonStreamTask extends AsyncTask<Void, Void, Boolean> {
+    private List<String> claimIds;
+    private List<String> successfulClaimIds;
+    private List<String> failedClaimIds;
+    private List<Exception> failedExceptions;
+    private View progressView;
+    private AbandonHandler handler;
+
+    public AbandonStreamTask(List<String> claimIds, View progressView, AbandonHandler handler) {
+        this.claimIds = claimIds;
+        this.progressView = progressView;
+        this.handler = handler;
+    }
+
+    protected void onPreExecute() {
+        Helper.setViewVisibility(progressView, View.VISIBLE);
+    }
+
+    public Boolean doInBackground(Void... params) {
+        successfulClaimIds = new ArrayList<>();
+        failedClaimIds = new ArrayList<>();
+        failedExceptions = new ArrayList<>();
+
+        for (String claimId : claimIds) {
+            try {
+                Map<String, Object> options = new HashMap<>();
+                options.put("claim_id", claimId);
+                options.put("blocking", false);
+                JSONObject result = (JSONObject) Lbry.genericApiCall(Lbry.METHOD_STREAM_ABANDON, options);
+                android.util.Log.d("#HELP", result.toString());
+                successfulClaimIds.add(claimId);
+            } catch (ApiCallException ex) {
+                android.util.Log.e("#HELP", ex.getMessage(), ex);
+                failedClaimIds.add(claimId);
+                failedExceptions.add(ex);
+            }
+        }
+
+        return true;
+    }
+
+    protected void onPostExecute(Boolean result) {
+        Helper.setViewVisibility(progressView, View.GONE);
+        if (handler != null) {
+            handler.onComplete(successfulClaimIds, failedClaimIds, failedExceptions);
+        }
+    }
+}
diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/LoadSharedUserStateTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/LoadSharedUserStateTask.java
index 8e4509d6..ac941123 100644
--- a/app/src/main/java/io/lbry/browser/tasks/wallet/LoadSharedUserStateTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/wallet/LoadSharedUserStateTask.java
@@ -83,7 +83,7 @@ public class LoadSharedUserStateTask extends AsyncTask<Void, Void, Boolean> {
                                 if (db != null) {
                                     DatabaseHelper.createOrUpdateSubscription(subscription, db);
                                 }
-                            } catch (LbryUriException | SQLiteException ex) {
+                            } catch (LbryUriException | SQLiteException | IllegalStateException ex) {
                                 // pass
                             }
                         }
diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelManagerFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelManagerFragment.java
index 4f2454e2..eef59baa 100644
--- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelManagerFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelManagerFragment.java
@@ -257,6 +257,7 @@ public class ChannelManagerFragment extends BaseFragment implements ActionMode.C
         if (R.id.action_delete == menuItem.getItemId()) {
             if (adapter != null && adapter.getSelectedCount() > 0) {
                 final List<Claim> selectedClaims = new ArrayList<>(adapter.getSelectedItems());
+                android.util.Log.d("#HELP", selectedClaims.toString());
                 String message = getResources().getQuantityString(R.plurals.confirm_delete_channels, selectedClaims.size());
                 AlertDialog.Builder builder = new AlertDialog.Builder(getContext()).
                         setTitle(R.string.delete_selection).
diff --git a/app/src/main/java/io/lbry/browser/ui/following/FollowingFragment.java b/app/src/main/java/io/lbry/browser/ui/following/FollowingFragment.java
index 59988c9e..35748650 100644
--- a/app/src/main/java/io/lbry/browser/ui/following/FollowingFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/following/FollowingFragment.java
@@ -37,6 +37,7 @@ import io.lbry.browser.dialog.ContentFromDialogFragment;
 import io.lbry.browser.dialog.ContentSortDialogFragment;
 import io.lbry.browser.dialog.DiscoverDialogFragment;
 import io.lbry.browser.exceptions.LbryUriException;
+import io.lbry.browser.listener.DarkThemeChangeListener;
 import io.lbry.browser.listener.DownloadActionListener;
 import io.lbry.browser.model.Claim;
 import io.lbry.browser.model.LbryFile;
@@ -58,6 +59,7 @@ import io.lbry.browser.utils.Predefined;
 public class FollowingFragment extends BaseFragment implements
         FetchSubscriptionsTask.FetchSubscriptionsHandler,
         ChannelItemSelectionListener,
+        DarkThemeChangeListener,
         DownloadActionListener,
         SharedPreferences.OnSharedPreferenceChangeListener {
 
@@ -802,4 +804,13 @@ public class FollowingFragment extends BaseFragment implements
             // invalid file info for download
         }
     }
+
+    public void onDarkThemeToggled() {
+        Helper.refreshRecyclerView(contentList);
+        Helper.refreshRecyclerView(horizontalChannelList);
+        Helper.refreshRecyclerView(suggestedChannelGrid);
+        if (discoverDialog != null) {
+            //discoverDialog.onDarkThemeToggled();
+        }
+    }
 }
diff --git a/app/src/main/java/io/lbry/browser/ui/other/SettingsFragment.java b/app/src/main/java/io/lbry/browser/ui/other/SettingsFragment.java
index 4ac2b59a..9a209b30 100644
--- a/app/src/main/java/io/lbry/browser/ui/other/SettingsFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/other/SettingsFragment.java
@@ -40,15 +40,18 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
     public void onResume() {
         super.onResume();
         Context context = getContext();
-        PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(this);
         if (context instanceof MainActivity) {
+            PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(this);
             MainActivity activity = (MainActivity) context;
             LbryAnalytics.setCurrentScreen(activity, "Settings", "Settings");
         }
     }
     @Override
     public void onPause() {
-        PreferenceManager.getDefaultSharedPreferences(getContext()).unregisterOnSharedPreferenceChangeListener(this);
+        Context context = getContext();
+        if (context != null) {
+            PreferenceManager.getDefaultSharedPreferences(context).unregisterOnSharedPreferenceChangeListener(this);
+        }
         super.onPause();
     }
     @Override
@@ -69,9 +72,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
 
             Context context = getContext();
             if (context instanceof MainActivity) {
-                MainActivity activity = (MainActivity) context;
-                activity.getDelegate().applyDayNight();
-                activity.recreate();
+                ((MainActivity) context).onThemeChanged();
             }
         }
     }
diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java
index 9fe3be47..a2335306 100644
--- a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java
@@ -16,6 +16,8 @@ public class PublishFormFragment extends BaseFragment {
                              ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_publishes, container, false);
 
+
+
         return root;
     }
 
diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java
index 3420f5fa..96d826b5 100644
--- a/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java
@@ -36,6 +36,7 @@ import io.lbry.browser.listener.SelectionModeListener;
 import io.lbry.browser.model.Claim;
 import io.lbry.browser.tasks.claim.AbandonChannelTask;
 import io.lbry.browser.tasks.claim.AbandonHandler;
+import io.lbry.browser.tasks.claim.AbandonStreamTask;
 import io.lbry.browser.tasks.claim.ClaimListResultHandler;
 import io.lbry.browser.tasks.claim.ClaimListTask;
 import io.lbry.browser.ui.BaseFragment;
@@ -288,7 +289,7 @@ public class PublishesFragment extends BaseFragment implements ActionMode.Callba
 
         Helper.setViewVisibility(contentList, View.INVISIBLE);
         Helper.setViewVisibility(fabNewPublish, View.INVISIBLE);
-        AbandonChannelTask task = new AbandonChannelTask(claimIds, bigLoading, new AbandonHandler() {
+        AbandonStreamTask task = new AbandonStreamTask(claimIds, bigLoading, new AbandonHandler() {
             @Override
             public void onComplete(List<String> successfulClaimIds, List<String> failedClaimIds, List<Exception> errors) {
                 View root = getView();
diff --git a/app/src/main/java/io/lbry/browser/ui/search/SearchFragment.java b/app/src/main/java/io/lbry/browser/ui/search/SearchFragment.java
index 6f9a09b1..779ab613 100644
--- a/app/src/main/java/io/lbry/browser/ui/search/SearchFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/search/SearchFragment.java
@@ -182,16 +182,26 @@ public class SearchFragment extends BaseFragment implements
         if (resultListAdapter != null) {
             Claim unresolved = resultListAdapter.getFeaturedItem();
 
-            // only set the values we need
-            unresolved.setClaimId(resolved.getClaimId());
-            unresolved.setName(resolved.getName());
-            unresolved.setTimestamp(resolved.getTimestamp());
-            unresolved.setValueType(resolved.getValueType());
-            unresolved.setPermanentUrl(resolved.getPermanentUrl());
-            unresolved.setValue(resolved.getValue());
-            unresolved.setSigningChannel(resolved.getSigningChannel());
-            unresolved.setUnresolved(false);
-            unresolved.setConfirmations(resolved.getConfirmations());
+            Context context = getContext();
+            boolean canShowMatureContent = false;
+            if (context != null) {
+                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
+                canShowMatureContent = sp.getBoolean(MainActivity.PREFERENCE_KEY_SHOW_MATURE_CONTENT, false);
+            }
+            if (resolved.isMature() && !canShowMatureContent) {
+                resultListAdapter.removeFeaturedItem();
+            } else {
+                // only set the values we need
+                unresolved.setClaimId(resolved.getClaimId());
+                unresolved.setName(resolved.getName());
+                unresolved.setTimestamp(resolved.getTimestamp());
+                unresolved.setValueType(resolved.getValueType());
+                unresolved.setPermanentUrl(resolved.getPermanentUrl());
+                unresolved.setValue(resolved.getValue());
+                unresolved.setSigningChannel(resolved.getSigningChannel());
+                unresolved.setUnresolved(false);
+                unresolved.setConfirmations(resolved.getConfirmations());
+            }
 
             resultListAdapter.notifyDataSetChanged();
         }
diff --git a/app/src/main/java/io/lbry/browser/utils/Helper.java b/app/src/main/java/io/lbry/browser/utils/Helper.java
index edca68fe..19e428a3 100644
--- a/app/src/main/java/io/lbry/browser/utils/Helper.java
+++ b/app/src/main/java/io/lbry/browser/utils/Helper.java
@@ -19,11 +19,15 @@ import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 import androidx.core.text.HtmlCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -685,4 +689,26 @@ public final class Helper {
     public static int getScaledValue(int value, float scale) {
         return (int) (value * scale + 0.5f);
     }
+
+    public static void refreshRecyclerView(RecyclerView rv) {
+        if (rv == null) {
+            android.util.Log.d("#HELP", "rv is null?");
+            return;
+        }
+
+        android.util.Log.d("#HELP", "Refereshing recycler view...");
+        RecyclerView.Adapter adapter = rv.getAdapter();
+        int prevScrollPosition = 0;
+
+        RecyclerView.LayoutManager lm = rv.getLayoutManager();
+        if (lm instanceof LinearLayoutManager) {
+            prevScrollPosition = ((LinearLayoutManager) lm).findLastCompletelyVisibleItemPosition();
+        } else if (lm instanceof GridLayoutManager) {
+            prevScrollPosition = ((GridLayoutManager) lm).findLastCompletelyVisibleItemPosition();
+        }
+
+        rv.setAdapter(null);
+        rv.setAdapter(adapter);
+        rv.scrollToPosition(prevScrollPosition > 0 ? prevScrollPosition : 0);
+    }
 }
diff --git a/app/src/main/java/io/lbry/browser/utils/Lbry.java b/app/src/main/java/io/lbry/browser/utils/Lbry.java
index b5397f79..1e6e2c9f 100644
--- a/app/src/main/java/io/lbry/browser/utils/Lbry.java
+++ b/app/src/main/java/io/lbry/browser/utils/Lbry.java
@@ -91,7 +91,9 @@ public final class Lbry {
     public static final String METHOD_CHANNEL_CREATE = "channel_create";
     public static final String METHOD_CHANNEL_UPDATE = "channel_update";
 
+
     public static final String METHOD_CLAIM_LIST = "claim_list";
+    public static final String METHOD_STREAM_ABANDON = "stream_abandon";
     public static final String METHOD_STREAM_REPOST = "stream_repost";
 
     public static KeyStore KEYSTORE;
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 44fd8b9e..212efa4c 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -7,6 +7,8 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:background="@color/white"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
     tools:context=".MainActivity">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/form_tag_search.xml b/app/src/main/res/layout/container_inline_tag_form.xml
similarity index 73%
rename from app/src/main/res/layout/form_tag_search.xml
rename to app/src/main/res/layout/container_inline_tag_form.xml
index 55e5ab15..ec0279a7 100644
--- a/app/src/main/res/layout/form_tag_search.xml
+++ b/app/src/main/res/layout/container_inline_tag_form.xml
@@ -29,6 +29,27 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+    <LinearLayout
+        android:id="@+id/form_mature_tags_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/inter"
+            android:text="@string/mature_tags"
+            android:textSize="14sp"
+            android:textFontWeight="300" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/form_mature_tags"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp" />
+    </LinearLayout>
+
     <TextView
         android:id="@+id/form_no_tag_results"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_channel_form.xml b/app/src/main/res/layout/fragment_channel_form.xml
index 9d867b41..b3c5a20c 100644
--- a/app/src/main/res/layout/fragment_channel_form.xml
+++ b/app/src/main/res/layout/fragment_channel_form.xml
@@ -293,7 +293,7 @@
                             android:text="@string/tags"
                             android:textFontWeight="600"
                             android:textSize="14sp" />
-                        <include layout="@layout/form_tag_search" />
+                        <include layout="@layout/container_inline_tag_form" />
                     </LinearLayout>
 
                     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_publish_form.xml b/app/src/main/res/layout/fragment_publish_form.xml
index 3cfa5e0d..c49b0712 100644
--- a/app/src/main/res/layout/fragment_publish_form.xml
+++ b/app/src/main/res/layout/fragment_publish_form.xml
@@ -2,15 +2,170 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/pageBackground">
     <LinearLayout
         android:id="@+id/publish_form_display_area"
         android:elevation="4dp"
         android:orientation="vertical"
-        android:layout_weight="10"
+        android:weightSum="10"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+        <RelativeLayout
+            android:id="@+id/publish_form_media_container"
+            android:clickable="true"
+            android:foreground="?attr/selectableItemBackground"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="3.55"
+            android:background="@android:color/black">
 
+            <ImageView
+                android:id="@+id/publish_form_thumbnail_preview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <LinearLayout
+                android:id="@+id/publish_form_thumbnail_upload_progress"
+                android:background="@color/channelCoverBackground"
+                android:layout_alignParentRight="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal"
+                android:paddingTop="2dp"
+                android:paddingBottom="2dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:visibility="gone">
+                <ProgressBar
+                    android:layout_width="16dp"
+                    android:layout_height="16dp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:fontFamily="@font/inter"
+                    android:text="@string/uploading"
+                    android:textColor="@color/white"
+                    android:textFontWeight="300"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <RelativeLayout
+                android:background="@drawable/bg_small_icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginBottom="16dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true">
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_centerInParent="true"
+                    android:src="@drawable/ic_edit"
+                    android:tint="@color/white" />
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="6.45">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="16dp">
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/title">
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/publish_form_input_title"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:fontFamily="@font/inter"
+                                android:inputType="textMultiLine"
+                                android:singleLine="false"
+                                android:textFontWeight="300"
+                                android:textSize="14sp" />
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:hint="@string/description">
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/publish_form_input_description"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:fontFamily="@font/inter"
+                                android:singleLine="true"
+                                android:textFontWeight="300"
+                                android:textSize="14sp" />
+                        </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
+                </androidx.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="16dp">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="8dp"
+                            android:fontFamily="@font/inter"
+                            android:textSize="20sp"
+                            android:text="@string/tags" />
+                        <include layout="@layout/container_inline_tag_form" />
+                    </LinearLayout>
+                </androidx.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="16dp">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="8dp"
+                            android:fontFamily="@font/inter"
+                            android:textSize="20sp"
+                            android:text="@string/channel" />
+                        <androidx.appcompat.widget.AppCompatSpinner
+                            android:id="@+id/invites_channel_spinner"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp" />
+                        <include layout="@layout/container_inline_channel_form" />
+                    </LinearLayout>
+                </androidx.cardview.widget.CardView>
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 74026d86..59546685 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -35,7 +35,7 @@
     <color name="tagGreen">#329A7E</color>
     <color name="tagGrape">#77D510B8</color>
 
-    <color name="divider">#454545</color>
+    <color name="divider">#292929</color>
     <color name="lightDivider">#0A0A0A</color>
 
     <color name="lightGrey">#CCCCCC</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 698db218..6660284a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,6 +102,7 @@
     <string name="storage_permission_rationale_videos">LBRY requires access to be able to display and publish your videos, images and other files from your device.</string>
     <string name="camera_permission_rationale_record">LBRY requires access to your camera to record videos.</string>
     <string name="camera_permission_rationale_photo">LBRY requires access to your camera to take photos.</string>
+    <string name="mature_tags">Mature tags</string>
 
     <!-- Publishes -->
     <string name="one_or_more_publishes_failed_abandon">One or more content items could not be deleted at this time. Please try again later.</string>