diff --git a/patches/glitch/hide-contact-email.patch b/patches/glitch/hide-contact-email.patch
index 14e372c..6fec62c 100644
--- a/patches/glitch/hide-contact-email.patch
+++ b/patches/glitch/hide-contact-email.patch
@@ -3,7 +3,7 @@ index 57f295ea9..0992ba767 100644
 --- a/app/javascript/flavours/glitch/features/about/index.js
 +++ b/app/javascript/flavours/glitch/features/about/index.js
 @@ -127,14 +127,6 @@ class About extends React.PureComponent {
-
+ 
                <Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
              </div>
 -
@@ -15,5 +15,5 @@ index 57f295ea9..0992ba767 100644
 -              {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={`mailto:${server.getIn(['contact', 'email'])}`}>{server.getIn(['contact', 'email'])}</a>}
 -            </div>
            </div>
-
+ 
            <Section open title={intl.formatMessage(messages.title)}>
diff --git a/patches/glitch/hide-rules.patch b/patches/glitch/hide-rules.patch
index aed6c10..08a0495 100644
--- a/patches/glitch/hide-rules.patch
+++ b/patches/glitch/hide-rules.patch
@@ -3,7 +3,7 @@ index 57f295ea9..e27a30292 100644
 --- a/app/javascript/flavours/glitch/features/about/index.js
 +++ b/app/javascript/flavours/glitch/features/about/index.js
 @@ -15,7 +15,6 @@ import Image from 'flavours/glitch/components/image';
-
+ 
  const messages = defineMessages({
    title: { id: 'column.about', defaultMessage: 'About' },
 -  rules: { id: 'about.rules', defaultMessage: 'Server rules' },
@@ -13,7 +13,7 @@ index 57f295ea9..e27a30292 100644
 @@ -158,20 +157,6 @@ class About extends React.PureComponent {
              ))}
            </Section>
-
+ 
 -          <Section title={intl.formatMessage(messages.rules)}>
 -            {!isLoading && (server.get('rules').isEmpty() ? (
 -              <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
diff --git a/patches/glitch/hide-signup.patch b/patches/glitch/hide-signup.patch
index 6639b45..da17383 100644
--- a/patches/glitch/hide-signup.patch
+++ b/patches/glitch/hide-signup.patch
@@ -8,7 +8,7 @@ index b71c041c9..b9bb32341 100644
              <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
 -            {signupButton}
            </div>
-
+ 
            <div className='interaction-modal__choices__choice'>
 diff --git a/app/javascript/flavours/glitch/features/ui/components/header.js b/app/javascript/flavours/glitch/features/ui/components/header.js
 index d9ad94961..9a1f31531 100644
diff --git a/patches/glitch/system-font.patch b/patches/glitch/system-font.patch
index 5ec102a..6df7ad5 100644
--- a/patches/glitch/system-font.patch
+++ b/patches/glitch/system-font.patch
@@ -5,7 +5,7 @@ index a00b2936f..340294d73 100644
 @@ -18,21 +18,6 @@ body {
    -webkit-tap-highlight-color: rgba(0,0,0,0);
    -webkit-tap-highlight-color: transparent;
-
+ 
 -  &.system-font {
 -    // system-ui => standard property (Chrome/Android WebView 56+, Opera 43+, Safari 11+)
 -    // -apple-system => Safari <11 specific
@@ -23,7 +23,20 @@ index a00b2936f..340294d73 100644
 -
    &.app-body {
      padding: 0;
-
+ 
+diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss
+index 8ba8bec10..e5db3303f 100644
+--- a/app/javascript/flavours/glitch/styles/components/modal.scss
++++ b/app/javascript/flavours/glitch/styles/components/modal.scss
+@@ -1131,7 +1131,7 @@
+       width: 100%;
+       border: 0;
+       padding: 10px;
+-      font-family: 'mastodon-font-monospace', monospace;
++      font-family: $font-monospace, monospace;
+       background: $ui-base-color;
+       color: $primary-text-color;
+       font-size: 14px;
 diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss
 index fbb02c788..3946684ed 100644
 --- a/app/javascript/flavours/glitch/styles/index.scss
@@ -33,7 +46,7 @@ index fbb02c788..3946684ed 100644
  @import 'variables';
 -@import 'styles/fonts/roboto';
 -@import 'styles/fonts/roboto-mono';
-
+ 
  @import 'reset';
  @import 'basics';
 diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
@@ -41,15 +54,15 @@ index b865b5a2d..dc1130708 100644
 --- a/app/javascript/flavours/glitch/styles/variables.scss
 +++ b/app/javascript/flavours/glitch/styles/variables.scss
 @@ -53,9 +53,9 @@ $media-modal-media-max-height: 80%;
-
+ 
  $no-gap-breakpoint: 1175px;
-
+ 
 -$font-sans-serif: 'mastodon-font-sans-serif' !default;
 -$font-display: 'mastodon-font-display' !default;
 -$font-monospace: 'mastodon-font-monospace' !default;
 +$font-sans-serif: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue" !default;
 +$font-display: $font-sans-serif !default;
 +$font-monospace: ui-monospace, Menlo, Monaco, "Cascadia Mono", "Segoe UI Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New" !default;
-
+ 
  // Avatar border size (8% default, 100% for rounded avatars)
  $ui-avatar-border-size: 8%;
diff --git a/patches/hide-contact-email.patch b/patches/hide-contact-email.patch
index 3048a1a..d5c8d49 100644
--- a/patches/hide-contact-email.patch
+++ b/patches/hide-contact-email.patch
@@ -3,7 +3,7 @@ index e59f73738..0cb11216e 100644
 --- a/app/javascript/mastodon/features/about/index.js
 +++ b/app/javascript/mastodon/features/about/index.js
 @@ -127,14 +127,6 @@ class About extends React.PureComponent {
-
+ 
                <Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
              </div>
 -
@@ -15,5 +15,5 @@ index e59f73738..0cb11216e 100644
 -              {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={`mailto:${server.getIn(['contact', 'email'])}`}>{server.getIn(['contact', 'email'])}</a>}
 -            </div>
            </div>
-
+ 
            <Section open title={intl.formatMessage(messages.title)}>
diff --git a/patches/hide-rules.patch b/patches/hide-rules.patch
index f73d8a8..0745e5b 100644
--- a/patches/hide-rules.patch
+++ b/patches/hide-rules.patch
@@ -3,7 +3,7 @@ index e59f73738..3468ad19e 100644
 --- a/app/javascript/mastodon/features/about/index.js
 +++ b/app/javascript/mastodon/features/about/index.js
 @@ -15,7 +15,6 @@ import Image from 'mastodon/components/image';
-
+ 
  const messages = defineMessages({
    title: { id: 'column.about', defaultMessage: 'About' },
 -  rules: { id: 'about.rules', defaultMessage: 'Server rules' },
@@ -13,7 +13,7 @@ index e59f73738..3468ad19e 100644
 @@ -158,20 +157,6 @@ class About extends React.PureComponent {
              ))}
            </Section>
-
+ 
 -          <Section title={intl.formatMessage(messages.rules)}>
 -            {!isLoading && (server.get('rules').isEmpty() ? (
 -              <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
diff --git a/patches/hide-signup.patch b/patches/hide-signup.patch
index 83716e1..5f33b4e 100644
--- a/patches/hide-signup.patch
+++ b/patches/hide-signup.patch
@@ -8,7 +8,7 @@ index d4535378f..153c50991 100644
              <a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
 -            {signupButton}
            </div>
-
+ 
            <div className='interaction-modal__choices__choice'>
 diff --git a/app/javascript/mastodon/features/ui/components/header.js b/app/javascript/mastodon/features/ui/components/header.js
 index 1384bebda..89becd19b 100644
@@ -41,13 +41,13 @@ index f078e2f7e..6e106cd92 100644
 @@ -5,14 +5,8 @@
      - if controller_name != 'sessions'
        %li= link_to_login t('auth.login')
-
+ 
 -    - if controller_name != 'registrations'
 -      %li= link_to t('auth.register'), available_sign_up_path
 -
      - if controller_name != 'passwords' && controller_name != 'registrations'
        %li= link_to t('auth.forgot_password'), new_user_password_path
-
+ 
 -  - if controller_name != 'confirmations' && (!user_signed_in? || !current_user.confirmed? || current_user.unconfirmed_email.present?)
 -    %li= link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path
 -
diff --git a/patches/system-font.patch b/patches/system-font.patch
index 3ee1143..e376bc0 100644
--- a/patches/system-font.patch
+++ b/patches/system-font.patch
@@ -7,7 +7,7 @@ index 81a040108..01c840180 100644
  @import 'mastodon/variables';
 -@import 'fonts/roboto';
 -@import 'fonts/roboto-mono';
-
+ 
  @import 'mastodon/reset';
  @import 'mastodon/basics';
 diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
@@ -17,7 +17,7 @@ index 18fe522eb..16ffb8b2f 100644
 @@ -1,5 +1,4 @@
  @import 'mastodon/variables';
 -@import 'fonts/roboto';
-
+ 
  table,
  td,
 diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
@@ -27,7 +27,7 @@ index 413a1cdd6..fccbf2763 100644
 @@ -19,21 +19,6 @@ body {
    -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
    -webkit-tap-highlight-color: transparent;
-
+ 
 -  &.system-font {
 -    // system-ui => standard property (Chrome/Android WebView 56+, Opera 43+, Safari 11+)
 -    // -apple-system => Safari <11 specific
@@ -45,25 +45,15 @@ index 413a1cdd6..fccbf2763 100644
 -
    &.app-body {
      padding: 0;
-<<<<<<< Updated upstream
  
-=======
-
->>>>>>> Stashed changes
 diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
 index 2f6c41d5f..b968ea42d 100644
 --- a/app/javascript/styles/mastodon/variables.scss
 +++ b/app/javascript/styles/mastodon/variables.scss
 @@ -55,6 +55,6 @@ $media-modal-media-max-height: 80%;
-<<<<<<< Updated upstream
  
  $no-gap-breakpoint: 1175px;
  
-=======
-
- $no-gap-breakpoint: 1175px;
-
->>>>>>> Stashed changes
 -$font-sans-serif: 'mastodon-font-sans-serif' !default;
 -$font-display: 'mastodon-font-display' !default;
 -$font-monospace: 'mastodon-font-monospace' !default;