diff --git a/src/components/microworld/microworld.jsx b/src/components/microworld/microworld.jsx
index b4d86b3d8..578424384 100644
--- a/src/components/microworld/microworld.jsx
+++ b/src/components/microworld/microworld.jsx
@@ -258,7 +258,7 @@ class Microworld extends React.Component {
                             )
                         }
                     />
-               `</Box>
+                    `</Box>
             </div>
         );
     }
diff --git a/src/components/modal/mute/feedback-form.jsx b/src/components/modal/mute/feedback-form.jsx
index c72bbcbe4..1a0913a14 100644
--- a/src/components/modal/mute/feedback-form.jsx
+++ b/src/components/modal/mute/feedback-form.jsx
@@ -70,7 +70,7 @@ class FeedbackForm extends React.Component {
                                 autoComplete="off"
                                 autoCorrect="off"
                                 className={classNames(
-                                    'compose-feedback',
+                                    'compose-feedback'
                                 )}
                                 component="textarea"
                                 error={errors.feedback}
diff --git a/src/components/modal/mute/modal.jsx b/src/components/modal/mute/modal.jsx
index 6ee6aefa3..b416b22da 100644
--- a/src/components/modal/mute/modal.jsx
+++ b/src/components/modal/mute/modal.jsx
@@ -222,7 +222,7 @@ class MuteModal extends React.Component {
                         {this.state.step > 0 && this.state.step < steps.USER_FEEDBACK ? (
                             <Button
                                 className={classNames(
-                                    'back-button',
+                                    'back-button'
                                 )}
                                 onClick={this.handlePrevious}
                             >
@@ -233,7 +233,7 @@ class MuteModal extends React.Component {
                         ) : this.state.step === steps.USER_FEEDBACK ? (
                             <Button
                                 className={classNames(
-                                    'send-button',
+                                    'send-button'
                                 )}
                                 form="feedback-form"
                                 type="submit"
diff --git a/src/views/annual-report/2020/annual-report.jsx b/src/views/annual-report/2020/annual-report.jsx
index beff00816..82a5e51fd 100644
--- a/src/views/annual-report/2020/annual-report.jsx
+++ b/src/views/annual-report/2020/annual-report.jsx
@@ -1453,7 +1453,7 @@ class AnnualReport extends React.Component {
                                                 values={{
                                                     linkText: (
                                                         <a href="https://www.youtube.com/playlist?list=PLpfxVARjkP-953-E52NskKvbCBXEgHkwr">
-                                                           Create-Alongs
+                                                            Create-Alongs
                                                         </a>
                                                     )
                                                 }}
diff --git a/src/views/conference/2016/plan/plan.jsx b/src/views/conference/2016/plan/plan.jsx
index 1b5931630..4d91299e3 100644
--- a/src/views/conference/2016/plan/plan.jsx
+++ b/src/views/conference/2016/plan/plan.jsx
@@ -81,7 +81,7 @@ class ConferencePlan extends React.Component {
                                 </FlexRow>
                                 <p>
                                     To reserve a room, <b>call the hotel and request the{' '}
-                                    &#34;MIT discount&#34;</b> (subject to availability).
+                                        &#34;MIT discount&#34;</b> (subject to availability).
                                 </p>
                                 <p>
                                     We also suggest the{' '}
diff --git a/src/views/cookies/cookies.jsx b/src/views/cookies/cookies.jsx
index d40e43e75..d1382cfda 100644
--- a/src/views/cookies/cookies.jsx
+++ b/src/views/cookies/cookies.jsx
@@ -334,11 +334,11 @@ const Cookies = injectIntl(() => (
                 <h2><FormattedMessage id="cookies.contactTitle" /></h2>
                 <p><FormattedMessage id="cookies.contactIntro" /></p>
                 <p>
-                Scratch Foundation<br />
-                ATTN: Cookie Policy<br />
-                201 South Street<br />
-                Suite 102<br />
-                Boston, MA 02111<br />
+                    Scratch Foundation<br />
+                    ATTN: Cookie Policy<br />
+                    201 South Street<br />
+                    Suite 102<br />
+                    Boston, MA 02111<br />
                 </p>
             </section>
         </div>
diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx
index 194fe169d..e399bf2b2 100644
--- a/src/views/credits/credits.jsx
+++ b/src/views/credits/credits.jsx
@@ -51,8 +51,8 @@ const Credits = () => (
                         {' '}
                         <span>
                             Brenda Nyaringita (Kiswahili), Farshid Meidani (فارسی‎),
-                             Hans de Jong (Nederlands), Karin Colsman (Gàidhlig),
-                             Nasir Khan Saikat (বাংলা).
+                            Hans de Jong (Nederlands), Karin Colsman (Gàidhlig),
+                            Nasir Khan Saikat (বাংলা).
                         </span>
                     </p>
                 </div>
@@ -141,9 +141,9 @@ const Credits = () => (
                     <FormattedMessage id="credits.acknowledgementsIllustrations" />
                 </p>
                 <p>
-                  Natalie Rosalinda Hall, Wren McDonald, Leigh McG, Andrew Rae, Daria
-                  Skrybchenko, Robert Hunter, Alex Eben Meyer, Ding Ding Hu, Owen
-                  Davey, Zo&euml; Bentley, DD Liu, Kristin Osiecki, Kathy Wu.
+                    Natalie Rosalinda Hall, Wren McDonald, Leigh McG, Andrew Rae, Daria
+                    Skrybchenko, Robert Hunter, Alex Eben Meyer, Ding Ding Hu, Owen
+                    Davey, Zo&euml; Bentley, DD Liu, Kristin Osiecki, Kathy Wu.
                 </p>
                 <h2>
                     <FormattedMessage id="credits.soundsTitle" />
diff --git a/src/views/download/download.jsx b/src/views/download/download.jsx
index 92c5eb94b..3dbf2080e 100644
--- a/src/views/download/download.jsx
+++ b/src/views/download/download.jsx
@@ -70,28 +70,28 @@ class Download extends React.Component {
                                             alt=""
                                             src="/svgs/extensions/windows.svg"
                                         />
-                                                Windows 10+
+                                        Windows 10+
                                     </span>
                                     <span>
                                         <img
                                             alt=""
                                             src="/svgs/extensions/mac.svg"
                                         />
-                                                macOS 10.13+
+                                        macOS 10.13+
                                     </span>
                                     <span>
                                         <img
                                             alt=""
                                             src="/svgs/extensions/chromeos.svg"
                                         />
-                                                ChromeOS
+                                        ChromeOS
                                     </span>
                                     <span>
                                         <img
                                             alt=""
                                             src="/svgs/extensions/android.svg"
                                         />
-                                                Android 6.0+
+                                        Android 6.0+
                                     </span>
                                 </FlexRow>
                             </FlexRow>
diff --git a/src/views/ev3/ev3.jsx b/src/views/ev3/ev3.jsx
index 37aba205f..3d14da937 100644
--- a/src/views/ev3/ev3.jsx
+++ b/src/views/ev3/ev3.jsx
@@ -52,7 +52,7 @@ class EV3 extends ExtensionLanding {
                                             rel="noopener noreferrer"
                                             target="_blank"
                                         >
-                                                    LEGO MINDSTORMS Education EV3
+                                            LEGO MINDSTORMS Education EV3
                                         </a>
                                     )
                                 }}
@@ -115,7 +115,7 @@ class EV3 extends ExtensionLanding {
                                                         rel="noopener noreferrer"
                                                         target="_blank"
                                                     >
-                                                                Scratch
+                                                        Scratch
                                                     </a>
                                                 )
                                             }}
diff --git a/src/views/research/research.jsx b/src/views/research/research.jsx
index 2584ca954..d6c487102 100755
--- a/src/views/research/research.jsx
+++ b/src/views/research/research.jsx
@@ -91,7 +91,7 @@ const Research = props => (
                     <a href="https://dl.acm.org/citation.cfm?id=2441776.2441893">
                         The cost of collaboration for code and art: Evidence from a remixing community.
                     </a> Forthcoming in <i>Proceedings of the ACM Conference{' '}
-                    on Computer Supported Cooperative Work (CSCW &apos;13)</i>.{' '}
+                        on Computer Supported Cooperative Work (CSCW &apos;13)</i>.{' '}
                     San Antonio, Texas, USA: ACM. Best Paper Award [
                     <a href="https://dl.acm.org/citation.cfm?id=2441776.2441893">
                         Official Link
@@ -325,7 +325,7 @@ const Research = props => (
                     <a href="http://download.scratch.mit.edu/idc07.pdf">
                         ScratchR: sharing user-generated programmable media
                     </a>. In <em>Proceedings of the 6th international conference{' '}
-                    on Interaction design and children</em>{' '}
+                        on Interaction design and children</em>{' '}
                     (IDC &apos;07). ACM, New York, NY, USA,{' '}
                     <a href="http://doi.acm.org/10.1145/1297277.1297315">
                         167-168
diff --git a/src/views/terms/terms.jsx b/src/views/terms/terms.jsx
index 203cd2ebf..d1c8ad882 100644
--- a/src/views/terms/terms.jsx
+++ b/src/views/terms/terms.jsx
@@ -76,7 +76,7 @@ const Terms = () => (
                 </p>
                 <p>
                     2.4 Account names cannot be changed. If you want a different account name,
-                     create a new account and copy your existing projects over by hand.
+                    create a new account and copy your existing projects over by hand.
                 </p>
                 <p>
                     2.5 If you have reason to believe that your account is no longer secure
@@ -91,52 +91,52 @@ const Terms = () => (
                 <h3>3. Rules of Usage</h3>
                 <p>
                     3.1 The Scratch Team supports freedom of expression. However, Scratch is
-                     intended for a wide audience, and some content is inappropriate for the
-                     Scratch community. You may not use the Scratch service in any way, that:
+                    intended for a wide audience, and some content is inappropriate for the
+                    Scratch community. You may not use the Scratch service in any way, that:
                     <ol>
                         <li>
                             Promotes bigotry, discrimination, hatred, or violence against any
-                             individual or group;
+                            individual or group;
                         </li>
                         <li>
                             Threatens, harasses, or intimidates any other person, whether that
-                             person is a Scratch user or not;
+                            person is a Scratch user or not;
                         </li>
                         <li>Contains foul language or personal attacks;</li>
                         <li>Contains sexually explicit or graphically violent material;</li>
                         <li>
                             Provides instructions on how to commit illegal activities or obtain
-                             illegal products;
+                            illegal products;
                         </li>
                         <li>
                             Except in connection with organizing Scratch day events, asks any
-                             other user for personally identifying information, contact
-                             information, or passwords; or
+                            other user for personally identifying information, contact
+                            information, or passwords; or
                         </li>
                         <li>
                             Exposes any others person&#39;s personally identifying information,
-                             contact information, or passwords without that person&#39;s permission.
+                            contact information, or passwords without that person&#39;s permission.
                         </li>
                     </ol>
                 </p>
                 <p>
                     3.3 You agree to comply with all applicable laws and regulations when you use
-                     Scratch. You may not use Scratch in any unlawful way, including to harass,
-                     stalk, or defame any other person.
+                    Scratch. You may not use Scratch in any unlawful way, including to harass,
+                    stalk, or defame any other person.
                 </p>
                 <p>
                     3.4 You may not impersonate, imitate or pretend to be somebody else when using
-                     the Services.
+                    the Services.
                 </p>
                 <p>
                     3.5 You agree not to use Scratch in any way intended to disrupt the service,
-                     gain unauthorized access to the service, or interfere with any other user&#39;s
-                     ability to use the service. Prohibited activities include, but are not limited
-                     to:
+                    gain unauthorized access to the service, or interfere with any other user&#39;s
+                    ability to use the service. Prohibited activities include, but are not limited
+                    to:
                     <ol>
                         <li>
                             Posting content deliberately designed to crash the Scratch
-                             website or editor;
+                            website or editor;
                         </li>
                         <li>
                             Linking to pages containing viruses or malware;
@@ -149,8 +149,8 @@ const Terms = () => (
                         </li>
                         <li>
                             Using alternate accounts or organizing voting groups to manipulate
-                             site statistics, such as purposely trying to get on the &#34;What the
-                             Community is Loving/Remixing&#34; rows of the front page.
+                            site statistics, such as purposely trying to get on the &#34;What the
+                            Community is Loving/Remixing&#34; rows of the front page.
                         </li>
                     </ol>
                 </p>
@@ -158,7 +158,7 @@ const Terms = () => (
                     3.6 Commercial use of Scratch, user-generated content, and support
                     materials is permitted under the{' '}
                     <a href="https://creativecommons.org/licenses/by-sa/2.0/">
-                    Creative Commons Attribution-ShareAlike 2.0 license</a>. However,
+                        Creative Commons Attribution-ShareAlike 2.0 license</a>. However,
                     the Scratch Team reserves the right to block any commercial use
                     of Scratch that, in the Scratch Team&#39;s sole discretion, is harmful
                     to the community. Harmful commercial use includes spamming or
@@ -174,22 +174,22 @@ const Terms = () => (
                 <h3>4. User-Generated Content and Licensing</h3>
                 <p>
                     4.1 For the purposes of the Terms of Use, &#34;user-generated content&#34;
-                     includes any projects, comments, forum posts, or links to third
-                     party websites that a user submits to Scratch.
+                    includes any projects, comments, forum posts, or links to third
+                    party websites that a user submits to Scratch.
                 </p>
                 <p>
                     4.2 The Scratch Team encourages everyone to foster creativity by
-                     freely sharing code, art, music, and other works. However, we
-                     also understand the need for individuals and companies to protect
-                     their intellectual property rights. You are responsible for making
-                     sure you have the necessary rights, licenses, or permission for
-                     any user-generated content you submit to Scratch.
+                    freely sharing code, art, music, and other works. However, we
+                    also understand the need for individuals and companies to protect
+                    their intellectual property rights. You are responsible for making
+                    sure you have the necessary rights, licenses, or permission for
+                    any user-generated content you submit to Scratch.
                 </p>
                 <p>
                     4.3 All user-generated content you submit to Scratch is licensed
                     to and through Scratch under the{' '}
                     <a href="https://creativecommons.org/licenses/by-sa/2.0/">
-                    Creative Commons Attribution-ShareAlike 2.0 license</a>. This
+                        Creative Commons Attribution-ShareAlike 2.0 license</a>. This
                     allows others to view and remix your content. This license also
                     allows the Scratch Team to display, distribute, and reproduce
                     your content on the Scratch website, through social media
@@ -198,39 +198,39 @@ const Terms = () => (
                 </p>
                 <p>
                     4.4 You may only submit user-generated projects that were created
-                     with (1) the Scratch website editor or (2) an unmodified copy of
-                     the Scratch editor compiled from the source code described in
-                     Section 5.3. You may not upload any projects that were created, by
-                     you or by anyone else, with a modified version of the Scratch editor.
+                    with (1) the Scratch website editor or (2) an unmodified copy of
+                    the Scratch editor compiled from the source code described in
+                    Section 5.3. You may not upload any projects that were created, by
+                    you or by anyone else, with a modified version of the Scratch editor.
                 </p>
                 <p>
                     4.5 Although the Scratch Team requires all users to comply with
-                     these Terms of Use, some inappropriate user-generated content
-                     may be submitted and displayed on the Scratch website. You
-                     understand that when you use Scratch you may be exposed to
-                     user-generated content that you find objectionable or offensive.
-                     If you see any content that violates the Community Guidelines
-                     or Terms of Use, please let us know by using the &#34;Report this&#34;
-                     button. You only need to report an item once. The Scratch Team
-                     reviews reported content every day.
+                    these Terms of Use, some inappropriate user-generated content
+                    may be submitted and displayed on the Scratch website. You
+                    understand that when you use Scratch you may be exposed to
+                    user-generated content that you find objectionable or offensive.
+                    If you see any content that violates the Community Guidelines
+                    or Terms of Use, please let us know by using the &#34;Report this&#34;
+                    button. You only need to report an item once. The Scratch Team
+                    reviews reported content every day.
                 </p>
                 <p>
                     4.6 In addition to reviewing reported user-generated content, the
-                     Scratch Team reserves the right, but is not obligated, to monitor
-                     all uses of the Scratch service. The Scratch Team may edit, move,
-                     or delete any content that violates the Terms of Use or Community
-                     Guidelines, without notice.
+                    Scratch Team reserves the right, but is not obligated, to monitor
+                    all uses of the Scratch service. The Scratch Team may edit, move,
+                    or delete any content that violates the Terms of Use or Community
+                    Guidelines, without notice.
                 </p>
                 <p>
                     4.7 All user-generated content is provided as-is. The Scratch Team
-                     makes no warranties about the accuracy or reliability of any
-                     user-generated content available through Scratch and does not
-                     endorse Scratch Day events or vet or verify information posted in
-                     connection with said events. The Scratch Team does not endorse any
-                     views, opinions, or advice expressed in user-generated content. You
-                     agree to relieve the Scratch Team of any and all liability arising
-                     from your user-generated content and from Scratch Day events you
-                     may organize or host.
+                    makes no warranties about the accuracy or reliability of any
+                    user-generated content available through Scratch and does not
+                    endorse Scratch Day events or vet or verify information posted in
+                    connection with said events. The Scratch Team does not endorse any
+                    views, opinions, or advice expressed in user-generated content. You
+                    agree to relieve the Scratch Team of any and all liability arising
+                    from your user-generated content and from Scratch Day events you
+                    may organize or host.
                 </p>
             </section>
             <section id="scratch-content">
@@ -238,20 +238,20 @@ const Terms = () => (
                 <h3>5. Scratch Content and Licensing</h3>
                 <p>
                     5.1 Except for any user-generated content, the Scratch Team owns and
-                     retains all rights in and to the Scratch code, the design,
-                     functionality, and architecture of Scratch, and any software or
-                     content provided through Scratch (collectively &#34;the Scratch IP&#34;).
-                     If you want to use Scratch in a way that is not allowed by these
-                     Terms of Use, you must first contact the Scratch Team. Except for
-                     any rights explicitly granted under these Terms of Use, you are not
-                     granted any rights in and to any Scratch IP.
+                    retains all rights in and to the Scratch code, the design,
+                    functionality, and architecture of Scratch, and any software or
+                    content provided through Scratch (collectively &#34;the Scratch IP&#34;).
+                    If you want to use Scratch in a way that is not allowed by these
+                    Terms of Use, you must first contact the Scratch Team. Except for
+                    any rights explicitly granted under these Terms of Use, you are not
+                    granted any rights in and to any Scratch IP.
                 </p>
                 <p>
                     5.2 Scratch provides support materials, including images, sounds,
                     video, and sample code, to help users build projects. Support materials
                     are licensed under the{' '}
                     <a href="https://creativecommons.org/licenses/by-sa/2.0/">
-                    Creative Commons Attribution-ShareAlike 2.0 license</a>. You may also
+                        Creative Commons Attribution-ShareAlike 2.0 license</a>. You may also
                     use screenshots of Scratch under the same license. Please note that
                     this does not apply to materials that are also trademarked by the
                     Scratch Team or other parties as described in parts 5.4 and 5.5, below.
@@ -270,23 +270,23 @@ const Terms = () => (
                 </p>
                 <p>
                     5.4 The Scratch name, Scratch logo, Scratch Day logo, Scratch Cat, and Gobo
-                     are Trademarks owned by the Scratch Team. The MIT name and logo are Trademarks
-                     owned by the Massachusetts Institute of Technology. Unless you are licensed by
-                     Scratch under a specific licensing program or agreement, you may not use
-                     these logos to label, promote, or endorse any product or service. You may use
-                     the Scratch Logo to refer to the Scratch website and programming language.
+                    are Trademarks owned by the Scratch Team. The MIT name and logo are Trademarks
+                    owned by the Massachusetts Institute of Technology. Unless you are licensed by
+                    Scratch under a specific licensing program or agreement, you may not use
+                    these logos to label, promote, or endorse any product or service. You may use
+                    the Scratch Logo to refer to the Scratch website and programming language.
                 </p>
                 <p>
                     5.5 The Scratch support materials library may contain images and sounds that
-                     are trademarked by third parties. The fact that materials are included in
-                     the Scratch support materials library does not in any way limit or reduce
-                     intellectual property rights, including trademark rights, otherwise
-                     available to the materials&#39; owners. Nothing in these Terms of Use or the
-                     Creative Commons 2.0 license will be construed to limit or reduce any
-                     party&#39;s rights in that party&#39;s valid trademarks. You may not use these
-                     materials to label, promote, or endorse any product or service. You are
-                     solely responsible for any violation of a third party&#39;s intellectual
-                     property rights caused by your misuse of these materials.
+                    are trademarked by third parties. The fact that materials are included in
+                    the Scratch support materials library does not in any way limit or reduce
+                    intellectual property rights, including trademark rights, otherwise
+                    available to the materials&#39; owners. Nothing in these Terms of Use or the
+                    Creative Commons 2.0 license will be construed to limit or reduce any
+                    party&#39;s rights in that party&#39;s valid trademarks. You may not use these
+                    materials to label, promote, or endorse any product or service. You are
+                    solely responsible for any violation of a third party&#39;s intellectual
+                    property rights caused by your misuse of these materials.
                 </p>
             </section>
             <section id="dmca">
@@ -323,15 +323,15 @@ const Terms = () => (
                 <h3>7. Suspension and Termination of Accounts</h3>
                 <p>
                     7.1 Scratch has the right to suspend your account for violations of the
-                     Terms of Use or Community Guidelines. Repeat violators may have their
-                     account deleted. The Scratch Team reserves the sole right to determine
-                     what constitutes a violation of the Terms of Use or Community Guidelines.
-                     The Scratch Team also reserves the right to terminate any account used
-                     to circumvent prior enforcement of the Terms of Use.
+                    Terms of Use or Community Guidelines. Repeat violators may have their
+                    account deleted. The Scratch Team reserves the sole right to determine
+                    what constitutes a violation of the Terms of Use or Community Guidelines.
+                    The Scratch Team also reserves the right to terminate any account used
+                    to circumvent prior enforcement of the Terms of Use.
                 </p>
                 <p>
                     7.2 If you want to delete or temporarily disable your account, please
-                     email <a href="mailto:help@scratch.mit.edu">help@scratch.mit.edu</a>.
+                    email <a href="mailto:help@scratch.mit.edu">help@scratch.mit.edu</a>.
                 </p>
             </section>
             <section id="third-party">
@@ -339,11 +339,11 @@ const Terms = () => (
                 <h3>8. Third Party Websites</h3>
                 <p>
                     8.1 Content on Scratch, including user-generated content, may include
-                     links to third party websites. The Scratch Team is not capable of
-                     reviewing or managing third party websites, and assumes no
-                     responsibility for the privacy practices, content, or functionality
-                     of third party websites. You agree to relieve the Scratch Team of
-                     any and all liability arising from third party websites.
+                    links to third party websites. The Scratch Team is not capable of
+                    reviewing or managing third party websites, and assumes no
+                    responsibility for the privacy practices, content, or functionality
+                    of third party websites. You agree to relieve the Scratch Team of
+                    any and all liability arising from third party websites.
                 </p>
             </section>
             <section id="indemnification">
@@ -351,21 +351,21 @@ const Terms = () => (
                 <h3>9. Indemnification</h3>
                 <p>
                     You agree to indemnify MIT, the Scratch Team, the Scratch Foundation,
-                     and all their affiliates, employees, faculty members, fellows,
-                     students, agents, representatives, third party service providers,
-                     and members of their governing boards (all of which are &#34;Scratch
-                     Entities&#34;), and to defend and hold each of them harmless, from any
-                     and all claims and liabilities (including attorneys{'\''} fees) arising
-                     out of or related to your breach of the Terms of Service or your
-                     use of Scratch.
+                    and all their affiliates, employees, faculty members, fellows,
+                    students, agents, representatives, third party service providers,
+                    and members of their governing boards (all of which are &#34;Scratch
+                    Entities&#34;), and to defend and hold each of them harmless, from any
+                    and all claims and liabilities (including attorneys{'\''} fees) arising
+                    out of or related to your breach of the Terms of Service or your
+                    use of Scratch.
                 </p>
                 <p>
                     For federal government agencies, provisions in the Terms of Use
-                     relating to Indemnification shall not apply to your Official Use,
-                     except to the extent expressly authorized by federal law. For
-                     state and local government agencies in the United States, Terms
-                     of Use relating to Indemnification shall apply to your Official
-                     Use only to the extent authorized by the laws of your jurisdiction.
+                    relating to Indemnification shall not apply to your Official Use,
+                    except to the extent expressly authorized by federal law. For
+                    state and local government agencies in the United States, Terms
+                    of Use relating to Indemnification shall apply to your Official
+                    Use only to the extent authorized by the laws of your jurisdiction.
                 </p>
             </section>
             <section id="disclaimer">
@@ -373,21 +373,21 @@ const Terms = () => (
                 <h3>10. Disclaimer of Warranty</h3>
                 <p><b>
                     You acknowledge that you are using Scratch at your own risk. Scratch
-                     is provided &#34;as is,&#34; and the Scratch Entities hereby expressly
-                     disclaim any and all warranties, express and implied, including but
-                     not limited to any warranties of accuracy, reliability, title,
-                     merchantability, non-infringement, fitness for a particular purpose
-                     or any other warranty, condition, guarantee or representation,
-                     whether oral, in writing or in electronic form, including but not
-                     limited to the accuracy or completeness of any information contained
-                     therein or provided by Scratch. Without limiting the foregoing, the
-                     Scratch Entities disclaim any and all warranties, express and implied,
-                     regarding user-generated content and Scratch Day events. The Scratch
-                     Entities and their third party service providers do not represent or
-                     warrant that access to Scratch will be uninterrupted or that there
-                     will be no failures, errors or omissions or loss of transmitted
-                     information, or that no viruses will be transmitted through Scratch
-                     services.
+                    is provided &#34;as is,&#34; and the Scratch Entities hereby expressly
+                    disclaim any and all warranties, express and implied, including but
+                    not limited to any warranties of accuracy, reliability, title,
+                    merchantability, non-infringement, fitness for a particular purpose
+                    or any other warranty, condition, guarantee or representation,
+                    whether oral, in writing or in electronic form, including but not
+                    limited to the accuracy or completeness of any information contained
+                    therein or provided by Scratch. Without limiting the foregoing, the
+                    Scratch Entities disclaim any and all warranties, express and implied,
+                    regarding user-generated content and Scratch Day events. The Scratch
+                    Entities and their third party service providers do not represent or
+                    warrant that access to Scratch will be uninterrupted or that there
+                    will be no failures, errors or omissions or loss of transmitted
+                    information, or that no viruses will be transmitted through Scratch
+                    services.
                 </b></p>
             </section>
             <section id="liability">
@@ -395,13 +395,13 @@ const Terms = () => (
                 <h3>11. Limitation of Liability</h3>
                 <p><b>
                     The Scratch Entities shall not be liable to you or any third parties
-                     for any direct, indirect, special, consequential or punitive damages
-                     of any kind, regardless of the type of claim or the nature of the
-                     cause of action, even if the Scratch Team has been advised of the
-                     possibility of such damages. Without limiting the foregoing, the
-                     Scratch Entites shall have no liability to you or any third parties
-                     for damages or harms arising out of user-generated content or
-                     Scratch Day events.
+                    for any direct, indirect, special, consequential or punitive damages
+                    of any kind, regardless of the type of claim or the nature of the
+                    cause of action, even if the Scratch Team has been advised of the
+                    possibility of such damages. Without limiting the foregoing, the
+                    Scratch Entites shall have no liability to you or any third parties
+                    for damages or harms arising out of user-generated content or
+                    Scratch Day events.
                 </b></p>
             </section>
             <section id="jurisdiction">
@@ -409,9 +409,9 @@ const Terms = () => (
                 <h3>12. Jurisdiction</h3>
                 <p>
                     Scratch is offered by the Scratch Team from its facilities in the United
-                     States. The Scratch Team makes no representations that Scratch is
-                     appropriate or available for use in other locations. Those who access
-                     or use Scratch are responsible for compliance with local law.
+                    States. The Scratch Team makes no representations that Scratch is
+                    appropriate or available for use in other locations. Those who access
+                    or use Scratch are responsible for compliance with local law.
                 </p>
             </section>
             <section id="choice-of-law">
@@ -419,23 +419,23 @@ const Terms = () => (
                 <h3>13. Choice of Law and Venue</h3>
                 <p>
                     You agree that these Terms of Use, for all purposes, shall be governed
-                     and construed in accordance with the laws of the Commonwealth of
-                     Massachusetts applicable to contracts to be wholly performed therein,
-                     and any action based on, relating to, or alleging a breach of the
-                     Terms of Use must be brought in a state or federal court in Suffolk
-                     County, Massachusetts. In addition, both parties agree to submit to
-                     the exclusive personal jurisdiction and venue of such courts.
+                    and construed in accordance with the laws of the Commonwealth of
+                    Massachusetts applicable to contracts to be wholly performed therein,
+                    and any action based on, relating to, or alleging a breach of the
+                    Terms of Use must be brought in a state or federal court in Suffolk
+                    County, Massachusetts. In addition, both parties agree to submit to
+                    the exclusive personal jurisdiction and venue of such courts.
                 </p>
                 <p>
                     If you are a federal, state, or local government entity in the United
-                     States using Scratch in your official capacity and legally unable to
-                     accept the controlling law, jurisdiction or venue clauses above, then
-                     those clauses do not apply to you. For such U.S. federal government
-                     entities, these Terms and any action related thereto will be governed
-                     by the laws of the United States of America (without reference to
-                     conflict of laws) and, in the absence of federal law and to the extent
-                     permitted under federal law, the laws of the Commonwealth of
-                     Massachusetts (excluding choice of law).
+                    States using Scratch in your official capacity and legally unable to
+                    accept the controlling law, jurisdiction or venue clauses above, then
+                    those clauses do not apply to you. For such U.S. federal government
+                    entities, these Terms and any action related thereto will be governed
+                    by the laws of the United States of America (without reference to
+                    conflict of laws) and, in the absence of federal law and to the extent
+                    permitted under federal law, the laws of the Commonwealth of
+                    Massachusetts (excluding choice of law).
                 </p>
             </section>
             <section id="choice-of-language">
@@ -443,11 +443,11 @@ const Terms = () => (
                 <h3>14. Choice of Language</h3>
                 <p>
                     If the Scratch Team provides you with a translation of the English language
-                     version of these Terms of Use, the Privacy Policy, or any other policy,
-                     then you agree that the translation is provided for informational purposes
-                     only and does not modify the English language version. In the event of a
-                     conflict between a translation and the English version, the English version
-                     will govern.
+                    version of these Terms of Use, the Privacy Policy, or any other policy,
+                    then you agree that the translation is provided for informational purposes
+                    only and does not modify the English language version. In the event of a
+                    conflict between a translation and the English version, the English version
+                    will govern.
                 </p>
             </section>
             <section id="no-waiver">
@@ -455,9 +455,9 @@ const Terms = () => (
                 <h3>15. No Waiver</h3>
                 <p>
                     No waiver of any term of these Terms of Use shall be deemed a further or
-                     continuing waiver of such term or any other term, and the Scratch Team&#39;s
-                     failure to assert any right or provision under these Terms of Use shall
-                     not constitute a waiver of such right or provision.
+                    continuing waiver of such term or any other term, and the Scratch Team&#39;s
+                    failure to assert any right or provision under these Terms of Use shall
+                    not constitute a waiver of such right or provision.
                 </p>
             </section>
             <section id="entire-agreement">
@@ -465,8 +465,8 @@ const Terms = () => (
                 <h3>16. Entire Agreement</h3>
                 <p>
                     This document, together with all appendices, constitutes the entire Terms
-                     of Use and supersedes all previous agreements with the Scratch Team relating
-                     to the use of Scratch. Revision date: April 2016.
+                    of Use and supersedes all previous agreements with the Scratch Team relating
+                    to the use of Scratch. Revision date: April 2016.
                 </p>
             </section>
             <section id="appendix-a">
@@ -474,33 +474,33 @@ const Terms = () => (
                 <h3>Appendix A: Additional Terms for Scratch Day Website</h3>
                 <p>
                     The following additional terms also govern your access to and use of web
-                     pages hosted within day.scratch.mit.edu/ (collectively, the “Scratch Day
-                     Site”). All of the terms set forth in the general Terms of Use above also
-                     apply to the Scratch Day Site, unless we clearly state otherwise.
+                    pages hosted within day.scratch.mit.edu/ (collectively, the “Scratch Day
+                    Site”). All of the terms set forth in the general Terms of Use above also
+                    apply to the Scratch Day Site, unless we clearly state otherwise.
                 </p>
                 <h4>1. Privacy Policy</h4>
                 <p>
                     The Scratch Day Site Privacy Policy, not the Scratch Privacy Policy,
-                     describes how the Scratch Team uses, collects, and stores information
-                     it collects through the Scratch Day Site. By using the Scratch Day
-                     Site, you agree that you are comfortable with the Privacy Policy.
+                    describes how the Scratch Team uses, collects, and stores information
+                    it collects through the Scratch Day Site. By using the Scratch Day
+                    Site, you agree that you are comfortable with the Privacy Policy.
                 </p>
                 <h4>2. Account Creation and Maintenance</h4>
                 <p>
                     2.1 In order to post an event to the Scratch Day Site, you will need
-                     to register and create an account. This account is a separate account
-                     from your Scratch account. All registrants must be over 18 years of
-                     age. When registering for a personal account, you will be asked to
-                     provide certain personal information, such as your email address,
-                     first and last name, and Scratch username (optional). Please see the
-                     Scratch Day Site Privacy Policy for Scratch’s data retention and usage
-                     policies.
+                    to register and create an account. This account is a separate account
+                    from your Scratch account. All registrants must be over 18 years of
+                    age. When registering for a personal account, you will be asked to
+                    provide certain personal information, such as your email address,
+                    first and last name, and Scratch username (optional). Please see the
+                    Scratch Day Site Privacy Policy for Scratch’s data retention and usage
+                    policies.
                 </p>
                 <p>
                     2.2 You are responsible for keeping your password secret and your account
-                     secure. You are solely responsible for any use of your account, even if
-                     your account is used by another person. If any use of your account
-                     violates the Terms of Use, your account may be suspended or deleted.
+                    secure. You are solely responsible for any use of your account, even if
+                    your account is used by another person. If any use of your account
+                    violates the Terms of Use, your account may be suspended or deleted.
                 </p>
                 <p>
                     2.3 If you have reason to believe that your account is no longer secure
@@ -517,9 +517,9 @@ const Terms = () => (
                 <h4>3. No Endorsement</h4>
                 <p>
                     You understand that neither MIT, nor the Scratch Team, nor the Code to
-                     Learn Foundation endorses any Scratch Day event. If you are hosting a
-                     Scratch Day event, you may not state or imply that MIT, the Scratch
-                     Team, or the Code to Learn Foundation has endorsed your event.
+                    Learn Foundation endorses any Scratch Day event. If you are hosting a
+                    Scratch Day event, you may not state or imply that MIT, the Scratch
+                    Team, or the Code to Learn Foundation has endorsed your event.
                 </p>
             </section>
             <section id="appendix-b">
@@ -527,34 +527,34 @@ const Terms = () => (
                 <h3>Appendix B: Additional Terms for ScratchX Website</h3>
                 <p>
                     The following additional terms also govern your access to and use of web
-                     pages hosted within scratchx.org (collectively, the “ScratchX Site”).
-                     All of the terms set forth in the general Terms of Use above also apply
-                     to the ScratchX Site, unless we clearly state otherwise.
+                    pages hosted within scratchx.org (collectively, the “ScratchX Site”).
+                    All of the terms set forth in the general Terms of Use above also apply
+                    to the ScratchX Site, unless we clearly state otherwise.
                 </p>
                 <h4>1. ScratchX and GitHub</h4>
                 <p>
                     The ScratchX Site provides a platform for developers to link their
-                     experimental extensions to Scratch. However, we do not host those
-                     extensions or save them on the ScratchX site. All the extensions loaded
-                     on to ScratchX are hosted publicly on independent developers’ accounts
-                     on GitHub. Your use of GitHub is subject to GitHub’s Terms of Service
-                     and Privacy.
+                    experimental extensions to Scratch. However, we do not host those
+                    extensions or save them on the ScratchX site. All the extensions loaded
+                    on to ScratchX are hosted publicly on independent developers’ accounts
+                    on GitHub. Your use of GitHub is subject to GitHub’s Terms of Service
+                    and Privacy.
                 </p>
                 <h4>2. Privacy Policy</h4>
                 <p>
                     The ScratchX Site Privacy Policy, not the Scratch Privacy Policy,
-                     describes how the Scratch Team uses, collects, and stores information
-                     it collects through the ScratchX Site. By using the ScratchX Site, you
-                     agree to the terms of the Privacy Policy.
+                    describes how the Scratch Team uses, collects, and stores information
+                    it collects through the ScratchX Site. By using the ScratchX Site, you
+                    agree to the terms of the Privacy Policy.
                 </p>
                 <h4>3. No Endorsement</h4>
                 <p>
                     By using ScratchX, you understand that neither MIT, nor the Scratch Team,
-                     nor the Code to Learn Foundation endorses any ScratchX experimental
-                     extension. If you are a developer linking to your own experimental
-                     extension via the ScratchX site, you may not state or imply that MIT,
-                     the Scratch Team, or the Code to Learn Foundation has endorsed your
-                     extension.
+                    nor the Code to Learn Foundation endorses any ScratchX experimental
+                    extension. If you are a developer linking to your own experimental
+                    extension via the ScratchX site, you may not state or imply that MIT,
+                    the Scratch Team, or the Code to Learn Foundation has endorsed your
+                    extension.
                 </p>
             </section>
             <p><b>The Scratch Terms of Use was last updated: April 2016</b></p>
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
index 9df9052b9..8e4ac9f5f 100644
--- a/test/.eslintrc.js
+++ b/test/.eslintrc.js
@@ -10,6 +10,6 @@ module.exports = {
             {
                 allowParens: true
             }
-        ],
+        ]
     }
 };
diff --git a/test/unit/components/os-chooser.test.jsx b/test/unit/components/os-chooser.test.jsx
index 7658eb876..eecae46d5 100644
--- a/test/unit/components/os-chooser.test.jsx
+++ b/test/unit/components/os-chooser.test.jsx
@@ -10,7 +10,7 @@ describe('OSChooser', () => {
         component.find('button').last()
             .simulate('click');
 
-        expect(onSetOs).toBeCalledWith('Android');
+        expect(onSetOs).toHaveBeenCalledWith('Android');
     });
 
     test('has all 4 operating systems', () => {