77 changed files with 2086 additions and 630 deletions
--- a/flow-typed/homepage.js
+++ b/flow-typed/homepage.js
@ -4,12 +4,12 @@ declare type HomepageObject = {
  options: any,
  route: string,
  title: string,
-}
+};

 declare type HomepageData = {
  [string]: HomepageObject,
  default: any => any,
-}
+};

 declare type RowDataItem = {
  title: any,
@ -19,6 +19,7 @@ declare type RowDataItem = {
  extra?: any,
  options?: {
    channelIds?: Array<string>,
+    limitClaimsPerChannel?: number,
    pageSize: number,
  },
  route?: string,
--- a/homepages/homepage.js
+++ b/homepages/homepage.js
--- a/static/app-strings.json
+++ b/static/app-strings.json
@ -880,7 +880,6 @@
  "Tag selection": "Tag selection",
  "Select some tags to help us show you interesting things.": "Select some tags to help us show you interesting things.",
  "You are currently following %followingCount% tags": "You are currently following %followingCount% tags",
-  "You are currently following %followingCount% tag": "You are currently following %followingCount% tag",
  "Back": "Back",
  "Experimental Transcoding": "Experimental Transcoding",
  "A Folder containing FFmpeg": "A Folder containing FFmpeg",
@ -1455,6 +1454,7 @@
  "Never fear though, there are tons of ways to earn %lbc%. You can earn or purchase %lbc%, or you can have your friends send you some.": "Never fear though, there are tons of ways to earn %lbc%. You can earn or purchase %lbc%, or you can have your friends send you some.",
  "gaming, comedy, educational": "gaming, comedy, educational",
  "A channel is required to comment on %SITE_NAME%": "A channel is required to comment on %SITE_NAME%",
+  "A channel is required to comment on lbry.tv": "A channel is required to comment on lbry.tv",
  "A welcome bonus and thank you for your contribution to content freedom.": "A welcome bonus and thank you for your contribution to content freedom.",
  "You earned %lbc% new user reward.": "You earned %lbc% new user reward.",
  "Just press play on something. Anything at all. Yep, even that one. Everybody's doing it.": "Just press play on something. Anything at all. Yep, even that one. Everybody's doing it.",
--- a/static/img/favicon.png
+++ b/static/img/favicon.png
--- a/static/img/lbry-favicon.png
+++ b/static/img/lbry-favicon.png
--- a/ui/analytics.js
+++ b/ui/analytics.js
@ -38,6 +38,9 @@ type Analytics = {
  playerLoadedEvent: (?boolean) => void,
  playerStartedEvent: (?boolean) => void,
  videoStartEvent: (string, number) => void,
+  adsFetchedEvent: () => void,
+  adsReceivedEvent: (any) => void,
+  adsErrorEvent: (any) => void,
  videoBufferEvent: (
    StreamClaim,
    {
@ -50,9 +53,6 @@ type Analytics = {
      readyState: number,
    }
  ) => void,
-  adsFetchedEvent: () => void,
-  adsReceivedEvent: (any) => void,
-  adsErrorEvent: (any) => void,
  emailProvidedEvent: () => void,
  emailVerifiedEvent: () => void,
  rewardEligibleEvent: () => void,
--- a/ui/component/channelContent/view.jsx
+++ b/ui/component/channelContent/view.jsx
@ -136,13 +136,14 @@ function ChannelContent(props: Props) {
      {!channelIsMine && claimsInChannel > 0 && <HiddenNsfwClaims uri={uri} />}

      <ClaimListDiscover
-        defaultFreshness={CS.FRESH_ALL}
+        hideLivestreamClaims
        showHiddenByUser={viewHiddenChannels}
        forceShowReposts
        hideFilters={!showFilters}
        hideAdvancedFilter={!showFilters}
        tileLayout={tileLayout}
        uris={searchResults}
+        streamType={CS.CONTENT_ALL}
        channelIds={[claim.claim_id]}
        claimType={claimType}
        feeAmount={CS.FEE_AMOUNT_ANY}
--- a/ui/component/channelThumbnail/spaceman.png
+++ b/ui/component/channelThumbnail/spaceman.png
--- a/ui/component/channelThumbnail/view.jsx
+++ b/ui/component/channelThumbnail/view.jsx
@ -2,7 +2,7 @@
 import React from 'react';
 import { parseURI } from 'lbry-redux';
 import classnames from 'classnames';
-import Gerbil from './gerbil.png';
+import Spaceman from './spaceman.png';
 import Transparent from './transparent_1x1.png';
 import FreezeframeWrapper from 'component/fileThumbnail/FreezeframeWrapper';
 import ChannelStakedIndicator from 'component/channelStakedIndicator';
@ -100,7 +100,7 @@ function ChannelThumbnail(props: Props) {
          ref={thumbnailRef}
          alt={__('Channel profile picture')}
          className="channel-thumbnail__default"
-          data-src={!thumbError && url ? url : Gerbil}
+          data-src={!thumbError && url ? url : Spaceman}
          src={Transparent}
          onError={() => setThumbError(true)} // if thumb fails (including due to https replace, show gerbil.
        />
@ -114,7 +114,7 @@ function ChannelThumbnail(props: Props) {
              ref={thumbnailRef}
              alt={__('Channel profile picture')}
              className="channel-thumbnail__custom"
-              data-src={!thumbError && url ? url : Gerbil}
+              data-src={!thumbError && url ? url : Spaceman}
              src={Transparent}
              onError={() => setThumbError(true)} // if thumb fails (including due to https replace, show gerbil.
            />
--- a/ui/component/claimList/view.jsx
+++ b/ui/component/claimList/view.jsx
@ -45,6 +45,7 @@ type Props = {
  livestreamMap?: { [string]: any },
  searchOptions?: any,
  collectionId?: string,
+  hideLivestreamClaims?: boolean,
 };

 export default function ClaimList(props: Props) {
@ -76,6 +77,7 @@ export default function ClaimList(props: Props) {
    livestreamMap,
    searchOptions,
    collectionId,
+    hideLivestreamClaims,
  } = props;

  const [currentSort, setCurrentSort] = usePersistedState(persistedStorageKey, SORT_NEW);
@ -135,6 +137,7 @@ export default function ClaimList(props: Props) {
            properties={renderProperties}
            live={resolveLive(index)}
            collectionId={collectionId}
+            hideLivestreamClaims={hideLivestreamClaims}
          />
        ))}
      {!timedOut && urisLength === 0 && !loading && <div className="empty main--empty">{empty || noResultMsg}</div>}
@ -195,6 +198,7 @@ export default function ClaimList(props: Props) {
                showUserBlocked={showHiddenByUser}
                showHiddenByUser={showHiddenByUser}
                collectionId={collectionId}
+                hideLivestreamClaims={hideLivestreamClaims}
                customShouldHide={(claim: StreamClaim) => {
                  // Hack to hide spee.ch thumbnail publishes
                  // If it meets these requirements, it was probably uploaded here:
--- a/ui/component/claimListDiscover/view.jsx
+++ b/ui/component/claimListDiscover/view.jsx
@ -72,7 +72,11 @@ type Props = {
  liveLivestreamsFirst?: boolean,
  livestreamMap?: { [string]: any },
  hasSource?: boolean,
+  limitClaimsPerChannel?: number,
+  releaseTime?: string,
+  hideLivestreamClaims?: boolean,
  isChannel?: boolean,
+  // channelIsMine?: boolean, //CHECK
  empty?: string,
 };

@ -103,8 +107,8 @@ function ClaimListDiscover(props: Props) {
    claimType,
    pageSize,
    defaultClaimType,
-    streamType,
-    defaultStreamType,
+    streamType = CS.FILE_VIDEO,
+    defaultStreamType = CS.FILE_VIDEO,
    freshness,
    defaultFreshness = CS.FRESH_WEEK,
    renderProperties,
@ -123,12 +127,16 @@ function ClaimListDiscover(props: Props) {
    forceShowReposts = false,
    languageSetting,
    searchInLanguage,
+    limitClaimsPerChannel,
+    releaseTime,
    scrollAnchor,
    showHiddenByUser = false,
    liveLivestreamsFirst,
    livestreamMap,
    hasSource,
    isChannel = false,
+    // channelIsMine = false, //RBCHECK that ClaimList handles this
+    hideLivestreamClaims,
    empty,
  } = props;
  const didNavigateForward = history.action === 'PUSH';
@ -168,12 +176,12 @@ function ClaimListDiscover(props: Props) {
  const durationParam = urlParams.get(CS.DURATION_KEY) || null;
  const channelIdsInUrl = urlParams.get(CS.CHANNEL_IDS_KEY);
  const channelIdsParam = channelIdsInUrl ? channelIdsInUrl.split(',') : channelIds;
-  const feeAmountParam = urlParams.get('fee_amount') || feeAmount;
+  const feeAmountParam = urlParams.get('fee_amount') || feeAmount || CS.FEE_AMOUNT_ONLY_FREE;
  const originalPageSize = pageSize || CS.PAGE_SIZE;
  const dynamicPageSize = isLargeScreen ? Math.ceil(originalPageSize * (3 / 2)) : originalPageSize;
  const historyAction = history.action;

-  let orderParam = orderBy || urlParams.get(CS.ORDER_BY_KEY) || defaultOrderBy;
+  let orderParam = orderBy || urlParams.get(CS.ORDER_BY_KEY) || defaultOrderBy || orderParamEntry;

  if (!orderParam) {
    if (historyAction === 'POP') {
@ -217,6 +225,7 @@ function ClaimListDiscover(props: Props) {
    fee_amount?: string,
    has_source?: boolean,
    has_no_source?: boolean,
+    limit_claims_per_channel?: number,
  } = {
    page_size: dynamicPageSize,
    page,
@ -239,6 +248,10 @@ function ClaimListDiscover(props: Props) {
    options.has_source = true;
  }

+  if (limitClaimsPerChannel) {
+    options.limit_claims_per_channel = limitClaimsPerChannel;
+  }
+
  if (feeAmountParam && claimType !== CS.CLAIM_CHANNEL) {
    options.fee_amount = feeAmountParam;
  }
@ -268,7 +281,10 @@ function ClaimListDiscover(props: Props) {
    options.reposted_claim_id = repostedClaimId;
  }

-  if (claimType !== CS.CLAIM_CHANNEL) {
+  // IF release time, set it, else set fallback release times using the hack below.
+  if (releaseTime) {
+    options.release_time = releaseTime;
+  } else if (claimType !== CS.CLAIM_CHANNEL) {
    if (orderParam === CS.ORDER_BY_TOP && freshnessParam !== CS.FRESH_ALL) {
      options.release_time = `>${Math.floor(moment().subtract(1, freshnessParam).startOf('hour').unix())}`;
    } else if (orderParam === CS.ORDER_BY_NEW || orderParam === CS.ORDER_BY_TRENDING) {
@ -346,9 +362,25 @@ function ClaimListDiscover(props: Props) {

  const hasMatureTags = tagsParam && tagsParam.split(',').some((t) => MATURE_TAGS.includes(t));
  const claimSearchCacheQuery = createNormalizedClaimSearchKey(options);
-  const claimSearchResult = claimSearchByQuery[claimSearchCacheQuery];
+  let claimSearchResult = claimSearchByQuery[claimSearchCacheQuery];
  const claimSearchResultLastPageReached = claimSearchByQueryLastPageReached[claimSearchCacheQuery];

+  // uncomment to fix an item on a page
+  //   const fixUri = 'lbry://@corbettreport#0/lbryodysee#5';
+  //   if (
+  //     orderParam === CS.ORDER_BY_NEW &&
+  //     claimSearchResult &&
+  //     claimSearchResult.length > 2 &&
+  //     window.location.pathname === '/$/rabbithole'
+  //   ) {
+  //     if (claimSearchResult.indexOf(fixUri) !== -1) {
+  //       claimSearchResult.splice(claimSearchResult.indexOf(fixUri), 1);
+  //     } else {
+  //       claimSearchResult.pop();
+  //     }
+  //     claimSearchResult.splice(2, 0, fixUri);
+  //   }
+
  const [prevOptions, setPrevOptions] = React.useState(null);

  if (!isJustScrollingToNewPage(prevOptions, options)) {
@ -472,7 +504,7 @@ function ClaimListDiscover(props: Props) {
      claimType={claimType}
      streamType={streamType}
      defaultStreamType={defaultStreamType}
-      feeAmount={feeAmount}
+      //   feeAmount={feeAmount}
      orderBy={orderBy}
      defaultOrderBy={defaultOrderBy}
      hideAdvancedFilter={hideAdvancedFilter}
@ -512,6 +544,7 @@ function ClaimListDiscover(props: Props) {
            liveLivestreamsFirst={liveLivestreamsFirst}
            livestreamMap={livestreamMap}
            searchOptions={options}
+            hideLivestreamClaims={hideLivestreamClaims}
            empty={empty}
          />
          {loading && (
@ -546,6 +579,7 @@ function ClaimListDiscover(props: Props) {
            liveLivestreamsFirst={liveLivestreamsFirst}
            livestreamMap={livestreamMap}
            searchOptions={options}
+            hideLivestreamClaims={hideLivestreamClaims}
            empty={empty}
          />
          {loading &&
--- a/ui/component/claimPreview/view.jsx
+++ b/ui/component/claimPreview/view.jsx
@ -30,7 +30,7 @@ import * as ICONS from 'constants/icons';

 type Props = {
  uri: string,
-  claim: ?Claim, // maybe?
+  claim: ?Claim,
  obscureNsfw: boolean,
  showUserBlocked: boolean,
  claimIsMine: boolean,
--- a/ui/component/claimPreviewTile/view.jsx
+++ b/ui/component/claimPreviewTile/view.jsx
@ -44,6 +44,8 @@ type Props = {
  properties?: (Claim) => void,
  live?: boolean,
  collectionId?: string,
+  hideLivestreamClaims?: boolean,
+  isLivestream: boolean,
 };

 function ClaimPreviewTile(props: Props) {
@ -66,6 +68,8 @@ function ClaimPreviewTile(props: Props) {
    showHiddenByUser,
    properties,
    live,
+    hideLivestreamClaims,
+    isLivestream,
    collectionId,
  } = props;
  const isRepost = claim && claim.repost_channel_url;
@ -149,7 +153,7 @@ function ClaimPreviewTile(props: Props) {
    shouldHide = blockedChannelUris.some((blockedUri) => blockedUri === claim.permanent_url);
  }

-  if (shouldHide) {
+  if (shouldHide || (isLivestream && hideLivestreamClaims)) {
    return null;
  }

--- a/ui/component/claimTilesDiscover/view.jsx
+++ b/ui/component/claimTilesDiscover/view.jsx
@ -37,7 +37,7 @@ export function prioritizeActiveLivestreams(
    //    for that channel actually point to the same source).
    // 2. 'liveChannelIds' needs to be pruned after being accounted for,
    //    otherwise all livestream-claims will be "live" (we'll only take the
-    //    latest one as "live").
+    //    latest one as "live" ).
    return (
      claim &&
      claim.value_type === 'stream' &&
@ -145,14 +145,14 @@ function ClaimTilesDiscover(props: Props) {
    mutedUris,
    liveLivestreamsFirst,
    livestreamMap,
-    // pin,
+    pin,
    prefixUris,
  } = props;

  const { location } = useHistory();
  const urlParams = new URLSearchParams(location.search);
  const feeAmountInUrl = urlParams.get('fee_amount');
-  const feeAmountParam = feeAmountInUrl || feeAmount;
+  const feeAmountParam = feeAmountInUrl || feeAmount || CS.FEE_AMOUNT_ONLY_FREE;
  const mutedAndBlockedChannelIds = Array.from(new Set(mutedUris.concat(blockedUris).map((uri) => uri.split('#')[1])));
  const liveUris = [];

@ -239,8 +239,8 @@ function ClaimTilesDiscover(props: Props) {
  let uris = (prefixUris || []).concat(claimSearchByQuery[mainSearchKey] || []);

  const isLoading = fetchingClaimSearchByQuery[mainSearchKey];
-
-  if (liveLivestreamsFirst && livestreamMap) {
+  // && !isLoading isn't on master, doesn't seem to affect the functionality, don't recall why it was added.
+  if (liveLivestreamsFirst && livestreamMap && !isLoading) {
    prioritizeActiveLivestreams(uris, liveUris, livestreamMap, claimsByUri, claimSearchByQuery, options);
  }

@ -284,10 +284,27 @@ function ClaimTilesDiscover(props: Props) {
    return undefined;
  };

+  const modifiedUris = uris ? uris.slice() : [];
+  const fixUris = [
+    'lbry://@dirtyworkz#0/sickddellz-day-one-(official-video)#1',
+    'lbry://@CrackerMilk#6/who-does-your-dog-love-most#8',
+                  ];
+                   
+  if (pin && modifiedUris && modifiedUris.length > 2 && window.location.pathname === '/') {
+    fixUris.forEach((fixUri) => {
+      if (modifiedUris.indexOf(fixUri) !== -1) {
+        modifiedUris.splice(modifiedUris.indexOf(fixUri), 1);
+      } else {
+        modifiedUris.pop();
+      }
+    });
+    modifiedUris.splice(2, 0, ...fixUris);
+  }
+
  return (
    <ul className="claim-grid">
-      {uris && uris.length
-        ? uris.map((uri, index) => (
+      {modifiedUris && modifiedUris.length
+        ? modifiedUris.map((uri, index) => (
            <ClaimPreviewTile key={uri} uri={uri} properties={renderProperties} live={resolveLive(index)} />
          ))
        : new Array(pageSize).fill(1).map((x, i) => <ClaimPreviewTile key={i} placeholder />)}
--- a/ui/component/commentCreate/view.jsx
+++ b/ui/component/commentCreate/view.jsx
@ -33,7 +33,10 @@ type Props = {
  isReply: boolean,
  activeChannel: string,
  activeChannelClaim: ?ChannelClaim,
-  livestream?: boolean,
+  bottom: boolean,
+  onSubmit: (string, string) => void,
+  livestream: boolean,
+  embed?: boolean,
  toast: (string) => void,
  claimIsMine: boolean,
  sendTip: ({}, (any) => void, (any) => void) => void,
@ -53,7 +56,10 @@ export function CommentCreate(props: Props) {
    isReply,
    parentId,
    activeChannelClaim,
+    onSubmit,
+    bottom,
    livestream,
+    embed,
    toast,
    claimIsMine,
    sendTip,
@ -91,7 +97,7 @@ export function CommentCreate(props: Props) {

  function altEnterListener(e: SyntheticKeyboardEvent<*>) {
    const KEYCODE_ENTER = 13;
-    if ((e.ctrlKey || e.metaKey) && e.keyCode === KEYCODE_ENTER) {
+    if ((livestream || e.ctrlKey || e.metaKey) && e.keyCode === KEYCODE_ENTER) {
      e.preventDefault();
      buttonref.current.click();
    }
@ -169,6 +175,10 @@ export function CommentCreate(props: Props) {
          setCommentFailure(false);
          justCommented.push(res.comment_id);

+          if (onSubmit) {
+            onSubmit(commentValue, activeChannelClaim.name);
+          }
+
          if (onDoneReplying) {
            onDoneReplying();
          }
@ -193,6 +203,11 @@ export function CommentCreate(props: Props) {
      <div
        role="button"
        onClick={() => {
+          if (embed) {
+            window.open(`https://odysee.com/$/${PAGES.AUTH}?redirect=/$/${PAGES.LIVESTREAM}`);
+            return;
+          }
+
          const pathPlusRedirect = `/$/${PAGES.CHANNEL_NEW}?redirect=${pathname}`;
          if (livestream) {
            window.open(pathPlusRedirect);
@ -246,6 +261,7 @@ export function CommentCreate(props: Props) {
      className={classnames('comment__create', {
        'comment__create--reply': isReply,
        'comment__create--nested-reply': isNested,
+        'comment__create--bottom': bottom,
      })}
    >
      <FormField
--- a/ui/component/commentReactions/view.jsx
+++ b/ui/component/commentReactions/view.jsx
@ -77,7 +77,7 @@ export default function CommentReactions(props: Props) {
      <Button
        requiresAuth={IS_WEB}
        title={__('Upvote')}
-        icon={ICONS.UPVOTE}
+        icon={myReacts.includes(REACTION_TYPES.LIKE) ? ICONS.FIRE_ACTIVE : ICONS.FIRE}
        className={classnames('comment__action', {
          'comment__action--active': myReacts && myReacts.includes(REACTION_TYPES.LIKE),
        })}
@ -87,7 +87,7 @@ export default function CommentReactions(props: Props) {
      <Button
        requiresAuth={IS_WEB}
        title={__('Downvote')}
-        icon={ICONS.DOWNVOTE}
+        icon={myReacts.includes(REACTION_TYPES.DISLIKE) ? ICONS.SLIME_ACTIVE : ICONS.SLIME}
        className={classnames('comment__action', {
          'comment__action--active': myReacts && myReacts.includes(REACTION_TYPES.DISLIKE),
        })}
--- a/ui/component/fileActions/view.jsx
+++ b/ui/component/fileActions/view.jsx
@ -29,6 +29,7 @@ type Props = {
  myChannels: ?Array<ChannelClaim>,
  doToast: ({ message: string }) => void,
  clearPlayingUri: () => void,
+  hideRepost?: boolean,
  isLivestreamClaim: boolean,
  reactionsDisabled: boolean,
  download: (string) => void,
@ -48,6 +49,7 @@ function FileActions(props: Props) {
    myChannels,
    clearPlayingUri,
    doToast,
+    hideRepost,
    isLivestreamClaim,
    reactionsDisabled,
    download,
@ -113,24 +115,26 @@ function FileActions(props: Props) {

  const lhsSection = (
    <>
-      {ENABLE_FILE_REACTIONS && !reactionsDisabled && <FileReactions uri={uri} />}
+      {ENABLE_FILE_REACTIONS && !reactionsDisabled && <FileReactions uri={uri} livestream={isLivestreamClaim} />}
      <ClaimSupportButton uri={uri} fileAction />
      <ClaimCollectionAddButton uri={uri} fileAction />
-      <Button
-        button="alt"
-        className="button--file-action"
-        icon={ICONS.REPOST}
-        label={
-          claim.meta.reposted > 1 ? __(`%repost_total% Reposts`, { repost_total: claim.meta.reposted }) : __('Repost')
-        }
-        description={__('Repost')}
-        requiresAuth={IS_WEB}
-        onClick={handleRepostClick}
-      />
+      {!hideRepost && (
+        <Button
+          button="alt"
+          className="button--file-action"
+          icon={ICONS.REPOST}
+          label={
+            claim.meta.reposted > 1 ? __(`%repost_total% Reposts`, { repost_total: claim.meta.reposted }) : __('Repost')
+          }
+          description={__('Repost')}
+          requiresAuth={IS_WEB}
+          onClick={handleRepostClick}
+        />
+      )}
      <Button
        className="button--file-action"
        icon={ICONS.SHARE}
-        label={__('Share')}
+        label={isMobile ? undefined : __('Share')}
        title={__('Share')}
        onClick={() => openModal(MODALS.SOCIAL_SHARE, { uri, webShareable, collectionId })}
      />
--- a/ui/component/fileReactions/view.jsx
+++ b/ui/component/fileReactions/view.jsx
@ -1,4 +1,5 @@
 // @flow
+import * as REACTION_TYPES from 'constants/reactions';
 import * as ICONS from 'constants/icons';
 import React from 'react';
 import classnames from 'classnames';
@ -15,18 +16,44 @@ type Props = {
  likeCount: number,
  dislikeCount: number,
  myReaction: ?string,
+  livestream?: boolean,
 };

 function FileReactions(props: Props) {
-  const { claim, uri, doFetchReactions, doReactionLike, doReactionDislike, likeCount, dislikeCount } = props;
+  const {
+    claim,
+    uri,
+    doFetchReactions,
+    doReactionLike,
+    doReactionDislike,
+    myReaction,
+    likeCount,
+    dislikeCount,
+    livestream,
+  } = props;
  const claimId = claim && claim.claim_id;
  const channel = claim && claim.signing_channel && claim.signing_channel.name;
  const isCollection = claim && claim.value_type === 'collection'; // hack because nudge gets cut off by card on cols.
  React.useEffect(() => {
-    if (claimId) {
+    function fetchReactions() {
      doFetchReactions(claimId);
    }
-  }, [claimId, doFetchReactions]);
+
+    let fetchInterval;
+    if (claimId) {
+      fetchReactions();
+
+      if (livestream) {
+        fetchInterval = setInterval(fetchReactions, 45000);
+      }
+    }
+
+    return () => {
+      if (fetchInterval) {
+        clearInterval(fetchInterval);
+      }
+    };
+  }, [claimId, doFetchReactions, livestream]);

  return (
    <>
@ -41,20 +68,46 @@ function FileReactions(props: Props) {
        title={__('I like this')}
        requiresAuth={IS_WEB}
        authSrc="filereaction_like"
-        className={classnames('button--file-action')}
-        label={formatNumberWithCommas(likeCount, 0)}
+        className={classnames('button--file-action', { 'button--fire': myReaction === REACTION_TYPES.LIKE })}
+        label={
+          <>
+            {myReaction === REACTION_TYPES.LIKE && (
+              <>
+                <div className="button__fire-glow" />
+                <div className="button__fire-particle1" />
+                <div className="button__fire-particle2" />
+                <div className="button__fire-particle3" />
+                <div className="button__fire-particle4" />
+                <div className="button__fire-particle5" />
+                <div className="button__fire-particle6" />
+              </>
+            )}
+            {formatNumberWithCommas(likeCount, 0)}
+          </>
+        }
        iconSize={18}
-        icon={ICONS.UPVOTE}
+        icon={myReaction === REACTION_TYPES.LIKE ? ICONS.FIRE_ACTIVE : ICONS.FIRE}
        onClick={() => doReactionLike(uri)}
      />
      <Button
        requiresAuth={IS_WEB}
        authSrc={'filereaction_dislike'}
        title={__('I dislike this')}
-        className={classnames('button--file-action')}
-        label={formatNumberWithCommas(dislikeCount, 0)}
+        className={classnames('button--file-action', { 'button--slime': myReaction === REACTION_TYPES.DISLIKE })}
+        label={
+          <>
+            {myReaction === REACTION_TYPES.DISLIKE && (
+              <>
+                <div className="button__slime-stain" />
+                <div className="button__slime-drop1" />
+                <div className="button__slime-drop2" />
+              </>
+            )}
+            {formatNumberWithCommas(dislikeCount, 0)}
+          </>
+        }
        iconSize={18}
-        icon={ICONS.DOWNVOTE}
+        icon={myReaction === REACTION_TYPES.DISLIKE ? ICONS.SLIME_ACTIVE : ICONS.SLIME}
        onClick={() => doReactionDislike(uri)}
      />
    </>
--- a/ui/component/fileSubtitle/view.jsx
+++ b/ui/component/fileSubtitle/view.jsx
@ -21,8 +21,8 @@ function FileSubtitle(props: Props) {

        <FileViewCount uri={uri} livestream={livestream} activeViewers={activeViewers} isLive={isLive} />
      </div>
-
-      <FileActions uri={uri} />
+      {/* did I need these params? */}
+      <FileActions uri={uri} hideRepost={livestream} livestream={livestream} />
    </div>
  );
 }
--- a/ui/component/fileTitleSection/view.jsx
+++ b/ui/component/fileTitleSection/view.jsx
@ -10,7 +10,6 @@ import * as ICONS from 'constants/icons';
 import Icon from 'component/common/icon';
 import I18nMessage from 'component/i18nMessage';
 import Button from 'component/button';
-import * as PAGES from 'constants/pages';
 import FileDescription from 'component/fileDescription';
 import usePersistedState from 'effects/use-persisted-state';

@ -65,17 +64,16 @@ function FileTitleSection(props: Props) {
            <div className="main--empty">
              <h2>
                <Icon className="icon--hidden" icon={ICONS.EYE_OFF} />
-                {__('Mature content blocked.')}
+                {__('Mature content is not supported on Odysee.')}
              </h2>
              <div>
                <I18nMessage
                  tokens={{
-                    content_settings: (
-                      <Button button="link" label={__('content settings')} navigate={`/$/${PAGES.SETTINGS}`} />
-                    ),
+                    download_url: <Button label={__('lbry.com')} button="link" href="https://lbry.com/get" />,
                  }}
                >
-                  Change this in your %content_settings%.
+                  You can download the LBRY Desktop or Android app on %download_url% and enable mature content in
+                  Settings.
                </I18nMessage>
              </div>
            </div>
--- a/ui/component/fileViewerEmbeddedTitle/view.jsx
+++ b/ui/component/fileViewerEmbeddedTitle/view.jsx
@ -5,7 +5,8 @@ import FilePrice from 'component/filePrice';
 import { formatLbryUrlForWeb } from 'util/url';
 import { withRouter } from 'react-router';
 import { URL } from 'config';
-import * as ICONS from 'constants/icons';
+import OdyseeLogo from 'component/header/odysee_logo.png';
+import OdyseeLogoWithText from 'component/header/odysee_white.png';

 type Props = {
  uri: string,
@ -36,7 +37,10 @@ function FileViewerEmbeddedTitle(props: Props) {
        {...contentLinkProps}
      />
      <div className="file-viewer__embedded-info">
-        <Button className="file-viewer__overlay-logo" icon={ICONS.LBRY} aria-label={__('Home')} {...lbryLinkProps} />
+        <Button className="file-viewer__overlay-logo" aria-label={__('Home')} {...lbryLinkProps}>
+          <img src={OdyseeLogo} className=" mobile-only" />
+          <img src={OdyseeLogoWithText} className=" mobile-hidden" />
+        </Button>
        {isInApp && <FilePrice uri={uri} />}
      </div>
    </div>
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@ -1,5 +1,5 @@
 // @flow
-import { LOGO_TITLE, ENABLE_NO_SOURCE_CLAIMS, CHANNEL_STAKED_LEVEL_LIVESTREAM } from 'config';
+import { ENABLE_NO_SOURCE_CLAIMS, CHANNEL_STAKED_LEVEL_LIVESTREAM } from 'config';
 import * as ICONS from 'constants/icons';
 import { SETTINGS } from 'lbry-redux';
 import * as PAGES from 'constants/pages';
@ -19,6 +19,8 @@ import ChannelThumbnail from 'component/channelThumbnail';
 import { remote } from 'electron';
 import { IS_MAC } from 'component/app/view';
 // @endif
+import OdyseeLogoWithWhiteText from './odysee_white.png';
+import OdyseeLogoWithText from './odysee.png';

 type Props = {
  user: ?User,
@ -87,8 +89,8 @@ const Header = (props: Props) => {
    sidebarOpen,
    setSidebarOpen,
    isAbsoluteSideNavHidden,
-    user,
    hideCancel,
+    user,
    activeChannelClaim,
    activeChannelStakedLevel,
  } = props;
@ -100,7 +102,7 @@ const Header = (props: Props) => {
  const isPwdResetPage = history.location.pathname.includes(PAGES.AUTH_PASSWORD_RESET);
  const hasBackout = Boolean(backout);
  const { backLabel, backNavDefault, title: backTitle, simpleTitle: simpleBackTitle } = backout || {};
-  const notificationsEnabled = (user && user.experimental_ui) || false;
+  //   const notificationsEnabled = (user && user.experimental_ui) || false;
  const livestreamEnabled = Boolean(
    ENABLE_NO_SOURCE_CLAIMS &&
      user &&
@ -246,19 +248,12 @@ const Header = (props: Props) => {
                    icon={ICONS.MENU}
                    onClick={() => setSidebarOpen(!sidebarOpen)}
                  >
-                    {isAbsoluteSideNavHidden && isMobile && notificationsEnabled && <NotificationBubble />}
+                    {isAbsoluteSideNavHidden && isMobile && <NotificationBubble />}
                  </Button>
                </span>
              )}
              <Button
-                className="header__navigation-item header__navigation-item--lbry"
-                // @if TARGET='app'
-                label={'LBRY'}
-                // @endif
-                // @if TARGET='web'
-                label={LOGO_TITLE} // eslint-disable-line
-                // @endif
-                icon={ICONS.LBRY}
+                className="header__navigation-item header__navigation-item--lbry header__navigation-item--button-mobile"
                onClick={() => {
                  if (history.location.pathname === '/') window.location.reload();
                }}
@ -268,7 +263,12 @@ const Header = (props: Props) => {
                }}
                // @endif
                {...homeButtonNavigationProps}
-              />
+              >
+                <img
+                  src={currentTheme === 'light' ? OdyseeLogoWithText : OdyseeLogoWithWhiteText}
+                  className="header__odysee"
+                />
+              </Button>

              {!authHeader && (
                <div className="header__center">
@ -285,7 +285,7 @@ const Header = (props: Props) => {

                  <HeaderMenuButtons
                    authenticated={authenticated}
-                    notificationsEnabled={notificationsEnabled}
+                    notificationsEnabled
                    history={history}
                    handleThemeToggle={handleThemeToggle}
                    currentTheme={currentTheme}
@ -438,6 +438,10 @@ function HeaderMenuButtons(props: HeaderMenuButtonProps) {
              <Icon aria-hidden icon={ICONS.CHANNEL} />
              {__('New Channel')}
            </MenuItem>
+            <MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.YOUTUBE_SYNC}`)}>
+              <Icon aria-hidden icon={ICONS.YOUTUBE} />
+              {__('Sync YouTube Channel')}
+            </MenuItem>

            {livestreamEnabled && (
              <MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.LIVESTREAM}`)}>
--- a/ui/component/livestreamFeed/index.js
+++ b/ui/component/livestreamFeed/index.js
@ -0,0 +1,9 @@
+import { connect } from 'react-redux';
+import { makeSelectClaimForUri } from 'lbry-redux';
+import LivestreamFeed from './view';
+
+const select = (state, props) => ({
+  claim: makeSelectClaimForUri(props.uri)(state),
+});
+
+export default connect(select)(LivestreamFeed);
--- a/ui/component/livestreamFeed/view.jsx
+++ b/ui/component/livestreamFeed/view.jsx
@ -0,0 +1,38 @@
+// @flow
+import { BITWAVE_USERNAME, BITWAVE_EMBED_URL } from 'constants/livestream';
+import React from 'react';
+import FileTitleSection from 'component/fileTitleSection';
+import LivestreamComments from 'component/livestreamComments';
+
+type Props = {
+  uri: string,
+  claim: ?StreamClaim,
+  activeViewers: number,
+};
+
+export default function LivestreamFeed(props: Props) {
+  const { claim, uri, activeViewers } = props;
+
+  if (!claim) {
+    return null;
+  }
+
+  return (
+    <>
+      <div className="section card-stack">
+        <div className="file-render file-render--video livestream">
+          <div className="file-viewer">
+            <iframe
+              src={`${BITWAVE_EMBED_URL}/${BITWAVE_USERNAME}?skin=odysee&autoplay=1`}
+              scrolling="no"
+              allowFullScreen
+            />
+          </div>
+        </div>
+
+        <FileTitleSection uri={uri} livestream activeViewers={activeViewers} />
+      </div>
+      <LivestreamComments uri={uri} />
+    </>
+  );
+}
--- a/ui/component/livestreamLink/view.jsx
+++ b/ui/component/livestreamLink/view.jsx
@ -17,7 +17,7 @@ export default function LivestreamLink(props: Props) {
  const { push } = useHistory();
  const [livestreamClaim, setLivestreamClaim] = React.useState(false);
  const [isLivestreaming, setIsLivestreaming] = React.useState(false);
-  const livestreamChannelId = channelClaim.claim_id || ''; // TODO: fail in a safer way, probably
+  const livestreamChannelId = (channelClaim && channelClaim.claim_id) || ''; // TODO: fail in a safer way, probably

  React.useEffect(() => {
    if (livestreamChannelId) {
@ -29,7 +29,7 @@ export default function LivestreamLink(props: Props) {
      })
        .then((res) => {
          if (res && res.items && res.items.length > 0) {
-            const claim = res.items[res.items.length - 1];
+            const claim = res.items[0];
            setLivestreamClaim(claim);
          }
        })
--- a/ui/component/notificationBubble/view.jsx
+++ b/ui/component/notificationBubble/view.jsx
@ -5,14 +5,12 @@ import classnames from 'classnames';
 type Props = {
  unseenCount: number,
  inline: boolean,
-  user: ?User,
 };

 export default function NotificationHeaderButton(props: Props) {
-  const { unseenCount, inline = false, user } = props;
-  const notificationsEnabled = user && user.experimental_ui;
+  const { unseenCount, inline = false } = props;

-  if (unseenCount === 0 || !notificationsEnabled) {
+  if (unseenCount === 0) {
    return null;
  }

--- a/ui/component/notificationHeaderButton/view.jsx
+++ b/ui/component/notificationHeaderButton/view.jsx
@ -19,9 +19,8 @@ export default function NotificationHeaderButton(props: Props) {
    // notifications,
    // fetching,
    doSeeAllNotifications,
-    user,
+    // user,
  } = props;
-  const notificationsEnabled = user && user.experimental_ui;
  const { push } = useHistory();

  function handleMenuClick() {
@ -32,10 +31,6 @@ export default function NotificationHeaderButton(props: Props) {
    push(`/$/${PAGES.NOTIFICATIONS}`);
  }

-  if (!notificationsEnabled) {
-    return null;
-  }
-
  return (
    <Button
      onClick={handleMenuClick}
--- a/ui/component/page/view.jsx
+++ b/ui/component/page/view.jsx
@ -1,5 +1,6 @@
 // @flow
 import type { Node } from 'react';
+import * as PAGES from 'constants/pages';
 import React, { Fragment } from 'react';
 import classnames from 'classnames';
 import SideNavigation from 'component/sideNavigation';
@ -21,7 +22,6 @@ type Props = {
  isUpgradeAvailable: boolean,
  authPage: boolean,
  filePage: boolean,
-  homePage: boolean,
  noHeader: boolean,
  noFooter: boolean,
  noSideNavigation: boolean,
--- a/ui/component/publishFile/view.jsx
+++ b/ui/component/publishFile/view.jsx
@ -612,7 +612,7 @@ function PublishFile(props: Props) {
          {/* @if TARGET='app' */}
          {showFileUpload && (
            <FileSelector
-              label={__('File')}
+              label={__('Video file')}
              disabled={disabled}
              currentPath={currentFile}
              onFileChosen={handleFileChange}
--- a/ui/component/publishForm/view.jsx
+++ b/ui/component/publishForm/view.jsx
@ -182,9 +182,9 @@ function PublishForm(props: Props) {
    }
  } else {
    if (editingURI) {
-      customSubtitle = __('Update your video');
+      customSubtitle = __('Update your video/audio');
    } else {
-      customSubtitle = __('Upload that unlabeled video you found behind the TV in 1991');
+      customSubtitle = __('Upload that unlabeled video or cassette you found behind the TV in 1991');
    }
  }

@ -566,6 +566,7 @@ function PublishForm(props: Props) {
              <Button
                key={String(modeName)}
                icon={modeName}
+                iconSize={18}
                label={__(MODE_TO_I18N_STR[String(modeName)] || '---')}
                button="alt"
                onClick={() => {
--- a/ui/component/publishName/name-help-text.jsx
+++ b/ui/component/publishName/name-help-text.jsx
@ -13,7 +13,6 @@ type Props = {

 function NameHelpText(props: Props) {
  const { uri, myClaimForUri, onEditMyClaim, isStillEditing } = props;
-
  let nameHelpText;

  if (isStillEditing) {
--- a/ui/component/repostCreate/view.jsx
+++ b/ui/component/repostCreate/view.jsx
@ -20,20 +20,20 @@ import Spinner from 'component/spinner';
 type Props = {
  doToast: ({ message: string }) => void,
  doClearRepostError: () => void,
-  doRepost: StreamRepostOptions => Promise<*>,
+  doRepost: (StreamRepostOptions) => Promise<*>,
  title: string,
  claim?: StreamClaim,
  enteredContentClaim?: StreamClaim,
  balance: number,
  channels: ?Array<ChannelClaim>,
-  doCheckPublishNameAvailability: string => Promise<*>,
+  doCheckPublishNameAvailability: (string) => Promise<*>,
  error: ?string,
  reposting: boolean,
  uri: string,
  name: string,
  contentUri: string,
-  setRepostUri: string => void,
-  setContentUri: string => void,
+  setRepostUri: (string) => void,
+  setContentUri: (string) => void,
  doCheckPendingClaims: () => void,
  redirectUri?: string,
  passedRepostAmount: number,
@ -88,7 +88,7 @@ function RepostCreate(props: Props) {
  const repostUrlName = `lbry://${incognito || !activeChannelClaim ? '' : `${activeChannelClaim.name}/`}`;

  const contentFirstRender = React.useRef(true);
-  const setAutoRepostBid = amount => {
+  const setAutoRepostBid = (amount) => {
    if (balance && balance > 0.02) {
      if (uri) {
        setRepostBid(0.01);
@ -113,7 +113,7 @@ function RepostCreate(props: Props) {
    const isLbryUrl = value.startsWith('lbry://') && value !== 'lbry://';
    const error = '';

-    const addLbryIfNot = term => {
+    const addLbryIfNot = (term) => {
      return term.startsWith('lbry://') ? term : `lbry://${term}`;
    };
    if (wasCopiedFromWeb) {
@ -178,7 +178,7 @@ function RepostCreate(props: Props) {

  React.useEffect(() => {
    if (enteredRepostName && isNameValid(enteredRepostName, false)) {
-      doCheckPublishNameAvailability(enteredRepostName).then(r => setAvailable(r));
+      doCheckPublishNameAvailability(enteredRepostName).then((r) => setAvailable(r));
    }
  }, [enteredRepostName, doCheckPublishNameAvailability]);

@ -316,7 +316,7 @@ function RepostCreate(props: Props) {
          <div>
            {uri && (
              <fieldset-section>
-                <ClaimPreview key={uri} uri={uri} actions={''} type={'inline'} showNullPlaceholder />
+                <ClaimPreview key={uri} uri={uri} actions={''} showNullPlaceholder />
              </fieldset-section>
            )}
            {!uri && name && (
@ -327,7 +327,7 @@ function RepostCreate(props: Props) {
                  name="content_url"
                  value={enteredContent}
                  error={contentError}
-                  onChange={event => setEnteredContentUri(event.target.value)}
+                  onChange={(event) => setEnteredContentUri(event.target.value)}
                  placeholder={__('Enter a name or %domain% URL', { domain: SITE_URL })}
                />
              </>
@ -359,7 +359,7 @@ function RepostCreate(props: Props) {
                    type="text"
                    name="repost_name"
                    value={enteredRepostName}
-                    onChange={event => setEnteredRepostName(event.target.value)}
+                    onChange={(event) => setEnteredRepostName(event.target.value)}
                    placeholder={__('MyFunName')}
                  />
                </fieldset-group>
@ -384,8 +384,8 @@ function RepostCreate(props: Props) {
                  </>
                }
                disabled={!enteredRepostName || resolvingRepost}
-                onChange={event => setRepostBid(event.target.value)}
-                onWheel={e => e.stopPropagation()}
+                onChange={(event) => setRepostBid(event.target.value)}
+                onWheel={(e) => e.stopPropagation()}
              />
            </React.Fragment>

--- a/ui/component/selectThumbnail/view.jsx
+++ b/ui/component/selectThumbnail/view.jsx
@ -123,7 +123,7 @@ class SelectThumbnail extends React.PureComponent<Props> {
              <FileSelector
                currentPath={thumbnailPath}
                label={__('Thumbnail')}
-                placeholder={__('Choose a thumbnail')}
+                placeholder={__('Thumbnails that entice a viewer to watch a video work best')}
                accept={accept}
                onFileChosen={(file) => openModal(MODALS.CONFIRM_THUMBNAIL_UPLOAD, { file })}
              />
--- a/ui/component/sideNavigation/view.jsx
+++ b/ui/component/sideNavigation/view.jsx
@ -213,7 +213,7 @@ function SideNavigation(props: Props) {
    });
  }

-  const notificationsEnabled = user && user.experimental_ui;
+  const notificationsEnabled = SIMPLE_SITE || (user && user.experimental_ui);
  const isAuthenticated = Boolean(email);
  // SIDE LINKS: FOLLOWING, HOME, [FULL,] [EXTRA]
  let SIDE_LINKS: Array<SideNavLink> = [];
@ -313,6 +313,11 @@ function SideNavigation(props: Props) {
      <li className="navigation-link">
        <Button label={__('FAQ')} href="https://odysee.com/@OdyseeHelp:b" />
      </li>
+
+      <li className="navigation-link">
+        <Button label={__('Community Guidelines')} href="https://odysee.com/@OdyseeHelp:b/Community-Guidelines:c" />
+      </li>
+
      <li className="navigation-link">
        <Button label={__('Support --[used in footer; general help/support]--')} href="https://lbry.com/support" />
      </li>
--- a/ui/component/subscribeButton/index.js
+++ b/ui/component/subscribeButton/index.js
@ -7,7 +7,6 @@ import {
 } from 'redux/selectors/subscriptions';
 import { makeSelectPermanentUrlForUri } from 'lbry-redux';
 import { doToast } from 'redux/actions/notifications';
-import { selectUser } from 'redux/selectors/user';
 import SubscribeButton from './view';

 const select = (state, props) => ({
@ -15,7 +14,6 @@ const select = (state, props) => ({
  firstRunCompleted: selectFirstRunCompleted(state),
  permanentUrl: makeSelectPermanentUrlForUri(props.uri)(state),
  notificationsDisabled: makeSelectNotificationsDisabled(props.uri)(state),
-  user: selectUser(state),
 });

 export default connect(select, {
--- a/ui/component/subscribeButton/view.jsx
+++ b/ui/component/subscribeButton/view.jsx
@ -43,7 +43,6 @@ export default function SubscribeButton(props: Props) {
  const isMobile = useIsMobile();
  let isHovering = useHover(buttonRef);
  isHovering = isMobile ? true : isHovering;
-  const uiNotificationsEnabled = user && user.experimental_ui;

  const { channelName: rawChannelName } = parseURI(uri);
  const { channelName } = parseURI(permanentUrl);
@ -109,7 +108,7 @@ export default function SubscribeButton(props: Props) {
          }
        }}
      />
-      {isSubscribed && uiNotificationsEnabled && (
+      {isSubscribed && (
        <Button
          button="alt"
          icon={notificationsDisabled ? ICONS.BELL : ICONS.BELL_ON}
--- a/ui/component/userChannelFollowIntro/view.jsx
+++ b/ui/component/userChannelFollowIntro/view.jsx
@ -11,7 +11,6 @@ import { AUTO_FOLLOW_CHANNELS, SIMPLE_SITE } from 'config';
 type Props = {
  subscribedChannels: Array<Subscription>,
  onContinue: () => void,
-  onBack: () => void,
  channelSubscribe: (sub: Subscription) => void,
  homepageData: any,
  prefsReady: boolean,
@ -45,25 +44,25 @@ function UserChannelFollowIntro(props: Props) {
    <Card
      title={__('Find channels to follow')}
      subtitle={__(
-        'LBRY works better if you find and follow a couple creators you like. You can also block channels you never want to see.'
+        'Odysee works better if you find and follow a couple creators you like. You can also block channels you never want to see.'
      )}
      actions={
        <React.Fragment>
-          <div className="section__actions--between">
-            <Button button="secondary" onClick={onBack} label={__('Back')} />
-            <Button
-              button={subscribedChannels.length < 1 ? 'alt' : 'primary'}
-              onClick={onContinue}
-              label={subscribedChannels.length < 1 ? __('Skip') : __('Continue')}
-            />
-          </div>
          <div className="section__body">
            <ClaimListDiscover
-              defaultOrderBy={CS.ORDER_BY_TOP}
+              hideFilters
+              meta={
+                <Button
+                  button={subscribedChannels.length < 1 ? 'alt' : 'primary'}
+                  onClick={onContinue}
+                  label={subscribedChannels.length < 1 ? __('Skip') : __('Continue')}
+                />
+              }
+              defaultOrderBy={CS.ORDER_BY_TRENDING}
              defaultFreshness={CS.FRESH_ALL}
-              claimType="channel"
-              claimIds={SIMPLE_SITE ? undefined : PRIMARY_CONTENT_CHANNEL_IDS}
-              defaultTags={followingCount > 3 ? CS.TAGS_FOLLOWED : undefined}
+              claimIds={SIMPLE_SITE ? PRIMARY_CONTENT_CHANNEL_IDS : undefined}
+              claimType={CS.CLAIM_CHANNEL}
+              maxPages={3}
            />
            {followingCount > 0 && (
              <Nag
--- a/ui/component/userSignUp/view.jsx
+++ b/ui/component/userSignUp/view.jsx
@ -1,5 +1,4 @@
 // @flow
-import * as PAGES from 'constants/pages';
 import React from 'react';
 import classnames from 'classnames';
 import { useHistory } from 'react-router';
@ -7,7 +6,6 @@ import UserEmailNew from 'component/userEmailNew';
 import UserEmailVerify from 'component/userEmailVerify';
 import UserFirstChannel from 'component/userFirstChannel';
 import UserChannelFollowIntro from 'component/userChannelFollowIntro';
-import UserTagFollowIntro from 'component/userTagFollowIntro';
 import YoutubeSync from 'page/youtubeSync';
 import { DEFAULT_BID_FOR_FIRST_CHANNEL } from 'component/userFirstChannel/view';
 import { YOUTUBE_STATUSES } from 'lbryinc';
@ -42,7 +40,6 @@ type Props = {
  creatingChannel: boolean,
  setClientSetting: (string, boolean, ?boolean) => void,
  followingAcknowledged: boolean,
-  tagsAcknowledged: boolean,
  rewardsAcknowledged: boolean,
  interestedInYoutubeSync: boolean,
  doToggleInterestedInYoutubeSync: () => void,
@ -67,7 +64,6 @@ function UserSignUp(props: Props) {
    fetchingChannels,
    creatingChannel,
    followingAcknowledged,
-    tagsAcknowledged,
    rewardsAcknowledged,
    setClientSetting,
    interestedInYoutubeSync,
@ -118,8 +114,7 @@ function UserSignUp(props: Props) {
      interestedInYoutubeSync);
  const showYoutubeTransfer = hasVerifiedEmail && hasYoutubeChannels && !isYoutubeTransferComplete;
  const showFollowIntro = step === 'channels' || (hasVerifiedEmail && !followingAcknowledged);
-  const showTagsIntro = step === 'tags' || (hasVerifiedEmail && !tagsAcknowledged);
-  const canHijackSignInFlowWithSpinner = hasVerifiedEmail && !showFollowIntro && !showTagsIntro && !rewardsAcknowledged;
+  const canHijackSignInFlowWithSpinner = hasVerifiedEmail && !showFollowIntro && !rewardsAcknowledged;
  const isCurrentlyFetchingSomething = fetchingChannels || claimingReward || syncingWallet || creatingChannel;
  const isWaitingForSomethingToFinish =
    // If the user has claimed the email award, we need to wait until the balance updates sometime in the future
@ -206,22 +201,6 @@ function UserSignUp(props: Props) {
        }}
      />
    ),
-    showTagsIntro && (
-      <UserTagFollowIntro
-        onContinue={() => {
-          let url = `/$/${PAGES.AUTH}?reset_scroll=1&${STEP_PARAM}=channels`;
-          if (redirect) {
-            url += `&${REDIRECT_PARAM}=${redirect}`;
-          }
-          if (shouldRedirectImmediately) {
-            url += `&${REDIRECT_IMMEDIATELY_PARAM}=true`;
-          }
-
-          replace(url);
-          setSettingAndSync(SETTINGS.TAGS_ACKNOWLEDGED, true);
-        }}
-      />
-    ),
    showYoutubeTransfer && (
      <div>
        <YoutubeTransferStatus /> <Confetti recycle={false} style={{ position: 'fixed' }} />
--- a/ui/component/userVerify/view.jsx
+++ b/ui/component/userVerify/view.jsx
@ -12,7 +12,7 @@ import LbcSymbol from 'component/common/lbc-symbol';
 type Props = {
  errorMessage: ?string,
  isPending: boolean,
-  verifyUserIdentity: string => void,
+  verifyUserIdentity: (string) => void,
  verifyPhone: () => void,
  fetchUser: () => void,
  skipLink?: string,
@ -60,7 +60,7 @@ class UserVerify extends React.PureComponent<Props> {
                SITE_NAME,
              }}
            >
-              Verified accounts are eligible to earn LBRY Credits for views, watching and reposting content, sharing
+              Verified accounts are eligible to earn LBRY Credits for views, watching and reposting videos, sharing
              invite links etc. Verifying also helps us keep the %SITE_NAME% community safe too! %Refresh% or %Skip%.
            </I18nMessage>
          </p>
@ -73,9 +73,7 @@ class UserVerify extends React.PureComponent<Props> {
          <Card
            icon={ICONS.PHONE}
            title={__('Verify phone number')}
-            subtitle={__(
-              'You will receive an SMS text message confirming your phone number is valid. Does not work for Canada and possibly other regions.'
-            )}
+            subtitle={__('You will receive an SMS text message confirming your phone number is valid.')}
            actions={
              <Fragment>
                <Button
--- a/ui/component/viewers/videoViewer/internal/videojs.jsx
+++ b/ui/component/viewers/videoViewer/internal/videojs.jsx
@ -52,14 +52,14 @@ type Props = {
  adUrl: ?string,
 };

-type VideoJSOptions = {
-  controls: boolean,
-  preload: string,
-  playbackRates: Array<number>,
-  responsive: boolean,
-  poster?: string,
-  muted?: boolean,
-};
+// type VideoJSOptions = {
+//   controls: boolean,
+//   preload: string,
+//   playbackRates: Array<number>,
+//   responsive: boolean,
+//   poster: ?string,
+//   muted: ?boolean,
+// };

 const videoPlaybackRates = [0.25, 0.5, 0.75, 1, 1.1, 1.25, 1.5, 1.75, 2];

@ -68,7 +68,7 @@ const IS_IOS =
    (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1)) &&
  !window.MSStream;

-const VIDEO_JS_OPTIONS: VideoJSOptions = {
+const VIDEO_JS_OPTIONS = {
  preload: 'auto',
  playbackRates: videoPlaybackRates,
  responsive: true,
--- a/ui/component/viewers/videoViewer/view.jsx
+++ b/ui/component/viewers/videoViewer/view.jsx
@ -114,12 +114,12 @@ function VideoViewer(props: Props) {
  const {
    location: { pathname },
  } = useHistory();
+  const previousUri = usePrevious(uri);
+  const embedded = useContext(EmbedContext);
  const [isPlaying, setIsPlaying] = useState(false);
  const [showAutoplayCountdown, setShowAutoplayCountdown] = useState(false);
  const [isEndededEmbed, setIsEndededEmbed] = useState(false);
  const vjsCallbackDataRef: any = React.useRef();
-  const previousUri = usePrevious(uri);
-  const embedded = useContext(EmbedContext);
  const approvedVideo = Boolean(channelClaimId) && adApprovedChannelIds.includes(channelClaimId);
  const adsEnabled = ENABLE_PREROLL_ADS && !authenticated && !embedded && approvedVideo;
  const [adUrl, setAdUrl, isFetchingAd] = useGetAds(approvedVideo, adsEnabled);
--- a/ui/component/webUploadList/view.jsx
+++ b/ui/component/webUploadList/view.jsx
@ -21,7 +21,9 @@ export default function WebUploadList(props: Props) {
    !!uploadCount && (
      <Card
        title={__('Currently uploading')}
-        subtitle={uploadCount > 1 ? __('You files are currently uploading.') : __('Your file is currently uploading.')}
+        subtitle={
+          uploadCount > 1 ? __('You videos are currently uploading.') : __('Your video is currently uploading.')
+        }
        body={
          <section>
            {/* $FlowFixMe */}
--- a/ui/component/youtubeTransferStatus/view.jsx
+++ b/ui/component/youtubeTransferStatus/view.jsx
@ -118,9 +118,7 @@ export default function YoutubeTransferStatus(props: Props) {
            {isNotElligible && (
              <I18nMessage
                tokens={{
-                  here: (
-                    <Button button="link" href="https://lbry.com/faq/youtube" label={__('here')} />
-                    ),
+                  here: <Button button="link" href="https://lbry.com/faq/youtube" label={__('here')} />,
                  email: SITE_HELP_EMAIL,
                }}
              >
--- a/ui/constants/form-field.js
+++ b/ui/constants/form-field.js
@ -1,6 +1,6 @@
 export const FF_MAX_CHARS_DEFAULT = 2000;
 export const FF_MAX_CHARS_IN_COMMENT = 2000;
-export const FF_MAX_CHARS_IN_LIVESTREAM_COMMENT = 500;
+export const FF_MAX_CHARS_IN_LIVESTREAM_COMMENT = 300;
 export const FF_MAX_CHARS_IN_DESCRIPTION = 5000;
 export const FF_MAX_CHARS_REPORT_CONTENT_DETAILS = 500;
 export const FF_MAX_CHARS_REPORT_CONTENT_ADDRESS = 255;
--- a/ui/modal/modalPublish/view.jsx
+++ b/ui/modal/modalPublish/view.jsx
@ -44,8 +44,9 @@ class ModalPublishSuccess extends React.PureComponent<Props> {
        'Your livestream is now pending. You will be able to start shortly at the streaming dashboard.'
      );
    } else {
-      publishMessage = __('Your file is now pending on LBRY. It will take a few minutes to appear for other users.');
+      publishMessage = __('Your video will appear on Odysee shortly.');
    }
+    clearPublish();

    function handleClose() {
      closeModal();
@ -54,7 +55,7 @@ class ModalPublishSuccess extends React.PureComponent<Props> {
    return (
      <Modal isOpen type="card" contentLabel={__(contentLabel)} onAborted={handleClose}>
        <Card
-          title={__('Success')}
+          title={livestream ? __('Livestream Created') : __('Upload Complete')}
          subtitle={publishMessage}
          body={
            <React.Fragment>
--- a/ui/modal/modalPublishPreview/index.js
+++ b/ui/modal/modalPublishPreview/index.js
@ -8,6 +8,7 @@ import {
  selectMyChannelClaims,
  makeSelectClaimIsStreamPlaceholder,
  SETTINGS,
+  doClearPublish,
 } from 'lbry-redux';
 import { selectFfmpegStatus, makeSelectClientSetting } from 'redux/selectors/settings';
 import { doPublishDesktop } from 'redux/actions/publish';
@ -32,6 +33,7 @@ const select = (state, props) => {

 const perform = (dispatch) => ({
  publish: (filePath, preview) => dispatch(doPublishDesktop(filePath, preview)),
+  clearPublish: () => dispatch(doClearPublish()),
  closeModal: () => dispatch(doHideModal()),
  setEnablePublishPreview: (value) => dispatch(doSetClientSetting(SETTINGS.ENABLE_PUBLISH_PREVIEW, value)),
 });
--- a/ui/modal/modalRemoveFile/view.jsx
+++ b/ui/modal/modalRemoveFile/view.jsx
@ -52,10 +52,8 @@ function ModalRemoveFile(props: Props) {
                <FormField
                  name="claim_abandon"
                  label={
-                    <I18nMessage
-                      tokens={{ lbc: <LbcSymbol prefix={__('reclaim %amount%', { amount: claim.amount })} /> }}
-                    >
-                      Abandon on blockchain (%lbc%)
+                    <I18nMessage tokens={{ lbc: <LbcSymbol postfix={claim.amount} /> }}>
+                      Abandon on blockchain (reclaim %lbc%)
                    </I18nMessage>
                  }
                  type="checkbox"
--- a/ui/modal/modalTransactionFailed/view.jsx
+++ b/ui/modal/modalTransactionFailed/view.jsx
@ -12,7 +12,7 @@ class ModalTransactionFailed extends React.PureComponent<Props> {

    return (
      <Modal isOpen contentLabel={__('Transaction failed')} title={__('Transaction failed')} onConfirmed={closeModal}>
-        <p>{__('Sorry about that. Contact help@lbry.com if you continue to have issues.')}</p>
+        <p>{__('Sorry about that. Contact help@odysee.com if you continue to have issues.')}</p>
      </Modal>
    );
  }
--- a/ui/modal/modalYoutubeWelcome/view.jsx
+++ b/ui/modal/modalYoutubeWelcome/view.jsx
@ -1,4 +1,5 @@
 // @flow
+import { SIMPLE_SITE } from 'config';
 import * as PAGES from 'constants/pages';
 import React from 'react';
 import { Modal } from 'modal/modal';
@ -15,18 +16,27 @@ const YoutubeWelcome = (props: Props) => {
    <Modal isOpen type="card" onAborted={doHideModal}>
      <Confetti recycle={false} style={{ position: 'fixed' }} numberOfPieces={100} />
      <Card
-        title={__("You're free!")}
+        title={!SIMPLE_SITE ? __("You're free!") : __('Welcome to Odysee')}
        subtitle={
-          <React.Fragment>
-            <p>
-              {__("You've escaped the land of spying, censorship, and exploitation.")}
-              <span className="emoji"> 💩</span>
-            </p>
-            <p>
-              {__('Welcome to the land of content freedom.')}
-              <span className="emoji"> 🌈</span>
-            </p>
-          </React.Fragment>
+          !SIMPLE_SITE ? (
+            <React.Fragment>
+              <p>
+                {__("You've escaped the land of spying, censorship, and exploitation.")}
+                <span className="emoji"> 💩</span>
+              </p>
+              <p>
+                {__('Welcome to the land of content freedom.')}
+                <span className="emoji"> 🌈</span>
+              </p>
+            </React.Fragment>
+          ) : (
+            <React.Fragment>
+              <p>
+                {__('You make the party extra special!')}
+                <span className="emoji"> 💖</span>
+              </p>
+            </React.Fragment>
+          )
        }
        actions={
          <div className="card__actions">
--- a/ui/page/adsTest/index.js
+++ b/ui/page/adsTest/index.js
@ -0,0 +1,12 @@
+import { connect } from 'react-redux';
+import { makeSelectClaimForUri, doResolveUri } from 'lbry-redux';
+import AdsTestPage from './view';
+
+export default connect(
+  (state) => ({
+    claim: makeSelectClaimForUri('lbry://fullscreenrelease#7')(state),
+  }),
+  {
+    doResolveUri,
+  }
+)(AdsTestPage);
--- a/ui/page/adsTest/view.jsx
+++ b/ui/page/adsTest/view.jsx
@ -0,0 +1,20 @@
+// @flow
+// import React from 'react';
+// import FilePage from 'page/file';
+
+type Props = {
+  doResolveUri: (string) => void,
+  claim: ?StreamClaim,
+};
+
+export default function AdsTestPage(props: Props) {
+  return null;
+  //   const { doResolveUri, claim } = props;
+  //   const hasClaim = claim !== undefined;
+  //   React.useEffect(() => {
+  //     if (!hasClaim) {
+  //       doResolveUri('lbry://fullscreenrelease#7');
+  //     }
+  //   }, [hasClaim, doResolveUri]);
+  //   return <div>{hasClaim && <FilePage uri="lbry://fullscreenrelease#7" />}</div>;
+}
--- a/ui/page/buy/view.jsx
+++ b/ui/page/buy/view.jsx
@ -22,6 +22,7 @@ const MOONPAY_KEY = process.env.MOONPAY_SECRET_KEY;
 const COUNTRIES = Array.from(
  new Set(
    countryData.all
+      .filter((country) => country.status !== 'deleted')
      .map((country) => country.name)
      .sort((a, b) => {
        if (a > b) {
--- a/ui/page/channel/view.jsx
+++ b/ui/page/channel/view.jsx
@ -318,6 +318,14 @@ function ChannelPage(props: Props) {
                empty={<section className="main--empty">{__('No Reposts Found')}</section>}
              />
            </TabPanel>
+            <TabPanel>
+              <ChannelContent
+                claimType={'repost'}
+                uri={uri}
+                channelIsBlackListed={channelIsBlackListed}
+                viewHiddenChannels
+              />
+            </TabPanel>
            <TabPanel>
              <ChannelAbout uri={uri} />
            </TabPanel>
--- a/ui/page/channelsFollowingDiscover/view.jsx
+++ b/ui/page/channelsFollowingDiscover/view.jsx
@ -1,13 +1,12 @@
 // @flow
-import * as ICONS from 'constants/icons';
-import * as PAGES from 'constants/pages';
+// import * as ICONS from 'constants/icons';
+// import * as PAGES from 'constants/pages';
+import * as CS from 'constants/claim_search';
 import React from 'react';
 import Page from 'component/page';
-import Button from 'component/button';
-import ClaimTilesDiscover from 'component/claimTilesDiscover';
+// import Button from 'component/button';
 import ClaimListDiscover from 'component/claimListDiscover';
-import * as CS from 'constants/claim_search';
-import { toCapitalCase } from 'util/string';
+// import { toCapitalCase } from 'util/string';
 import { SIMPLE_SITE } from 'config';

 const MORE_CHANNELS_ANCHOR = 'MoreChannels';
@ -19,89 +18,87 @@ type Props = {
  homepageData: any,
 };

-type ChannelsFollowingItem = {
-  title: string,
-  link?: string,
-  help?: any,
-  options?: {},
-};
-
 function ChannelsFollowingDiscover(props: Props) {
-  const { followedTags, subscribedChannels, blockedChannels, homepageData } = props;
+  const {
+    //   followedTags,
+    // subscribedChannels,
+    // blockedChannels,
+    homepageData,
+  } = props;
  const { PRIMARY_CONTENT_CHANNEL_IDS } = homepageData;
-  let rowData: Array<ChannelsFollowingItem> = [];
-  const notChannels = subscribedChannels
-    .map(({ uri }) => uri)
-    .concat(blockedChannels)
-    .map(uri => uri.split('#')[1]);
+  //   let rowData: Array<ChannelsFollowingItem> = [];
+  //   const notChannels = subscribedChannels
+  //     .map(({ uri }) => uri)
+  //     .concat(blockedChannels)
+  //     .map(uri => uri.split('#')[1]);

-  rowData.push({
-    title: 'Top Channels Of All Time',
-    link: `/$/${PAGES.DISCOVER}?claim_type=channel&${CS.ORDER_BY_KEY}=${CS.ORDER_BY_TOP}&${CS.FRESH_KEY}=${CS.FRESH_ALL}`,
-    options: {
-      pageSize: 12,
-      claimType: 'channel',
-      orderBy: ['effective_amount'],
-    },
-  });
+  //   rowData.push({
+  //     title: 'Top Channels Of All Time',
+  //     link: `/$/${PAGES.DISCOVER}?claim_type=channel&${CS.ORDER_BY_KEY}=${CS.ORDER_BY_TOP}&${CS.FRESH_KEY}=${CS.FRESH_ALL}`,
+  //     options: {
+  //       pageSize: 12,
+  //       claimType: 'channel',
+  //       orderBy: ['effective_amount'],
+  //     },
+  //   });

-  rowData.push({
-    title: 'Latest From @lbrycast',
-    link: `/@lbrycast:4`,
-    options: {
-      orderBy: ['release_time'],
-      pageSize: 8,
-      channelIds: ['4c29f8b013adea4d5cca1861fb2161d5089613ea'],
-    },
-  });
+  //   rowData.push({
+  //     title: 'Latest From @lbrycast',
+  //     link: `/@lbrycast:4`,
+  //     options: {
+  //       orderBy: ['release_time'],
+  //       pageSize: 8,
+  //       channelIds: ['4c29f8b013adea4d5cca1861fb2161d5089613ea'],
+  //     },
+  //   });

-  rowData.push({
-    title: 'Trending Channels',
-    link: `/$/${PAGES.DISCOVER}?claim_type=channel`,
-    options: {
-      pageSize: 8,
-      claimType: 'channel',
-      orderBy: ['trending_group', 'trending_mixed'],
-    },
-  });
+  //   rowData.push({
+  //     title: 'Trending Channels',
+  //     link: `/$/${PAGES.DISCOVER}?claim_type=channel`,
+  //     options: {
+  //       pageSize: 8,
+  //       claimType: 'channel',
+  //       orderBy: ['trending_group', 'trending_mixed'],
+  //     },
+  //   });

-  if (followedTags.length > 0 && followedTags.length < 5) {
-    const followedRows = followedTags.map((tag: Tag) => ({
-      title: `Trending Channels for #${toCapitalCase(tag.name)}`,
-      link: `/$/${PAGES.DISCOVER}?t=${tag.name}&claim_type=channel`,
-      options: {
-        claimType: 'channel',
-        pageSize: 4,
-        tags: [tag.name],
-      },
-    }));
-    rowData.push(...followedRows);
-  }
+  //   if (followedTags.length > 0 && followedTags.length < 5) {
+  //     const followedRows = followedTags.map((tag: Tag) => ({
+  //       title: `Trending Channels for #${toCapitalCase(tag.name)}`,
+  //       link: `/$/${PAGES.DISCOVER}?t=${tag.name}&claim_type=channel`,
+  //       options: {
+  //         claimType: 'channel',
+  //         pageSize: 4,
+  //         tags: [tag.name],
+  //       },
+  //     }));
+  //     rowData.push(...followedRows);
+  //   }

-  if (followedTags.length > 4) {
-    rowData.push({
-      title: 'Trending For Your Tags',
-      link: `/$/${PAGES.TAGS_FOLLOWING}?claim_type=channel`,
-      options: {
-        claimType: 'channel',
-        tags: followedTags.map(tag => tag.name),
-      },
-    });
-  }
+  //   if (followedTags.length > 4) {
+  //     rowData.push({
+  //       title: 'Trending For Your Tags',
+  //       link: `/$/${PAGES.TAGS_FOLLOWING}?claim_type=channel`,
+  //       options: {
+  //         claimType: 'channel',
+  //         tags: followedTags.map(tag => tag.name),
+  //       },
+  //     });
+  //   }

-  const rowDataWithGenericOptions = rowData.map(row => {
-    return {
-      ...row,
-      options: {
-        ...row.options,
-        notChannels,
-      },
-    };
-  });
+  //   const rowDataWithGenericOptions = rowData.map(row => {
+  //     return {
+  //       ...row,
+  //       options: {
+  //         ...row.options,
+  //         notChannels,
+  //       },
+  //     };
+  //   });

  return (
    <Page>
-      {rowDataWithGenericOptions.map(({ title, link, help, options = {} }) => (
+      {/* {rowDataWithGenericOptions.map(({ title, link, help, options = {} }) => (
        <div key={title} className="claim-grid__wrapper">
          <h1 className="section__actions">
            {link ? (
@ -120,17 +117,17 @@ function ChannelsFollowingDiscover(props: Props) {

          <ClaimTilesDiscover {...options} />
        </div>
-      ))}
-      <h1 id={MORE_CHANNELS_ANCHOR} className="claim-grid__title">
-        {__('More Channels')}
-      </h1>
-      {/* odysee: claimIds = PRIMARY_CONTENT_CHANNEL_IDS if simplesite CLD */}
+      ))} */}
+
      <ClaimListDiscover
        defaultOrderBy={CS.ORDER_BY_TRENDING}
        defaultFreshness={CS.FRESH_ALL}
        claimType={CS.CLAIM_CHANNEL}
        claimIds={SIMPLE_SITE ? PRIMARY_CONTENT_CHANNEL_IDS : undefined}
        scrollAnchor={MORE_CHANNELS_ANCHOR}
+        maxPages={3}
+        hideFilters
+        header={<h1 className="section__title">{__('Moon cheese is an acquired taste')}</h1>}
      />
    </Page>
  );
--- a/ui/page/discover/view.jsx
+++ b/ui/page/discover/view.jsx
@ -2,6 +2,7 @@
 import { SHOW_ADS, DOMAIN, SIMPLE_SITE } from 'config';
 import * as ICONS from 'constants/icons';
 import * as PAGES from 'constants/pages';
+import * as CS from 'constants/claim_search';
 import React, { useRef } from 'react';
 import Page from 'component/page';
 import ClaimListDiscover from 'component/claimListDiscover';
@ -11,11 +12,11 @@ import { useIsMobile } from 'effects/use-screensize';
 import analytics from 'analytics';
 import HiddenNsfw from 'component/common/hidden-nsfw';
 import Icon from 'component/common/icon';
-import * as CS from 'constants/claim_search';
 import Ads from 'web/component/ads';
 import LbcSymbol from 'component/common/lbc-symbol';
 import I18nMessage from 'component/i18nMessage';
 import useGetLivestreams from 'effects/use-get-livestreams';
+import moment from 'moment';

 type Props = {
  location: { search: string },
@ -97,8 +98,8 @@ function DiscoverPage(props: Props) {
  } else {
    headerLabel = (
      <span>
-        <Icon icon={(dynamicRouteProps && dynamicRouteProps.icon) || ICONS.DISCOVER} size={10} />
-        {(dynamicRouteProps && dynamicRouteProps.title) || __('All Content')}
+        <Icon icon={(dynamicRouteProps && dynamicRouteProps.icon) || ICONS.WILD_WEST} size={10} />
+        {(dynamicRouteProps && dynamicRouteProps.title) || __('Wild West')}
      </span>
    );
  }
@ -106,9 +107,11 @@ function DiscoverPage(props: Props) {
  return (
    <Page noFooter fullWidthPage={tileLayout}>
      <ClaimListDiscover
-        limitClaimsPerChannel={3}
+        hideAdvancedFilter
+        hideFilters={!dynamicRouteProps}
        header={repostedUri ? <span /> : undefined}
        tileLayout={repostedUri ? false : tileLayout}
+        defaultOrderBy={dynamicRouteProps ? undefined : CS.ORDER_BY_TRENDING}
        claimType={claimType ? [claimType] : undefined}
        headerLabel={headerLabel}
        tags={tags}
@ -117,9 +120,18 @@ function DiscoverPage(props: Props) {
        injectedItem={
          SHOW_ADS && IS_WEB ? (SIMPLE_SITE ? false : !isAuthenticated && <Ads small type={'video'} />) : false
        }
+        // Assume wild west page if no dynamicRouteProps
+        // Not a very good solution, but just doing it for now
+        // until we are sure this page will stay around
+        releaseTime={!dynamicRouteProps && `>${Math.floor(moment().subtract(1, 'day').startOf('week').unix())}`}
+        feeAmount={!dynamicRouteProps && CS.FEE_AMOUNT_ANY}
        channelIds={
          (dynamicRouteProps && dynamicRouteProps.options && dynamicRouteProps.options.channelIds) || undefined
        }
+        limitClaimsPerChannel={
+          (dynamicRouteProps && dynamicRouteProps.options && dynamicRouteProps.options.limitClaimsPerChannel) ||
+          undefined
+        }
        meta={
          !dynamicRouteProps ? (
            <a
--- a/ui/page/file/view.jsx
+++ b/ui/page/file/view.jsx
@ -1,4 +1,5 @@
 // @flow
+import * as PAGES from 'constants/pages';
 import * as React from 'react';
 import classnames from 'classnames';
 import Page from 'component/page';
@ -11,6 +12,9 @@ import RecommendedContent from 'component/recommendedContent';
 import CollectionContent from 'component/collectionContentSidebar';
 import CommentsList from 'component/commentsList';
 import PostViewer from 'component/postViewer';
+import { Redirect } from 'react-router';
+import Button from 'component/button';
+import I18nMessage from 'component/i18nMessage';
 import Empty from 'component/common/empty';

 export const PRIMARY_PLAYER_WRAPPER_CLASS = 'file-page__video-container';
@ -30,7 +34,9 @@ type Props = {
  collection?: Collection,
  collectionId: string,
  videoTheaterMode: boolean,
+  claimIsMine: boolean,
  commentsDisabled: boolean,
+  isLivestream: boolean,
 };

 function FilePage(props: Props) {
@ -47,9 +53,12 @@ function FilePage(props: Props) {
    linkedComment,
    setPrimaryUri,
    videoTheaterMode,
+
+    claimIsMine,
    commentsDisabled,
    collection,
    collectionId,
+    isLivestream,
  } = props;
  const cost = costInfo ? costInfo.cost : null;
  const hasFileInfo = fileInfo !== undefined;
@ -118,6 +127,10 @@ function FilePage(props: Props) {
    );
  }

+  if (!claimIsMine && isLivestream) {
+    return <Redirect to={`/$/${PAGES.LIVESTREAM}`} />;
+  }
+
  if (obscureNsfw && isMature) {
    return (
      <Page className="file-page" filePage isMarkdown={isMarkdown}>
@ -138,6 +151,18 @@ function FilePage(props: Props) {
        {!isMarkdown && (
          <div className="file-page__secondary-content">
            <div>
+              {claimIsMine && isLivestream && (
+                <div className="livestream__creator-message">
+                  <h4>{__('Only visible to you')}</h4>
+                  <I18nMessage>
+                    People who view this link will be redirected to your livestream. Make sure to use this for sharing
+                    so your title and thumbnail are displayed properly.
+                  </I18nMessage>
+                  <div className="section__actions">
+                    <Button button="primary" navigate={`/$/${PAGES.LIVESTREAM}`} label={__('View livestream')} />
+                  </div>
+                </div>
+              )}
              {RENDER_MODES.FLOATING_MODES.includes(renderMode) && <FileTitleSection uri={uri} />}
              {commentsDisabled && <Empty text={__('The creator of this content has disabled comments.')} />}
              {!commentsDisabled && <CommentsList uri={uri} linkedComment={linkedComment} />}
--- a/ui/page/home/view.jsx
+++ b/ui/page/home/view.jsx
@ -81,6 +81,13 @@ function HomePage(props: Props) {
          </p>
        </div>
      )}
+
+      <h1 className="home__meme">
+        <Button button="link" href="https://odysee.com/@Odysee:8?view=discussion">
+          {__("just like the simulations")}
+        </Button>
+      </h1>
+
      {rowData.map(({ title, route, link, icon, help, options = {} }, index) => (
        <div key={title} className="claim-grid__wrapper">
          {index !== 0 && title && typeof title === 'string' && (
@ -93,7 +100,13 @@ function HomePage(props: Props) {
            </h1>
          )}

-          <ClaimTilesDiscover {...options} liveLivestreamsFirst livestreamMap={livestreamMap} hasSource />
+          <ClaimTilesDiscover
+            {...options}
+            liveLivestreamsFirst
+            livestreamMap={livestreamMap}
+            hasSource
+            pin={route === `/$/${PAGES.GENERAL}`}
+          />
          {(route || link) && (
            <Button
              className="claim-grid__title--secondary"
--- a/ui/page/search/index.js
+++ b/ui/page/search/index.js
@ -14,12 +14,12 @@ import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import SearchPage from './view';

 const select = (state, props) => {
-  const showMature = selectShowMatureContent(state);
  const urlParams = new URLSearchParams(props.location.search);
  let urlQuery = urlParams.get('q') || null;
  if (urlQuery) {
    urlQuery = urlQuery.replace(/^lbry:\/\//i, '').replace(/\//, ' ');
  }
+  const showMature = selectShowMatureContent(state);
  const query = makeSelectQueryWithOptions(
    urlQuery,
    SIMPLE_SITE
--- a/ui/page/settings/view.jsx
+++ b/ui/page/settings/view.jsx
@ -1,6 +1,6 @@
 // @flow
 import * as PAGES from 'constants/pages';
-import * as MODALS from 'constants/modal_types';
+// import * as MODALS from 'constants/modal_types';
 import * as ICONS from 'constants/icons';
 import * as React from 'react';
 import { SETTINGS } from 'lbry-redux';
@ -17,7 +17,7 @@ import classnames from 'classnames';
 import { getPasswordFromCookie } from 'util/saved-passwords';
 // $FlowFixMe
 import homepages from 'homepages';
-import { Lbryio } from 'lbryinc';
+// import { Lbryio } from 'lbryinc';
 import Yrbl from 'component/yrbl';

 type Price = {
@ -170,7 +170,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
    const {
      daemonSettings,
      allowAnalytics,
-      showNsfw,
+      //   showNsfw,
      isAuthenticated,
      currentTheme,
      themes,
@ -183,12 +183,12 @@ class SettingsPage extends React.PureComponent<Props, State> {
      setClientSetting,
      toggle3PAnalytics,
      floatingPlayer,
-      hideReposts,
+      //   hideReposts,
      clearPlayingUri,
      darkModeTimes,
      clearCache,
-      openModal,
      myChannelUrls,
+      //   openModal,
    } = this.props;
    const { storedPassword } = this.state;
    const noDaemonSettings = !daemonSettings || Object.keys(daemonSettings).length === 0;
@ -358,7 +358,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
                    )}
                  />

-                  <FormField
+                  {/* <FormField
                    type="checkbox"
                    name="hide_reposts"
                    onChange={(e) => {
@ -372,7 +372,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
                    checked={hideReposts}
                    label={__('Hide reposts')}
                    helper={__('You will not see reposts by people you follow or receive email notifying about them.')}
-                  />
+                  /> */}

                  {/* <FormField
                    type="checkbox"
@ -383,7 +383,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
                    helper={__('Anonymous content is published without a channel.')}
                  /> */}

-                  <FormField
+                  {/* <FormField
                    type="checkbox"
                    name="show_nsfw"
                    onChange={() =>
@ -396,7 +396,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
                    helper={__(
                      'Mature content may include nudity, intense sexuality, profanity, or other adult content. By displaying mature content, you are affirming you are of legal age to view mature content in your country or jurisdiction.  '
                    )}
-                  />
+                  /> */}
                </React.Fragment>
              }
            />
--- a/ui/page/show/view.jsx
+++ b/ui/page/show/view.jsx
@ -30,6 +30,7 @@ type Props = {
  claimIsMine: boolean,
  claimIsPending: boolean,
  isLivestream: boolean,
+  claimIsMine: Boolean,
  beginPublish: (string) => void,
  collectionId: string,
  collection: Collection,
--- a/ui/redux/actions/search.js
+++ b/ui/redux/actions/search.js
@ -1,5 +1,6 @@
 // @flow
 import * as ACTIONS from 'constants/action_types';
+import { SEARCH_OPTIONS } from 'constants/search';
 import { buildURI, doResolveUris, batchActions, isURIValid, makeSelectClaimForUri } from 'lbry-redux';
 import {
  makeSelectSearchUris,
@ -135,6 +136,10 @@ export const doFetchRecommendedContent = (uri: string, mature: boolean) => (disp
    if (!mature) {
      options['nsfw'] = false;
    }
+
+    options[SEARCH_OPTIONS.CLAIM_TYPE] = SEARCH_OPTIONS.INCLUDE_FILES;
+    options[SEARCH_OPTIONS.MEDIA_VIDEO] = true;
+
    const { title } = claim.value;
    if (title && options) {
      dispatch(doSearch(title, options));
--- a/ui/redux/reducers/search.js
+++ b/ui/redux/reducers/search.js
@ -11,9 +11,9 @@ const defaultState: SearchState = {
    [SEARCH_OPTIONS.CLAIM_TYPE]: SEARCH_OPTIONS.INCLUDE_FILES_AND_CHANNELS,
    [SEARCH_OPTIONS.MEDIA_AUDIO]: true,
    [SEARCH_OPTIONS.MEDIA_VIDEO]: true,
-    [SEARCH_OPTIONS.MEDIA_TEXT]: true,
-    [SEARCH_OPTIONS.MEDIA_IMAGE]: true,
-    [SEARCH_OPTIONS.MEDIA_APPLICATION]: true,
+    [SEARCH_OPTIONS.MEDIA_TEXT]: false,
+    [SEARCH_OPTIONS.MEDIA_IMAGE]: false,
+    [SEARCH_OPTIONS.MEDIA_APPLICATION]: false,
  },
  urisByQuery: {},
  hasReachedMaxResultsLength: {},
--- a/ui/redux/reducers/settings.js
+++ b/ui/redux/reducers/settings.js
@ -8,7 +8,7 @@ import { UNSYNCED_SETTINGS } from 'config';
 const { CLIENT_SYNC_KEYS } = SHARED_PREFERENCES;
 const settingsToIgnore = (UNSYNCED_SETTINGS && UNSYNCED_SETTINGS.trim().split(' ')) || [];
 const clientSyncKeys = settingsToIgnore.length
-  ? CLIENT_SYNC_KEYS.filter(k => !settingsToIgnore.includes(k))
+  ? CLIENT_SYNC_KEYS.filter((k) => !settingsToIgnore.includes(k))
  : CLIENT_SYNC_KEYS;

 const reducers = {};
@ -70,7 +70,7 @@ const defaultState = {
    [SETTINGS.AUTOPLAY_NEXT]: true,
    [SETTINGS.FLOATING_PLAYER]: true,
    [SETTINGS.AUTO_DOWNLOAD]: true,
-    [SETTINGS.HIDE_REPOSTS]: false,
+    [SETTINGS.HIDE_REPOSTS]: true,

    // OS
    [SETTINGS.AUTO_LAUNCH]: true,
@ -89,12 +89,12 @@ reducers[ACTIONS.REHYDRATE] = (state, action) => {
  return Object.assign({}, state, { clientSettings });
 };

-reducers[ACTIONS.FINDING_FFMPEG_STARTED] = state =>
+reducers[ACTIONS.FINDING_FFMPEG_STARTED] = (state) =>
  Object.assign({}, state, {
    findingFFmpeg: true,
  });

-reducers[ACTIONS.FINDING_FFMPEG_COMPLETED] = state =>
+reducers[ACTIONS.FINDING_FFMPEG_COMPLETED] = (state) =>
  Object.assign({}, state, {
    findingFFmpeg: false,
  });
@ -120,7 +120,7 @@ reducers[ACTIONS.CLIENT_SETTING_CHANGED] = (state, action) => {
  });
 };

-reducers[ACTIONS.UPDATE_IS_NIGHT] = state => {
+reducers[ACTIONS.UPDATE_IS_NIGHT] = (state) => {
  const { from, to } = state.clientSettings[SETTINGS.DARK_MODE_TIMES];
  const momentNow = moment();
  const startNightMoment = moment(from.formattedTime, 'HH:mm');
@ -155,7 +155,7 @@ reducers[LBRY_REDUX_ACTIONS.SHARED_PREFERENCE_SET] = (state, action) => {
  });
 };

-reducers[ACTIONS.SYNC_CLIENT_SETTINGS] = state => {
+reducers[ACTIONS.SYNC_CLIENT_SETTINGS] = (state) => {
  const { clientSettings } = state;
  const sharedPreferences = Object.assign({}, state.sharedPreferences);
  const selectedClientSettings = getSubsetFromKeysArray(clientSettings, clientSyncKeys);
--- a/ui/scss/component/_button.scss
+++ b/ui/scss/component/_button.scss
@ -620,6 +620,12 @@ svg + .button__label {
    border-top-left-radius: 0;
    border-bottom-left-radius: 0;
  }
+
+  .button--file-action {
+    &:first-child {
+      margin-right: var(--spacing-s);
+    }
+  }
 }

 .button--file-action {
--- a/ui/scss/component/_file-render.scss
+++ b/ui/scss/component/_file-render.scss
@ -211,13 +211,28 @@
 }

 .file-viewer__overlay-logo {
-  color: var(--color-white);
-  font-weight: bold;
+  height: 3.5rem;
+  width: 12rem;
+  display: flex;
+  align-items: center;

-  .icon {
-    height: 30px;
-    stroke-width: 5px;
+  &:hover {
+    filter: drop-shadow(1px 2px 10px var(--color-gray-3));
  }
+
+  @media (max-width: $breakpoint-small) {
+    margin-right: var(--spacing-m);
+    width: 2.5rem;
+
+    .button__label {
+      display: none;
+    }
+  }
+}
+
+.file-viewer__overlay-logo--videoend {
+  height: 3.5rem;
+  width: 12rem;
 }

 .file-viewer--is-playing:not(:hover) .file-viewer__embedded-header {
@ -227,11 +242,15 @@
 .file-viewer__embedded-header {
  position: absolute;
  display: flex;
+  align-items: center;
  justify-content: space-between;
  width: 100%;
  top: 0;
  opacity: 1;
  z-index: 2;
+  height: 4rem;
+  padding-left: var(--spacing-m);
+  padding-right: var(--spacing-s);
  font-size: var(--font-large);
  overflow-x: hidden;
  overflow-y: hidden;
@ -241,7 +260,6 @@
  border-top-right-radius: var(--border-radius);

  .button {
-    padding: var(--spacing-s);
    color: var(--color-white);
    z-index: 2;

--- a/ui/scss/component/_form-field.scss
+++ b/ui/scss/component/_form-field.scss
@ -203,7 +203,7 @@ input-submit {
    height: var(--height-checkbox);
    width: var(--height-checkbox);
    border: 1px solid var(--color-input-border);
-    border-radius: var(--border-radius);
+    border-radius: 3px;
    left: 0px;
    top: -1px;
  }
--- a/ui/scss/component/_header.scss
+++ b/ui/scss/component/_header.scss
@ -58,7 +58,6 @@
  justify-content: center;
  align-items: center;
  border-radius: var(--border-radius);
-  color: var(--color-text);
  position: relative;
  font-weight: var(--font-weight-bold);

--- a/ui/scss/component/_livestream.scss
+++ b/ui/scss/component/_livestream.scss
@ -281,8 +281,8 @@ $discussion-header__height: 3rem;
 }

 .livestream-superchat__banner {
-  border-top-right-radius: var(--border-radius);
-  border-bottom-right-radius: var(--border-radius);
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
  padding: 0.25rem var(--spacing-s);
  display: inline-block;
  position: relative;
@ -298,7 +298,7 @@ $discussion-header__height: 3rem;
  background-color: var(--color-superchat);
  bottom: 0;
  left: 0;
-  transform: translateX(25%) translateY(50%);
+  transform: translateX(0) translateY(50%);

  &::after {
    content: '';
@ -316,6 +316,11 @@ $discussion-header__height: 3rem;
 .livestream-comment__text {
  padding-right: var(--spacing-xxs);
  padding-bottom: var(--spacing-xxs);
+  .markdown-preview {
+    p {
+      word-break: break-all;
+    }
+  }
 }

 .livestream-superchat__tooltip-amount {
--- a/ui/scss/component/_navigation.scss
+++ b/ui/scss/component/_navigation.scss
@ -39,6 +39,10 @@
      overflow-y: auto;
    }
  }
+
+  @media (min-width: $breakpoint-small) {
+    justify-content: space-between;
+  }
 }

 .navigation--mac {
--- a/ui/scss/component/section.scss
+++ b/ui/scss/component/section.scss
@ -58,7 +58,7 @@

 .section__title {
  text-align: left;
-  font-size: var(--font-title);
+  font-size: var(--font-large);
  font-weight: var(--font-weight-light);
 }

--- a/ui/scss/init/_color.scss
+++ b/ui/scss/init/_color.scss
@ -1,57 +0,0 @@
-:root {
-  // Generic colors
-  --color-primary: #257761;
-  --color-primary-alt: #e4f4ef;
-  --color-primary-alt-2: #4b8576;
-  --color-secondary: #295284;
-  --color-secondary-alt: #d9eaff;
-  --color-tertiary: #552470;
-  --color-tertiary-alt: #f7e8ff;
-  --color-danger: #9b2023;
-  --color-danger-alt: #fccdce;
-  --color-warning: #fff58c;
-  --color-cost: #ffd580;
-  --color-focus: #93cff2;
-  --color-notification: #f02849;
-  --color-live: #cc190f;
-
-  --color-black: #111;
-  --color-white: #fdfdfd;
-  --color-white-alt: #fafafa;
-  --color-gray-1: #eff1f4;
-  --color-gray-2: #d8dde1;
-  --color-gray-3: #ced4da;
-  --color-gray-4: #abb1b7;
-  --color-gray-5: #666a6d;
-
-  // Text
-  --color-text: var(--color-black);
-  --color-text-subtitle: var(--color-gray-5);
-  --color-text-inverse: #fdfdfd;
-
-  // Components
-
-  // Button
-  --color-button-primary-bg: var(--color-primary);
-  --color-button-primary-text: var(--color-primary-alt);
-  --color-button-primary-bg-hover: var(--color-primary-alt-2);
-  --color-button-primary-hover-text: var(--color-primary-alt);
-  --color-button-secondary-bg: var(--color-secondary-alt);
-  --color-button-secondary-border: var(--color-secondary-alt);
-  --color-button-secondary-text: var(--color-secondary);
-  --color-button-secondary-bg-hover: #b9d0e9;
-  --color-button-alt-bg: var(--color-gray-1);
-  --color-button-alt-text: var(--color-text);
-  --color-button-alt-bg-hover: var(--color-gray-2);
-  --color-link: var(--color-primary);
-  --color-link-hover: var(--color-black);
-
-  // Table
-  --color-table-highlight: var(--color-white-alt);
-
-  // Tag
-  --color-tag: var(--color-gray-5);
-  --color-tag-bg: var(--color-button-alt-bg);
-  --color-tag-hover: var(--color-button-alt-text);
-  --color-tag-bg-hover: var(--color-button-alt-bg-hover);
-}
--- a/ui/scss/init/_gui.scss
+++ b/ui/scss/init/_gui.scss
@ -60,8 +60,12 @@ ol {
    position: relative;
    list-style-position: outside;
    margin: var(--spacing-xs) 0;
-    margin-left: var(--spacing-xl);
+    margin-left: var(--spacing-s);
    margin-bottom: 0;
+
+    @media (min-width: $breakpoint-small) {
+      margin-left: var(--spacing-xl);
+    }
  }
 }

@ -267,10 +271,10 @@ textarea {
  margin-top: var(--spacing-s);

  &:not(:last-child) {
-    margin-bottom: var(--spacing-s);
+    margin-bottom: var(--spacing-m);
  }

-  .button--link ~ .button--link {
+  .button--link + .button--link {
    margin-left: var(--spacing-s);
  }

@ -499,3 +503,16 @@ textarea {
    height: 4rem;
  }
 }
+
+.home__meme {
+  text-align: center;
+  font-weight: bold;
+  line-height: 1;
+  font-size: 1rem;
+  margin-bottom: var(--spacing-m);
+
+  @media (min-width: $breakpoint-small) {
+    font-size: 1.2rem;
+    margin-bottom: var(--spacing-l);
+  }
+}
--- a/ui/scss/init/_vars.scss
+++ b/ui/scss/init/_vars.scss
@ -9,7 +9,7 @@ $breakpoint-medium: 1150px;
 $breakpoint-large: 1600px;

 :root {
-  --border-radius: 5px;
+  --border-radius: 10px;
  --height-input: 2.5rem;
  --height-button: 2.5rem;
  --height-checkbox: 24px;
--- a/ui/scss/themes/dark.scss
+++ b/ui/scss/themes/dark.scss
@ -1,30 +1,29 @@
 [theme='dark'] {
  // Color overrides
-  --color-primary: #2bbb90;
-  --color-primary-alt: #3e675d;
-  --color-primary-alt-2: #065f46;
-  --color-primary-alt-3: #34e5b0;
-  --color-secondary: #204166;
-  --color-secondary-alt: #dbeafe;
-  --color-secondary-alt-2: #bfdbfe;
-  --color-secondary-alt-3: #2c5c8c;
+  --color-primary: #e50054;
+  --color-primary-alt: #66001880;
+  --color-fire: #ff6635;
+  --color-fire-outside: #ff9b20;

  // Structure
-  --color-background: var(--color-gray-9);
-  --color-background-overlay: #21252999;
-  --color-border: #333338;
-  --color-card-background: var(--color-gray-8);
-  --color-card-background-highlighted: var(--color-gray-7);
+  --color-background: #140e1b;
+  --color-background-overlay: #0c0d0e95;
+  --color-border: #30243d;
+  --color-card-background: #181021;
+  --color-card-background-highlighted: #241c30;

  // Text
-  --color-text: var(--color-white);
+  --color-text: var(--color-gray-1);
  --color-text-subtitle: var(--color-gray-4);
  --color-text-empty: var(--color-text-subtitle);
  --color-text-help: #bbbbbb;
  --color-text-warning: #212529;
  --color-text-warning--background: var(--lbry-yellow-1);
-  --color-text-error: #f87171;
-  --color-error: #61373f;
+  --color-text-error: var(--color-danger);
+  --color-error: var(--color-danger-alt);
+  --color-blockquote: var(--color-gray-5);
+  --color-blockquote-bg: var(--color-card-background-highlighted);
+  --color-help-warning-text: var(--color-white-alt);

  // Tags (words)
  --color-tag-words: var(--color-text);
@ -33,87 +32,73 @@
  --color-tag-words-bg-hover: var(--color-gray-4);

  // Header
-  --color-header-background: var(--color-gray-8);
-  --color-header-button: var(--color-gray-6);
-  --color-header-button-hover: var(--color-gray-6);
-  --color-header-button-active: var(--color-gray-6);
+  --color-header-button: #38274c;
+  --color-header-background: #231830;

  // Button
-  --color-button-primary-bg: var(--color-primary-alt);
-  --color-button-primary-bg-hover: var(--color-primary-alt-2);
-  --color-button-primary-text: var(--color-gray-2);
+  --color-button-primary-text: white;
  --color-button-primary-hover-text: var(--color-primary-alt);
-  --color-button-secondary-bg: var(--color-secondary);
-  --color-button-secondary-border: var(--color-secondary);
-  --color-button-secondary-bg-hover: var(--color-secondary-alt-3);
-  --color-button-secondary-text: var(--color-gray-2);
-  --color-button-alt-bg: var(--color-gray-7);
-  --color-button-alt-bg-hover: var(--color-gray-6);
-  --color-button-alt-text: var(--color-gray-1);
-  --color-button-border: var(--color-gray-5);
-  --color-button-toggle-text: var(--color-gray-1);
-  --color-link: var(--color-primary-alt-3);
-  --color-link-hover: var(--color-text);
-  --color-link-focus-bg: var(--color-gray-7);
+  --color-button-secondary-bg: #2c1543;
+  --color-button-secondary-border: #4f1c82;
+  --color-button-secondary-bg-hover: #3b1c5b;
+  --color-button-secondary-text: #efefef;
+  --color-button-alt-bg: var(--color-header-button);
+  --color-button-alt-bg-hover: #2b2037;
+  --color-button-toggle-text: var(--color-text);
+  --color-button-toggle-bg: var(--color-primary-alt);
+  --color-button-toggle-bg-hover: var(--color-primary-alt);
+  --color-button-alt-text: #e2e9f0;
+  --color-button-border: #5b4475;
+  --color-link: var(--color-primary);
+  --color-link-hover: #d75673;
+  --color-link-active: #ec1d4c;
+  --color-link-focus-bg: #3d2d4e;

  // Input
-  --color-input: var(--color-white);
-  --color-input-label: var(--color-gray-3);
-  --color-input-placeholder: var(--color-gray-1);
+  --color-input: #f4f4f5;
+  --color-input-label: #a7a7a7;
+  --color-input-placeholder: #f4f4f5;
  --color-input-bg: var(--color-header-button);
-  --color-input-bg-copyable: var(--color-gray-6);
+  --color-input-bg-copyable: #4c3861;
  --color-input-border: var(--color-border);
  --color-input-border-active: var(--color-secondary);
  --color-input-toggle: var(--color-primary-alt-3);
  --color-input-toggle-bg: var(--color-input-bg);
  --color-input-toggle-bg-hover: var(--color-secondary);
  --color-input-bg-selected: var(--color-primary-alt);
-  --color-input-prefix-bg: var(--color-gray-5);
+  --color-input-prefix-bg: var(--color-input-bg-copyable);
  --color-input-prefix-border: var(--color-gray-4);
  --select-toggle-background: url("data:image/svg+xml,%3Csvg viewBox='0 0 96 96' xmlns='http://www.w3.org/2000/svg' fill='%23ffffff'%3E%3Cpath d='M17.172, 31.172c1.562, -1.562 4.095, -1.562 5.656, 0l25.172, 25.171l25.172, -25.171c1.562, -1.562 4.095, -1.562 5.656, 0c1.562, 1.562 1.562, 4.095 0, 5.656l-28, 28c-1.562, 1.562 -4.095, 1.562 -5.656, 0l-28, -28c-0.781, -0.781 -1.172, -1.805 -1.172, -2.828c0, -1.023 0.391, -2.047 1.172, -2.828Z'/%3E%3C/svg%3E%0A");

  // Navigation
-  --color-navigation-icon: var(--color-gray-4);
-  --color-navigation-link: var(--color-gray-4);
-  --color-navigation-active: var(--color-gray-7);
-  --color-navigation-active-text: var(--color-gray-3);
-  --color-navigation-hover: var(--color-gray-6);
-  --color-navigation-hover-text: var(--color-gray-3);
+  --color-navigation-icon: #76808a;
+  --color-navigation-link: #b9c3ce;
+  --color-navigation-active: #2b2037;
+  --color-navigation-active-text: #c6bcd2;
+  --color-navigation-hover: #21182a;
+  --color-navigation-hover-text: #c6bcd2;

  // Tags
-  --color-tag: var(--color-primary-alt-3);
-  --color-tag-bg: var(--color-gray-7);
+  --color-tag: #ff85b1;
+  --color-tag-bg: var(--color-navigation-hover);
  --color-tag-hover: var(--color-white);
-  --color-tag-bg-hover: var(--color-primary-alt);
+  --color-tag-bg-hover: var(--color-primary-alt-2);
+  --color-tag-mature-bg: var(--color-primary-alt-2);

  // Menu
  --color-menu-background: var(--color-header-background);
-  --color-menu-background--active: var(--color-gray-7);
-  --color-menu-icon: var(--color-gray-4);
+  --color-menu-background--active: var(--color-primary-alt);
+  --color-menu-icon: #928b9b;
+  --color-menu-icon-active: #d6d6d6;

  // Comments
-  --color-comment-menu: var(--color-gray-5);
-  --color-comment-menu-hovering: var(--color-gray-2);
-  --color-comment-threadline: #434b54;
-  --color-comment-threadline-hover: var(--color-gray-4);
+  --color-comment-menu: #6a6a6a;
+  --color-comment-menu-hovering: #e0e0e0;
  --color-comment-highlighted: #484734;
-
-  // Snack
-  --color-snack-bg: var(--color-secondary);
-
-  // Superchat
-  --color-superchat-text: var(--color-black);
-  --color-superchat-text__light: var(--color-text);
-  --color-superchat: #fcd34d;
-  --color-superchat__light: #ef4e1647;
-  --color-superchat-2: #fde68a;
-  --color-superchat-3: #fef3c7;
-  --color-superchat-3__light: #58066087;
-  --color-superchat-4: #fffbeb;
+  --color-comment-threadline: #24192f;
+  --color-comment-threadline-hover: var(--color-gray-4);

  // Other
-  --color-focus: #93c5fd50;
-  --color-nag: var(--color-orange);
  --color-tab-text: var(--color-white);
  --color-tabs-background: var(--color-card-background);
  --color-tab-divider: var(--color-white);
@ -121,14 +106,12 @@
  --color-notice: #58563b;
  --color-purchased: #ffd580;
  --color-purchased-alt: var(--color-purchased);
-  --color-purchased-text: var(--color-gray-5);
+  --color-purchased-text: black;
  --color-thumbnail-background: var(--color-gray-5);
  --color-tooltip-bg: #2f3337;
-  --color-help-warning-bg: #d97706;
-  --color-help-warning-text: white;
-  --color-blockquote: var(--color-gray-5);
-  --color-placeholder-background: #4e5862;
-  --color-spinner-light: #5a6570;
+  --color-focus: #e91e6329;
+  --color-placeholder-background: #261a35;
+  --color-spinner-light: white;
  --color-spinner-dark: #212529;
  --color-login-graphic-background: var(--color-background);

--- a/ui/scss/themes/light.scss
+++ b/ui/scss/themes/light.scss
@ -1,2 +1,155 @@
 :root {
+  // Color overrides
+  --color-primary: #fa6165;
+  --color-primary-alt: #fef1f6;
+  --color-primary-alt-2: #fb7e82;
+  --color-primary-alt-3: #fbcbdd;
+  --color-secondary: #f9902a;
+  --color-secondary-alt: #fee8d2;
+  --color-secondary-alt-2: #fefcf6;
+
+  // Structure
+  --color-border: #ededed;
+  --color-background: #fafafa;
+  --color-background-overlay: #21252980;
+  --color-card-background: #ffffff;
+  --color-card-background-highlighted: #fff5f5;
+
+  // Text
+  --color-text-selection-bg: var(--color-primary-alt);
+  --color-text-selection: var(--color-primary);
+  --color-text-error: var(--color-danger);
+  --color-text-empty: #999999;
+  --color-text-help: #999999;
+  --color-text-subtitle: #767676;
+  --color-text-warning: #212529;
+  --color-help-warning-bg: #fef3c7;
+  --color-text-warning--background: var(--lbry-yellow-1);
+  --color-blockquote: var(--color-gray-3);
+  --color-blockquote-bg: var(--color-gray-1);
+  --color-tooltip-bg: #222;
+  --color-tooltip-text: #fafafa;
+
+  // Header
+  --color-header-button: var(--color-button-alt-bg);
+  --color-header-background: #ffffff;
+
+  // Button
+  --color-button-alt-bg: var(--color-gray-1);
+  --color-button-alt-bg-hover: var(--color-gray-2);
+  --color-button-alt-text: black;
+  --color-button-primary-bg: var(--color-primary);
+  --color-button-primary-bg-hover: var(--color-primary-alt-2);
+  --color-button-primary-text: var(--color-primary-alt);
+  --color-button-primary-hover-text: var(--color-white);
+  --color-button-secondary-bg: var(--color-primary-alt);
+  --color-button-secondary-border: var(--color-primary-alt-3);
+  --color-button-secondary-text: var(--color-primary);
+  --color-button-secondary-bg-hover: var(--color-primary-alt-3);
+  --color-button-toggle-text: var(--color-primary);
+  --color-button-toggle-bg: var(--color-primary-alt);
+  --color-button-toggle-bg-hover: var(--color-primary-alt);
+  --color-button-border: var(--color-gray-3);
+  --color-link-active: var(--color-primary);
+  --color-link-focus-bg: #f1f1f1;
+  --color-link: var(--color-primary);
+
+  // Input
+  --color-input-bg-selected: var(--color-primary-alt);
+  --color-input-color: #111111;
+  --color-input-label: var(--color-gray-5);
+  --color-input-placeholder: #212529;
+  --color-input-bg: var(--color-gray-1);
+  --color-input-border: var(--color-border);
+  --color-input-border-active: var(--color-secondary);
+  --color-input-toggle: var(--color-secondary);
+  --color-input-toggle-bg: var(--color-gray-1);
+  --color-input-toggle-bg-hover: var(--color-secondary-alt);
+  --color-input-prefix-bg: var(--color-gray-2);
+  --color-input-prefix-border: var(--color-gray-5);
+  --select-toggle-background: url("data:image/svg+xml,%3Csvg viewBox='0 0 96 96' xmlns='http://www.w3.org/2000/svg' fill='%23212529'%3E%3Cpath d='M17.172, 31.172c1.562, -1.562 4.095, -1.562 5.656, 0l25.172, 25.171l25.172, -25.171c1.562, -1.562 4.095, -1.562 5.656, 0c1.562, 1.562 1.562, 4.095 0, 5.656l-28, 28c-1.562, 1.562 -4.095, 1.562 -5.656, 0l-28, -28c-0.781, -0.781 -1.172, -1.805 -1.172, -2.828c0, -1.023 0.391, -2.047 1.172, -2.828Z'/%3E%3C/svg%3E%0A");
+
+  // Navigation
+  --color-navigation-icon: var(--color-gray-5);
+  --color-navigation-link: var(--color-gray-5);
+  --color-navigation-active: var(--color-primary-alt);
+  --color-navigation-active-text: var(--color-primary);
+  --color-navigation-hover: var(--color-gray-1);
+  --color-navigation-hover-text: #3f3f3f;
+
+  // Tags
+  --color-tag: var(--color-primary-alt-2);
+  --color-tag-bg: #f9f6f7;
+  --color-tag-hover: var(--color-button-alt-text);
+  --color-tag-bg-hover: var(--color-button-alt-bg-hover);
+
+  // Menu
+  --color-menu-background: var(--color-header-background);
+  --color-menu-icon: var(--color-navigation-link);
+  --color-menu-icon-active: var(--color-navigation-link);
+  --color-menu-background--selected: var(--color-secondary-alt);
+  --color-menu-background--active: var(--color-primary-alt);
+
+  // Comments
+  --color-comment-menu: #e0e0e0;
+  --color-comment-menu-hovering: #6a6a6a;
+  --color-comment-highlighted: #fff2d9;
+  --color-comment-threadline: var(--color-gray-1);
+  --color-comment-threadline-hover: var(--color-gray-4);
+
+  // Superchat
+  --color-superchat-text: var(--color-black);
+  --color-superchat: #fcd34d;
+  --color-superchat__light: #fcd34d50;
+  --color-superchat-2: #fde68a;
+  --color-superchat-3: #fef3c7;
+  --color-superchat-3__light: #fef3c750;
+  --color-superchat-4: #fffbeb;
+
+  // Color
+  --color-focus: #8dbff0;
+  --color-nag: #fa8700;
+  --color-error: #fcafca;
+  --color-notice: #fef3ca;
+  --color-purchased: var(--color-cost);
+  --color-purchased-alt: #ffebc2;
+  --color-purchased-text: black;
+  --color-thumbnail-background: var(--color-gray-1);
+  --color-spinner-light: #ffffff;
+  --color-spinner-dark: #212529;
+  --color-placeholder-background: #f0f0f0;
+  --color-file-viewer-background: var(--color-card-background);
+  --color-tabs-background: var(--color-card-background);
+  --color-tab-divider: var(--color-primary);
+  --color-modal-background: var(--color-card-background);
+
+  // Icons
+  --color-follow-bg: #ffd4da;
+  --color-follow-icon: #e2495e;
+  --color-view-bg: var(--color-secondary-alt);
+  --color-view-icon: var(--color-secondary);
+
+  // Editor
+  --color-editor-cursor: var(--color-text);
+  --color-editor-quote: #707070;
+  --color-editor-tag: #ea9400;
+  --color-editor-attr: #04b0f4;
+  --color-editor-string: #ff7451;
+  --color-editor-inline-code-fg: var(--color-text);
+  --color-editor-inline-code-fg-preview: #2e3439;
+  --color-editor-inline-code-bg: rgba(157, 161, 165, 0.3);
+  --color-editor-inline-code-bg-preview: #d0e8ff;
+  --color-editor-selected: #add6ff;
+  --color-editor-link: var(--color-link);
+  --color-editor-url: var(--color-editor-string);
+  --color-editor-hr: var(--color-editor-tag);
+  --color-editor-hr-preview: #cccccc;
+
+  // Ads
+  --color-ads-background: #fae5ff;
+  --color-ads-link: var(--color-link);
+
+  // Scrollbar
+  --color-scrollbar-thumb-bg: rgba(0, 0, 0, 0.2);
+  --color-scrollbar-track-bg: transparent;
 }
--- a/ui/util/query-params.js
+++ b/ui/util/query-params.js
@ -38,9 +38,13 @@ export const getSearchQueryString = (query: string, options: any = {}) => {
  const encodedQuery = encodeURIComponent(query);
  const queryParams = [
    options.exact && !isSurroundedByQuotes(encodedQuery) ? `s="${encodedQuery}"` : `s=${encodedQuery}`,
+    `free_only=true`,
    `size=${options.size || DEFAULT_SEARCH_SIZE}`,
    `from=${options.from || DEFAULT_SEARCH_RESULT_FROM}`,
+    // `mediaType=${SEARCH_OPTIONS.MEDIA_VIDEO}`,
+    // `claimType=${SEARCH_OPTIONS.INCLUDE_FILES}`,
  ];
+
  const { isBackgroundSearch } = options;
  const includeUserOptions = typeof isBackgroundSearch === 'undefined' ? false : !isBackgroundSearch;

--- a/web/component/fileViewerEmbeddedEnded/view.jsx
+++ b/web/component/fileViewerEmbeddedEnded/view.jsx
@ -4,7 +4,7 @@ import Button from 'component/button';
 import { formatLbryUrlForWeb } from 'util/url';
 import { withRouter } from 'react-router';
 import { URL, SITE_NAME } from 'config';
-import * as ICONS from 'constants/icons';
+import OdyseeLogoWithText from 'component/header/odysee_white.png';

 type Props = {
  uri: string,
@ -37,7 +37,9 @@ function FileViewerEmbeddedEnded(props: Props) {
  return (
    <div className="file-viewer__overlay">
      <div className="file-viewer__overlay-secondary">
-        <Button className="file-viewer__overlay-logo" label="LBRY" icon={ICONS.LBRY} href={URL} />
+        <Button className="file-viewer__overlay-logo--videoend" href={URL}>
+          <img src={OdyseeLogoWithText} />
+        </Button>
      </div>
      <div className="file-viewer__overlay-title">{prompt}</div>
      <div className="file-viewer__overlay-actions">