diff --git a/app/javascript/mastodon/features/circles/index.jsx b/app/javascript/mastodon/features/circles/index.jsx
index 8984793e94..6b3726fb20 100644
--- a/app/javascript/mastodon/features/circles/index.jsx
+++ b/app/javascript/mastodon/features/circles/index.jsx
@@ -107,7 +107,7 @@ class Circles extends ImmutablePureComponent {
         >
           {circles.map(circle =>
             (<div key={circle.get('id')} className='circle-item'>
-              <ColumnLink to={`#`} data-id={circle.get('id')} onClick={this.handleEditClick} icon='user-circle' text={circle.get('title')} />,
+              <ColumnLink to={`#`} data-id={circle.get('id')} onClick={this.handleEditClick} icon='user-circle' text={circle.get('title')} />
               <IconButton icon='trash' data_id={circle.get('id')} onClick={this.handleRemoveClick} />
             </div>)
           )}
diff --git a/app/javascript/mastodon/features/compose/containers/warning_container.jsx b/app/javascript/mastodon/features/compose/containers/warning_container.jsx
index 2cc827fd7a..cfa8e8ab7d 100644
--- a/app/javascript/mastodon/features/compose/containers/warning_container.jsx
+++ b/app/javascript/mastodon/features/compose/containers/warning_container.jsx
@@ -11,7 +11,7 @@ import Warning from '../components/warning';
 
 const mapStateToProps = state => ({
   needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
-  hashtagWarning: ['public', 'public_unlisted', 'login'].includes(state.getIn(['compose', 'privacy'])) && state.getIn(['compose', 'searchability']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
+  hashtagWarning: !['public', 'public_unlisted', 'login'].includes(state.getIn(['compose', 'privacy'])) && state.getIn(['compose', 'searchability']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
   directMessageWarning: state.getIn(['compose', 'privacy']) === 'direct',
   searchabilityWarning: state.getIn(['compose', 'searchability']) === 'limited',
   limitedPostWarning: ['mutual', 'circle'].includes(state.getIn(['compose', 'privacy'])),
diff --git a/app/javascript/styles/full-dark/diff.scss b/app/javascript/styles/full-dark/diff.scss
index 1f97184eeb..ed889fefb1 100644
--- a/app/javascript/styles/full-dark/diff.scss
+++ b/app/javascript/styles/full-dark/diff.scss
@@ -2,8 +2,40 @@ input,
 textarea {
   background: $ui-base-color !important;
   color: $primary-text-color !important;
+
+  &::placeholder {
+    color: lighten($dark-text-color, 36%) !important;
+  }
 }
 
 .emoji-mart-category-label {
   color: $lighter-text-color !important;
 }
+
+.compose-form .compose-form__warning {
+  color: $ui-base-color;
+}
+
+.column-content-select__control,
+.column-content-select__menu {
+  background: $ui-base-color !important;
+}
+
+.column-content-select__single-value {
+  color: $classic-secondary-color !important;
+}
+
+.modal-root__modal {
+  background: lighten($classic-base-color, 12%);
+}
+
+.boost-modal__action-bar,
+.confirmation-modal__action-bar,
+.mute-modal__action-bar,
+.block-modal__action-bar {
+  background: lighten($classic-base-color, 2%);
+}
+
+.searchability-dropdown__value-overlay {
+  color: #ff9bf8 !important;
+}
diff --git a/app/javascript/styles/full-dark/variables.scss b/app/javascript/styles/full-dark/variables.scss
index 18cc10344a..4e00d8a745 100644
--- a/app/javascript/styles/full-dark/variables.scss
+++ b/app/javascript/styles/full-dark/variables.scss
@@ -40,7 +40,7 @@ $error-value-color: $error-red !default;
 $ui-base-color: $classic-base-color !default; // Darkest
 $ui-base-lighter-color: #969fbc !default; // Lighter darkest
 $ui-primary-color: $classic-primary-color !default; // Lighter
-$ui-secondary-color: lighten($classic-base-color, 12%) !default; // Lightest
+$ui-secondary-color: $classic-secondary-color !default; // Lightest
 $ui-highlight-color: $classic-highlight-color !default;
 $ui-button-color: $white !default;
 $ui-button-background-color: $blurple-500 !default;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 495e14793d..d9cc99a0e4 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7533,7 +7533,7 @@ noscript {
     line-height: 40px;
     margin: 16px 0;
     background: lighten($ui-base-color, 4%);
-    color: $secondary-text-color;
+    color: $darker-text-color;
     border: 0;
 
     &__active {
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index 747b2a1a45..e429fb7e3c 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -128,6 +128,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
       :kmyblue_visibility_login,
       :status_reference,
       :visibility_mutual,
+      :visibility_limited,
       :kmyblue_limited_scope,
       :kmyblue_antenna,
     ]