From: Devin Ulibarri <devinu@fsf.org>
Date: Fri, 8 Dec 2023 22:45:27 +0000 (-0500)
Subject: Updates
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=259ffe5245d4eb641fd304d87f91fbd9c19d47dc;p=financial-reports.git

Updates
---

diff --git a/content/2018.md b/content/2018.md
index ce2c568..22405c7 100644
--- a/content/2018.md
+++ b/content/2018.md
@@ -757,7 +757,7 @@ care so much about free software.
 Our mission is to promote computer user freedom and defend the rights
 of all software users, worldwide. Though free software is used more
 widely than ever, it is under threat from a wide range of interests
-that profit from controlling and surveiling computer users. You can
+that profit from controlling and surveilling computer users. You can
 help put control over computers back in the hands of the people who
 use them! Try [a free software
 program](https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements),
diff --git a/content/2019.md b/content/2019.md
index 5a25f34..3bfa570 100644
--- a/content/2019.md
+++ b/content/2019.md
@@ -691,7 +691,7 @@ care so much about free software.
 Our mission is to promote computer user freedom and defend the rights
 of all software users, worldwide. Though free software is used more
 widely than ever, it is under threat from a wide range of interests
-that profit from controlling and surveiling computer users. You can
+that profit from controlling and surveilling computer users. You can
 help put control over computers back in the hands of the people who
 use them! Try [a free software
 program](https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements),
diff --git a/content/2020.md b/content/2020.md
index 8f04568..8c41f3d 100644
--- a/content/2020.md
+++ b/content/2020.md
@@ -50,11 +50,11 @@ licensing team spent the year accepting copyright assignments from
 software developers and corporations, investigating GPL violations,
 and answering licensing questions from the community.
 
-Copyright & licensing associate Craig Topham ecorded his first oggcast
-with the [FLOSS for science
+Copyright & licensing associate Craig Topham recorded his first
+oggcast with the [FLOSS for science
 podcast](https://flossforscience.com/about/) out of Louisiana State
-University. It is available on the [FLOSS for science Web
-site](https://flossforscience.com/podcast/season3-epsiode-5).
+University. It is available on the [FLOSS for science
+website](https://flossforscience.com/podcast/season3-epsiode-5).
 
 Finally, we updated our materials for our CLE seminars, making them
 more accessible as an ongoing resource. We also updated an entry on
@@ -75,25 +75,25 @@ Credit: Free Software Foundation, 2019. CC BY-SA 4.0
 ### FY2020 at a glance
 
 241
-: copyright assignments and disclaimers accepted  
+: copyright assignments and disclaimers accepted
 
 10
-: articles and blog posts published  
+: articles and blog posts published
 
 121
-: reports of GNU license violations investigated  
+: reports of GNU license violations investigated
 
 3
-: devices certified to Respect Your Freedom  
+: devices certified to Respect Your Freedom
 
 1
-: continuing legal education seminar conducted in Raleigh, North Carolina  
+: continuing legal education seminar conducted in Raleigh, North Carolina
 
 16,355 packages
 : packages in the Free Software Directory
 
 44,226 
-: unique visitors to RYF Web site
+: unique visitors to RYF website
 
 </div>
 <div class="col1" markdown="1">
@@ -109,9 +109,9 @@ possible to respect your freedom and privacy.
 In FY20, we certified three devices, the Talos II and Talos II lite
 from Raptor Engineering and the Wi-Fri ND2H Wi-Fi card from Libiquity.
 
-The new RYF Web page launched November 2019. The new site enables
-users to browse and search by categories and retailers, and makes
-finding what they are looking for simpler.
+The new RYF webpage launched November 2019. The new site enables users
+to browse and search by categories and retailers, and makes finding
+what they are looking for simpler.
 
 </div>
 
@@ -125,13 +125,13 @@ finding what they are looking for simpler.
 
 ## Campaigns
 
-#### New videos
+### New videos
 
 The campaigns team released two new videos to help educate the public
 about free software. One is [*The university of costumed
 heroes*](https://www.fsf.org/blogs/community/the-university-of-costumed-heroes-a-video-from-the-fsf),
 and the other is
-[Shoetool](https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf)
+[*Shoetool*](https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf).
 
 ### Special events
 
@@ -141,7 +141,7 @@ thirty-fifth](https://www.fsf.org/bulletin/2020/fall/fsf-at-35-why-free-software
 anniversary online. Videos from the event are available on our [media
 archive site](https://media.libreplanet.org/u/libreplanet/tag/fsf35/).
 
-#### Community engagements
+### Community engagements
 
 Zoë, John Hsieh, and John Sullivan joined a community meeting for the
 "FOSS Responders" working group. Due to the coronavirus and the FSF
@@ -158,74 +158,38 @@ collective is the developer of Peertube, and the FSF is the only
 account on their personal server, chosen because of their respect for
 our commitment to free software.
 
-</div>
-<div class="pagebreak"></div>
-<div class="col2" markdown="1">
-
-### LibrePlanet 2020: Free the Future
-
-#### LP2020 tech updates and pandemic response
-
-The tech team switched gears a week before the conference to make an
-entirely digital conference. The methods originally used in the past
-to host remote speakers were reused to be able to host multiple remote
-speakers and slides while separately recording and streaming to a
-large audience. The system, which combines Jitsi Meet, IceCast2 and
-GStreamer custom scripts, was also documented and used as inspiration
-for other organizations that also moved to host online conferences
-this year.
-
-For the first time, we published an audio-only version of the talks
-from LibrePlanet 2020 to MediaGoblin.
-
-During the event, special attention was needed to mitigate an ongoing
-distributed denial-of service (DDoS) attack, which required taking
-multiple firewall and network routing countermeasures.
-
-We secured funding through the NLnet Foundation to start a project to
-develop a browser extension that can limit the functionality of the
-JavaScript engine, so potentially dangerous operations are disabled or
-altered so the user can run unknown scripts in a safer way. This is
-intended as a companion for LibreJS, as harmful scripts can exist
-regardless of their license. After securing funding, a similar project
-was found, and we are currently getting in contact with their authors
-to combine efforts; the project will be completed in FY21.
-
-### International Day Against DRM
+### International Day Against DRM (IDAD)
 
 This year's IDAD saw the campaign targeting Netflix and streaming
 services generally, and like last year we encouraged our community to
-do two things: an action in protest of something we oppose, and asking
-them to participate in a "constructive" way to promote freedom. Last
-year, we paired our protest against Pearson with a hackathon on free
-culture textbooks. This year, we encouraged our community to call
-Netflix customer service and voice their opposition to DRM. Since this
-action was over the phone, we can't gather precise numbers, but we
-know that the Netflix call center we targeted was taken offline as a
-result of the protest, due to high call volume. This is a success for
-which we should be proud.
+do two things:
+
+The first was to protest DRM and, instead, participate in a
+*constructive* way to promote freedom. Last year, we paired our
+protest against Pearson with a hackathon on free culture
+textbooks. This year, we encouraged our community to call Netflix
+customer service and voice their opposition to DRM. Since this action
+was over the phone, we couldn't gather precise numbers, but we know
+that the Netflix call center we targeted was taken offline as a result
+of the protest, due to high call volume. This is a success for which
+we should be proud.
 
 The second action we asked the community to participate in was a
-session on anti-DRM advocacy over BigBlueButton. We decided to do this
-fairly late in the IDAD planning stage, as until the FSF35 event, we
-didn't have enough experience with BigBlueButton to feel confident in
-including it. However, thanks to the great response we received for
-our FSF35 session, we decided to do one for IDAD as well. This was
-very well-attended for something that was first announced only in a
-later IDAD post. The session peaked at 54 participants from 5
-different countries, several of whom joined Zoë and Greg in the
-audio/video chat to share their experiences and advice campaigning
-against DRM. Due to the positive response, we even let the session
-continue an hour after it was scheduled to end. In general, the
-experience was a great demonstration of how much interest in software
-freedom issues can be generated in informal discussions with the
-community.
-
-Together with ANSOL, a Portuguese free software organization, we also
-encouraged people to document any active DRM legislation or court
-cases on the LibrePlanet wiki. This has helped us get information on
-how pervasive DRM is outside the US and EU, and in particular, we
-received good responses from Brazilian supporters of our campaign.
+session on anti-DRM advocacy over BigBlueButton. The session peaked at
+fifty-four simultaneous participants from five different countries,
+several of whom joined Zoë and Greg in the audio/video chat to share
+their experiences and advice campaigning against DRM. Due to the
+positive response, we even let the session continue an hour after it
+was scheduled to end. In general, the experience was a great
+demonstration of how much interest in software freedom issues can be
+generated in informal discussions with the community.
+
+Additionally, together with ANSOL, a Portuguese free software
+organization, we encouraged people to document any active DRM
+legislation or court cases on the LibrePlanet wiki. This has helped us
+get information on how pervasive DRM is outside the US and EU, and, in
+particular, we received good responses from Brazilian supporters of
+our campaign.
 
 Eight other organizations outside the FSF participated in this year's
 IDAD. Several of these organizations posted anti-DRM blog posts in
@@ -245,7 +209,8 @@ Credit: Free Software Foundation, 2023. CC BY-SA 4.0
 {.credit}
 
 </div>
-<div class="column2" markdown=1>
+<div class="pagebreak"></div>
+<div class="col2" markdown="1">
 
 ### FY2020 at a glance
 
@@ -263,9 +228,6 @@ Credit: Free Software Foundation, 2023. CC BY-SA 4.0
 192,853
 : September, 2020
 
-</div>
-<div class="column2" markdown=1>
-
 ### LibrePlanet 2020
 
 339
@@ -289,6 +251,36 @@ Credit: Free Software Foundation, 2023. CC BY-SA 4.0
 
 ## Tech
 
+### LibrePlanet 2020: Free the Future
+
+#### LP2020 tech updates and pandemic response
+
+The tech team switched gears a week before the conference to make an
+entirely digital conference. The methods originally used in the past
+to host remote speakers were reused to be able to host multiple remote
+speakers and slides while separately recording and streaming to a
+large audience. The system, which combines Jitsi Meet, IceCast2, and
+GStreamer custom scripts, was also documented and used as inspiration
+for other organizations that also moved to host online conferences
+this year.
+
+For the first time, we published an audio-only version of the talks
+from LibrePlanet 2020 to MediaGoblin.
+
+During LibrePlanet, special attention was needed to mitigate an
+ongoing distributed denial-of-service (DDoS) attack, which required
+taking multiple firewall and network routing countermeasures.
+
+Also in FY20, we secured funding through the NLnet Foundation to start
+a project to develop a browser extension that can limit the
+functionality of the JavaScript engine, so potentially dangerous
+operations are disabled or altered so the user can run unknown scripts
+in a safer way. This is intended as a companion for LibreJS, as
+harmful scripts can exist regardless of their license. After securing
+funding, a similar project was found, and we are currently getting in
+contact with their authors to combine efforts; the project will be
+completed in FY21.
+
 ### Infrastructure for free software development and activism
 
 The FSF tech team maintains and improves the infrastructure that runs
@@ -311,9 +303,9 @@ thrive using solely free software.
 * We launched a new video conference service as a member's benefit. A
   Jitsi Meet server was built and associated with the membership
   credentials system, with good reception from the public. The changes
-  made to Jitsi Meet improved upong its freedom (LibreJS) and privacy
-  (i.e. removing anti-features and 3rd party services), which were
-  made publicly available.
+  made to Jitsi Meet improved upon its freedom (i.e. allowing it to
+  work with LibreJS enabled) and privacy (i.e. removing anti-features
+  and 3rd party services), which were made publicly available.
 
 * Research on video conference sites for education and social use:
   Test machines were built for the Canvas learning management system
@@ -335,7 +327,7 @@ the COVID-19 pandemic. We wrote
 [two](https://www.fsf.org/blogs/community/hackers-and-hospitals-how-you-can-help)
 [articles](https://www.fsf.org/bulletin/2020/spring/hackers-and-hospitals)
 and gave one talk at the at the [*Flatten The Curve*
-summit](https://media.libreplanet.org/u/libreplanet/m/hackers-and-hospitals/)
+summit](https://media.libreplanet.org/u/libreplanet/m/hackers-and-hospitals/).
 
 #### Bulletin now online
 
@@ -368,7 +360,7 @@ maintaining gnu.org with the help of volunteers, and working with
 interns who are advancing their skills and knowledge in working with
 and creating free software.
 
-![FSF Web Developer Michael McMahon poses with the 3D printers in his garage that are being used to manufacture protective gear and medical supplies in the HACKERS and HOSPITALS initiative..](https://static.fsf.org/nosvn/magazine/2020-spring/images/michael-cover.jpg){: .image-process-article-image}
+![FSF Web Developer Michael McMahon poses with the 3D printers in his garage that are being used to manufacture protective gear and medical supplies in the HACKERS and HOSPITALS initiative.](https://static.fsf.org/nosvn/magazine/2020-spring/images/michael-cover.jpg){: .image-process-article-image}
 
 In response to the COVID-19 pandemic, free software supporters took swift action to assist hospitals by creating protective gear.
 {.caption}
@@ -454,7 +446,7 @@ Fund](https://www.fsf.org/working-together/fund).
 
 {% separator {
   "title": "Why I joined the FSF",
-  "quote": "Free software is necessary for personal freedom and freedom of information. It is our best tool to fight against mass survelliance and authoritarian states."
+  "quote": "Free software is necessary for personal freedom and freedom of information. It is our best tool to fight against mass surveillance and authoritarian states."
 }%}
 
 ## Financial Statement
@@ -477,8 +469,8 @@ Fund](https://www.fsf.org/working-together/fund).
 %}
 
 
-The following is a visualization of the Free Software Foundation's FY
-2020 financial statement. The original documents can be found at
+The following is a visualization of the Free Software Foundation's
+FY2020 financial statement. The original documents can be found at
 <https://www.fsf.org/about/financial>.
 
 
@@ -729,7 +721,7 @@ care so much about free software.
 Our mission is to promote computer user freedom and defend the rights
 of all software users, worldwide. Though free software is used more
 widely than ever, it is under threat from a wide range of interests
-that profit from controlling and surveiling computer users. You can
+that profit from controlling and surveilling computer users. You can
 help put control over computers back in the hands of the people who
 use them! Try [a free software
 program](https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements),
diff --git a/output/FY2018.html b/output/FY2018.html
index dc60cd4..f67f2ed 100644
--- a/output/FY2018.html
+++ b/output/FY2018.html
@@ -1,58 +1,54 @@
 <!DOCTYPE html>
+
 <html lang="en">
-  <head>
-    <title>FY2018 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet">
+<head>
+<title>FY2018 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <style>
 :root {
 	--background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg;
 }
 </style>
-<meta charset="utf-8">
-<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
-  <body>
+<meta charset="utf-8"/>
+<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
+<body>
 <header class="top-menu no-print">
-  <nav class="top-menu">
-    <ul>
-            <li><a class="highlight" href="/">Index of reports</a></li>
-            <li><a href="#">FY2018</a></li>
-            <li><a href="#toc">Table of Contents</a></li>
-            <li><a href="#associate-membership">Join the fsf</a></li>
-            <li><a href="extra/2018.pdf">⬇PDF</a></li>
-    </ul>
-  </nav>
+<nav class="top-menu">
+<ul>
+<li><a class="highlight" href="/">Index of reports</a></li>
+<li><a href="#">FY2018</a></li>
+<li><a href="#toc">Table of Contents</a></li>
+<li><a href="#associate-membership">Join the fsf</a></li>
+<li><a href="extra/2018.pdf">⬇PDF</a></li>
+</ul>
+</nav>
 </header>
-    <div class="document">
-      <div id="head">
-      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
-      <h1 class="title">FY2018 Annual Report</h1>
-      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2018</p></div>
-      <div class="dates"><p>(October 1, 2017 - September 30, 2018)</p></div>
-        <div class="grid">
-         <div class="column">
-          <h4><a href="#licensing">Licensing</a></h4>
-          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-         </div>
-         <div class="column">
-          <h4><a href="#campaigns">Campaigns</a></h4>
-          <p>Empowering you to understand, adopt, develop, and defend free software</p>
-         </div>
-         <div class="column">
-          <h4><a href="#tech">Tech</a></h4>
-          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-         </div>
-         <div class="column">
-           <h4><a href="#financials">Operations</a></h4>
-           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-         </div>
-        </div>
-        <div style="clear:both"></div>      </div>
-      <article>
-        <p>{% comment {</p>
-<p>Copyright (c) 2023 Free Software Foundation, Inc.</p>
-<p>This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
-  International license (https://creativecommons.org/licenses/by-sa/4.0/)</p>
-<p>}%}</p>
+<div class="document">
+<div id="head">
+<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
+<h1 class="title">FY2018 Annual Report</h1>
+<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2018</p></div>
+<div class="dates"><p>(October 1, 2017 - September 30, 2018)</p></div>
+<div class="grid">
+<div class="column">
+<h4><a href="#licensing">Licensing</a></h4>
+<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+</div>
+<div class="column">
+<h4><a href="#campaigns">Campaigns</a></h4>
+<p>Empowering you to understand, adopt, develop, and defend free software</p>
+</div>
+<div class="column">
+<h4><a href="#tech">Tech</a></h4>
+<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+</div>
+<div class="column">
+<h4><a href="#financials">Operations</a></h4>
+<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+</div>
+</div>
+<div style="clear:both"></div> </div>
+<article>
 <blockquote>
 <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.html">"as in freedom"</a> software.</p>
 <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2018 (October 1, 2017 — September 30, 2018) and includes a detailed financial statement.</p>
@@ -111,7 +107,7 @@ materials, adding reviews of new licenses and <a href="https://www.fsf.org/blogs
 questions</a>, and
 published timely <a href="https://www.fsf.org/blogs/licensing">articles</a> on
 current topics and issues in free software licensing.</p>
-<p><img alt="Photo of speaker with long, light brown hair, glasses, and a T-shirt that says &quot;Guix SD&quot; with a chalkboard in the background." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2008/Thompson_02.medium.jpg"></p>
+<p><img alt='Photo of speaker with long, light brown hair, glasses, and a T-shirt that says "Guix SD" with a chalkboard in the background.' class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2008/Thompson_02.medium.jpg"/></p>
 <p class="caption">Dave Thompson, developer, speaking at LibrePlanet 2018 about GNU Guix.</p>
 <p class="credit">Photo credit: Kori Feener, 2018. CC BY-SA 4.0</p>
 <h3 id="fy2018-at-a-glance">FY2018 at a glance</h3>
@@ -132,7 +128,7 @@ current topics and issues in free software licensing.</p>
 <dd>visitors to the Free Software Directory  </dd>
 </dl>
 <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
-<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"></p>
+<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"/></p>
 <p>The FSF's Respects Your Freedom (RYF) product certification program
 encourages the creation and sale of hardware that will do as much as
 possible to respect your freedom and privacy.</p>
@@ -140,10 +136,7 @@ possible to respect your freedom and privacy.</p>
 Minifree Libreboot X200 Tablet.</p>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "The FSF supports the freedom to use devices I own as I see fit, and to be secure in the knowledge that the software I'm using isn't compromising my privacy."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"The FSF supports the freedom to use devices I own as I see fit, and to be secure in the knowledge that the software I'm using isn't compromising my privacy."</p></blockquote></div></p>
 <div class="col2">
 <h2 id="campaigns">Campaigns</h2>
 <p>The FSF campaigns team identifies important opportunities for free
@@ -184,15 +177,12 @@ the legislative action under the <em>Congressional Review Act</em> (CRA) to
 reverse the repeal, and a motion to restore net neutrality passed in
 May, 2018. Various states, including California, Maine, and New York,
 have ongoing legal and legislative efforts to restore net neutrality.</p>
-<p><img alt="A photo of a LibrePlanet speaker in front of a chalkboard." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2010/Thornton_02.medium.jpg"></p>
+<p><img alt="A photo of a LibrePlanet speaker in front of a chalkboard." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2010/Thornton_02.medium.jpg"/></p>
 <p class="caption">Kat Thornton giving a talk on "Pathways for discovery of free software"</p>
 <p class="credit">Credit: Kori Feener, 2018. CC BY-SA 4.0 </p>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "The movement [against] net neutrality being abolished inspired me to join the FSF and help out other foundations to help ensure a free Internet and free world."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"The movement [against] net neutrality being abolished inspired me to join the FSF and help out other foundations to help ensure a free Internet and free world."</p></blockquote></div></p>
 <div class="col2">
 <h3 id="libreplanet-conference-celebrates-its-tenth-anniversary">LibrePlanet conference celebrates its tenth anniversary</h3>
 <p>The <a href="https://libreplanet.org/2018/">tenth annual LibrePlanet</a> was held
@@ -240,7 +230,7 @@ Commons, The Document Foundation, the Electronic Frontier Foundation,
 and more. Here in Boston, we visited the Apple Store and talked with
 shoppers about their digital rights and how Apple devices abuse those
 rights using DRM.</p>
-<p><img alt="Protester holds &quot;Eliminate DRM&quot; signs outside of Apple store." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/1802/boston-apple-store-opening-eliminate-drm.jpg"></p>
+<p><img alt='Protester holds "Eliminate DRM" signs outside of Apple store.' class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/1802/boston-apple-store-opening-eliminate-drm.jpg"/></p>
 <p class="caption">Protesters showed their opposition to DRM and conversed with passersby at the Apple store in downtown Boston.</p>
 <p class="credit">Credit: Free Software Foundation, 2008. Public Domain Mark 1.0</p>
 </div>
@@ -272,11 +262,7 @@ rights using DRM.</p>
 </dl>
 </div>
 <div class="pagebreak"></div>
-
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "Nonfree software is subversive of the rights of software users (i.e. all citizens of the world)."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Nonfree software is subversive of the rights of software users (i.e. all citizens of the world)."</p></blockquote></div></p>
 <div class="col2">
 <h2 id="tech">Tech</h2>
 <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
@@ -310,7 +296,7 @@ banner.</p>
 software community, maintains gnu.org together with the help of
 volunteers, and works with interns, who are advancing their skills and
 knowledge in working with and creating free software.</p>
-<p><img alt="Two people, with their backs turned to the camera wearing jackets look at a computer, which is slightly out of focus. The computer displays text." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/1940/Hallway_38.medium.jpg"></p>
+<p><img alt="Two people, with their backs turned to the camera wearing jackets look at a computer, which is slightly out of focus. The computer displays text." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/1940/Hallway_38.medium.jpg"/></p>
 <p class="caption">LibrePlanet presenters use laptops that run all free software, provided by the FSF tech team.</p>
 <p class="credit">Credit: Kori Feener, 2018. CC BY 4.0</p>
 <h3 id="infrastructure-for-free-software-development-and-activism_1">Infrastructure for free software development and activism</h3>
@@ -359,15 +345,15 @@ all relevant pages and websites.</p>
 <dd>Amazon EC2 instances</dd>
 </dl>
 <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
-<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"></a></p>
+<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"/></a></p>
 <p>The FSF acts as fiscal sponsor for free software projects and events
 whose scope and purpose align with the FSF’s mission. Participating
 projects benefit from the FSF’s nonprofit status, administrative
@@ -377,27 +363,9 @@ software community via the <a href="https://www.fsf.org/working-together/fund">W
 Fund</a>.</p>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "Free software positively impacts my life every hour of every day."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Free software positively impacts my life every hour of every day."</p></blockquote></div></p>
 <h2 id="financial-statement">Financial Statement</h2>
-<p>{%
-    matplotlib {
-        "filename": "fa2018",
-        "data" : [
-         {"title": "Program\nServices",
-         "values": 1076394,
-         "colors": "steelblue"},
-         {"title": "Management\nand General",
-         "values": 95105,
-         "colors": "royalblue"},
-         {"title": "Fundraising",
-         "values": 65639,
-         "colors": "dodgerblue"}
-        ]
-    }
-%}</p>
+<p><img alt="A pie chart" class="matplotlib" src="images/fa2018.png"/></p>
 <p>The following is a visualization of the Free Software Foundation's FY
 2018 financial statement. The original documents can be found at
 <a href="https://www.fsf.org/about/financial">https://www.fsf.org/about/financial</a>.</p>
@@ -563,7 +531,6 @@ Fund</a>.</p>
 </div>
 </div>
 <div class="pagebreak"></div>
-
 <h2 id="donors">Donors</h2>
 <p>This is a snapshot of donors to the FSF. The majority of the
 organization's support each year comes from individuals giving less
@@ -800,18 +767,15 @@ care so much about free software.</p>
   members, and corporate patrons worldwide who make our work possible.</p>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "The FSF gives me hope today, and by joining, I want to support not just free software, but also freedom, justice and equality throughout the world."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"The FSF gives me hope today, and by joining, I want to support not just free software, but also freedom, justice and equality throughout the world."</p></blockquote></div></p>
 <div class="col2">
-<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"></p>
+<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"/></p>
 <h2 id="associate-membership">Associate Membership</h2>
 <h3 id="join-the-free-software-foundation">Join the Free Software Foundation</h3>
 <p>Our mission is to promote computer user freedom and defend the rights
 of all software users, worldwide. Though free software is used more
 widely than ever, it is under threat from a wide range of interests
-that profit from controlling and surveiling computer users. You can
+that profit from controlling and surveilling computer users. You can
 help put control over computers back in the hands of the people who
 use them! Try <a href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements">a free software
 program</a>,
@@ -822,11 +786,10 @@ to free software by <a href="https://my.fsf.org/join">becoming a Free Software F
 Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
 </div>
 <div class="pagebreak"></div>
-
 <h2 id="leadership-and-staff">Leadership and Staff</h2>
 <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
 <h3 id="board-of-directors">Board of Directors</h3>
-<p><img alt="Richard M. Stallman" class="width-50 colortone" src="images/richard-stallman.jpg"></p>
+<p><img alt="Richard M. Stallman" class="width-50 colortone" src="images/richard-stallman.jpg"/></p>
 <h4 id="richard-m-stallman">Richard M. Stallman</h4>
 <p>Founder and President</p>
 <h4 id="gerald-j-sussman">Gerald J. Sussman</h4>
@@ -845,92 +808,91 @@ Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
 <div class="staffcolumn width-70 float-left">
 <h3 id="leadership">Leadership</h3>
 <div class="staff">
-<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/johns.jpg"></p>
+<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/derivatives/thumb/johns.jpg"/></p>
 <h4 id="john-sullivan">John Sullivan</h4>
 <p>Executive Director</p>
 </div>
 <div class="staff">
-<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/johnh.jpg"></p>
+<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/derivatives/thumb/johnh.jpg"/></p>
 <h4 id="john-hsieh">John Hsieh</h4>
 <p>Deputy Director</p>
 </div>
 <div class="staff">
-<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/ruben.jpg"></p>
+<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/derivatives/thumb/ruben.jpg"/></p>
 <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
 <p>Chief Technology Officer </p>
 </div>
 <h3 id="licensing">Licensing</h3>
 <div class="staff">
-<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/donald.jpg"></p>
+<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/derivatives/thumb/donald.jpg"/></p>
 <h4 id="donald-robertson">Donald Robertson</h4>
 <p>Licensing &amp; Compliance Manager</p>
 </div>
 <div class="staff">
-<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/craig.jpg"></p>
+<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/derivatives/thumb/craig.jpg"/></p>
 <h4 id="craig-topham">Craig Topham</h4>
 <p>Copyright &amp; Licensing Associate </p>
 </div>
 <h3 id="campaigns_1">Campaigns</h3>
 <div class="staff">
-<p><img alt="Molly de Blanc" class="image-process-thumb" src="images/staff/molly.jpg"></p>
+<p><img alt="Molly de Blanc" class="image-process-thumb" src="images/staff/derivatives/thumb/molly.jpg"/></p>
 <h4 id="molly-de-blanc">Molly de Blanc</h4>
 <p>Campaigns Manager</p>
 </div>
 <div class="staff">
-<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/dana.jpg"></p>
+<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/derivatives/thumb/dana.jpg"/></p>
 <h4 id="dana-morgenstein">Dana Morgenstein</h4>
 <p>Outreach &amp; Communications Coordinator</p>
 </div>
 <div class="staff">
-<p><img alt="Georgia Young" class="image-process-thumb" src="images/staff/georgia.jpg"></p>
+<p><img alt="Georgia Young" class="image-process-thumb" src="images/staff/derivatives/thumb/georgia.jpg"/></p>
 <h4 id="georgia-young">Georgia Young</h4>
 <p>Program Manager</p>
 </div>
 <h3 id="tech_1">Tech</h3>
 <div class="staff">
-<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/andrew.jpg"></p>
+<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/derivatives/thumb/andrew.jpg"/></p>
 <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
 <p>Web Developer</p>
 </div>
 <div class="staff">
-<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/ian.jpg"></p>
+<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/derivatives/thumb/ian.jpg"/></p>
 <h4 id="ian-kelling">Ian Kelling</h4>
 <p>Senior Systems Administrator</p>
 </div>
 <h3 id="operations">Operations</h3>
 <div class="staff">
-<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/mattlav.jpg"></p>
+<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/derivatives/thumb/mattlav.jpg"/></p>
 <h4 id="matt-lavallee">Matt Lavallee</h4>
 <p>Operations Assistant</p>
 </div>
 <div class="staff">
-<p><img alt="No photo" src="https://web.archive.org/web/20180925153039im_/https://static.fsf.org/fsforg/img/jeanne.jpg"></p>
+<p><img alt="No photo" src="https://web.archive.org/web/20180925153039im_/https://static.fsf.org/fsforg/img/jeanne.jpg"/></p>
 <h4 id="jeanne-rasata">Jeanne Rasata</h4>
 <p>Assistant to the President </p>
 </div>
 </div>
-      </article>
+</article>
 </div>
 <footer class="bside-footer">
- <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
-  <div>
-    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-    <p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-  </div>
-
-  <nav>
-          <ul class="menu">
-	    <li><a class="highlight" href="FY2018.html">FY2018 Annual Report</a></li>
-            <li><a href="#licensing">Licensing</a></li>
-            <li><a href="#campaigns">Campaigns</a></li>
-            <li><a href="#tech">Tech</a></li>
-            <li><a href="#financials">Financials</a></li>
-            <li><a href="#donors">Donors</a></li>
-            <li><a href="#associate-membership">Join the FSF</a></li>
-	    <li><a href="extra/2018.pdf">⬇ PDF</a></li>
-          </ul>
-  </nav>
+<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
+<div>
+<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+<p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+</div>
+<nav>
+<ul class="menu">
+<li><a class="highlight" href="FY2018.html">FY2018 Annual Report</a></li>
+<li><a href="#licensing">Licensing</a></li>
+<li><a href="#campaigns">Campaigns</a></li>
+<li><a href="#tech">Tech</a></li>
+<li><a href="#financials">Financials</a></li>
+<li><a href="#donors">Donors</a></li>
+<li><a href="#associate-membership">Join the FSF</a></li>
+<li><a href="extra/2018.pdf">⬇ PDF</a></li>
+</ul>
+</nav>
 </footer>
-  </body>
+</body>
 </html>
\ No newline at end of file
diff --git a/output/FY2019.html b/output/FY2019.html
index 114df08..4ee87e1 100644
--- a/output/FY2019.html
+++ b/output/FY2019.html
@@ -1,58 +1,54 @@
 <!DOCTYPE html>
+
 <html lang="en">
-  <head>
-    <title>FY2019 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet">
+<head>
+<title>FY2019 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <style>
 :root {
 	--background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg;
 }
 </style>
-<meta charset="utf-8">
-<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
-  <body>
+<meta charset="utf-8"/>
+<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
+<body>
 <header class="top-menu no-print">
-  <nav class="top-menu">
-    <ul>
-            <li><a class="highlight" href="/">Index of reports</a></li>
-            <li><a href="#">FY2019</a></li>
-            <li><a href="#toc">Table of Contents</a></li>
-            <li><a href="#associate-membership">Join the fsf</a></li>
-            <li><a href="extra/2019.pdf">⬇PDF</a></li>
-    </ul>
-  </nav>
+<nav class="top-menu">
+<ul>
+<li><a class="highlight" href="/">Index of reports</a></li>
+<li><a href="#">FY2019</a></li>
+<li><a href="#toc">Table of Contents</a></li>
+<li><a href="#associate-membership">Join the fsf</a></li>
+<li><a href="extra/2019.pdf">⬇PDF</a></li>
+</ul>
+</nav>
 </header>
-    <div class="document">
-      <div id="head">
-      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
-      <h1 class="title">FY2019 Annual Report</h1>
-      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2019</p></div>
-      <div class="dates"><p>(October 1, 2018 - September 30, 2019)</p></div>
-        <div class="grid">
-         <div class="column">
-          <h4><a href="#licensing">Licensing</a></h4>
-          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-         </div>
-         <div class="column">
-          <h4><a href="#campaigns">Campaigns</a></h4>
-          <p>Empowering you to understand, adopt, develop, and defend free software</p>
-         </div>
-         <div class="column">
-          <h4><a href="#tech">Tech</a></h4>
-          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-         </div>
-         <div class="column">
-           <h4><a href="#financials">Operations</a></h4>
-           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-         </div>
-        </div>
-        <div style="clear:both"></div>      </div>
-      <article>
-        <p>{% comment {</p>
-<p>Copyright (c) 2023 Free Software Foundation, Inc.</p>
-<p>This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
-  International license (https://creativecommons.org/licenses/by-sa/4.0/)</p>
-<p>}%}</p>
+<div class="document">
+<div id="head">
+<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
+<h1 class="title">FY2019 Annual Report</h1>
+<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2019</p></div>
+<div class="dates"><p>(October 1, 2018 - September 30, 2019)</p></div>
+<div class="grid">
+<div class="column">
+<h4><a href="#licensing">Licensing</a></h4>
+<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+</div>
+<div class="column">
+<h4><a href="#campaigns">Campaigns</a></h4>
+<p>Empowering you to understand, adopt, develop, and defend free software</p>
+</div>
+<div class="column">
+<h4><a href="#tech">Tech</a></h4>
+<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+</div>
+<div class="column">
+<h4><a href="#financials">Operations</a></h4>
+<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+</div>
+</div>
+<div style="clear:both"></div> </div>
+<article>
 <blockquote>
 <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.html">"as in freedom"</a> software.</p>
 <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2019 (October 1, 2018 — September 30, 2019) and includes a detailed financial statement.</p>
@@ -100,11 +96,11 @@ certified devices to forty-six. We have been working with the tech
 team to launch a new version of the RYF website. The current page
 simply lists each certification chronologically. The new site enables
 users to browse and search by categories and retailers.</p>
-<p><img alt="ThinkPenguin exhibitor table at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2129/thinkpenguin-table.jpg"></p>
+<p><img alt="ThinkPenguin exhibitor table at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2129/thinkpenguin-table.jpg"/></p>
 <p class="caption">ThinkPenguin exhibitor table at LibrePlanet 2019. ThinkPenguin offers many products with RYF certification.</p>
 <p class="credit">Credit: Free Software Foundation 2019. CC BY-SA.</p>
 </div>
-<hr>
+<hr/>
 <div class="col2">
 <h3 id="fy2019-at-a-glance">FY2019 at a glance</h3>
 <dl>
@@ -126,7 +122,7 @@ users to browse and search by categories and retailers.</p>
 <dd>packages in the Free Software Directory</dd>
 </dl>
 <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
-<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"></p>
+<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"/></p>
 <p>The FSF's Respects Your Freedom (RYF) product certification program
 encourages the creation and sale of hardware that will do as much as
 possible to respect your freedom and privacy.</p>
@@ -142,10 +138,7 @@ possible to respect your freedom and privacy.</p>
 </ul>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "I've used GNU software for years and wanted to support the FSF in general."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I've used GNU software for years and wanted to support the FSF in general."</p></blockquote></div></p>
 <div class="col2">
 <h2 id="campaigns">Campaigns</h2>
 <p>The FSF campaigns team identifies important opportunities for free
@@ -153,7 +146,7 @@ software adoption, education, and development; empowers people against
 specific threats to their freedom; and implements strategies to move
 us closer to a free society. This year welcomed two new members to the
 campaigns team, Greg Farough and Zoë Kooyman.</p>
-<p><img alt="A photo of a panel at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2199/friday-party-busy.jpg"></p>
+<p><img alt="A photo of a panel at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2199/friday-party-busy.jpg"/></p>
 <p class="caption">There are plenty of opportunities to meet and greet during every annual LibrePlanet conference. </p>
 <p class="credit">Credit: Rubén Rodríguez, 2019. CC BY-SA 4.0 </p>
 <h4 id="community-meetings">Community meetings:</h4>
@@ -219,7 +212,7 @@ Deb Nicholson both shared their work, talking about "OpenStreetMap"
 mapping developments and the free software community challenges we
 face.</p>
 </div>
-<hr>
+<hr/>
 <div class="col2">
 <h3 id="international-day-against-drm">International Day Against DRM</h3>
 <p>For IDAD 2019, themed "Right to read," we called on Pearson and other
@@ -240,7 +233,7 @@ encourage all readers to use them, whether on the latest hardcover
 bestseller or the textbook you use in class (while you still have
 one).</p>
 <p>They have been translated into <a href="https://www.defectivebydesign.org/dayagainstdrm/2019/dust-jacket">ten different languages</a>.</p>
-<p><img alt="Photo of two books, both wrapped in a dust jacket that says &quot;Eliminate DRM. Uphold the right to learn.&quot;" class="image-process-article-image" src="https://static.fsf.org/nosvn/dbd/day_against_drm/2019/dj2-2.jpg"></p>
+<p><img alt='Photo of two books, both wrapped in a dust jacket that says "Eliminate DRM. Uphold the right to learn."' class="image-process-article-image" src="https://static.fsf.org/nosvn/dbd/day_against_drm/2019/dj2-2.jpg"/></p>
 <p class="caption">In 2019, we designed dust jackets that you can slip onto a book to help raise awareness around DRM.</p>
 <p class="credit">Credit: Free Software Foundation, 2019. CC BY-SA 3.0</p>
 <div>
@@ -276,10 +269,7 @@ one).</p>
 </div>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Thank you for the <em>Bulletin</em>",
-  "quote": "I received the <em>FSF Bulletin</em> last week and would like to thank you! I really enjoyed reading it. I know it may be costly to produce such a things, but, in my opinion, they are important."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Thank you for the <em>Bulletin</em></h4> <blockquote><p>"I received the <em>FSF Bulletin</em> last week and would like to thank you! I really enjoyed reading it. I know it may be costly to produce such a things, but, in my opinion, they are important."</p></blockquote></div></p>
 <div class="col2">
 <h2 id="tech">Tech</h2>
 <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
@@ -287,7 +277,7 @@ one).</p>
 <ul>
 <li>Email server upgrades: GNU Mailman servers at lists.fsf.org and
   lists.gnu.org were upgraded</li>
-<li>New RYF website: <https://ryf.fsf.org/></li>
+<li>New RYF website: <https: ryf.fsf.org=""></https:></li>
 <li>CIVICRM upgrade: We recently upgraded CiviCRM to its latest
   version. We worked on a script that helps streamline the process of
   rebasing our custom patches onto CiviCRM core.</li>
@@ -336,7 +326,7 @@ forum</a>. The
 forum software we chose to use is Discourse. The JavaScript is free
 software, and a link to all source code can be found in the footer of
 the website.</p>
-<p><img alt="The FSF tech team and several volunteers and attendees pose at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2192/tech-volunteers-hallway.medium.jpg"></p>
+<p><img alt="The FSF tech team and several volunteers and attendees pose at LibrePlanet 2019." class="image-process-article-image" src="https://media.libreplanet.org/mgoblin_media/media_entries/2192/tech-volunteers-hallway.medium.jpg"/></p>
 <p class="caption">Every year at LibrePlanet, technical voluteers and staff work together to keep the conference running smoothly and free.</p>
 <p class="credit">Credit: Anonymous, CC BY 4.0</p>
 <!--
@@ -353,15 +343,15 @@ the website.</p>
 <div class="col2" markdown="1">
 -->
 <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
-<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"></a></p>
+<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"/></a></p>
 <p>The FSF acts as fiscal sponsor for free software projects and events
 whose scope and purpose align with the FSF’s mission. Participating
 projects benefit from the FSF’s nonprofit status, administrative
@@ -371,27 +361,9 @@ software community via the <a href="https://www.fsf.org/working-together/fund">W
 Fund</a>.</p>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "I'm renewing my membership today because over the past two years I've come to realize just how big of a role proprietary software plays in the problems in our society, and I've seen the vitality of free software. I fully support the Foundation in its work."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I'm renewing my membership today because over the past two years I've come to realize just how big of a role proprietary software plays in the problems in our society, and I've seen the vitality of free software. I fully support the Foundation in its work."</p></blockquote></div></p>
 <h2 id="financial-statement">Financial Statement</h2>
-<p>{%
-    matplotlib {
-        "filename": "fa2019",
-        "data" : [
-         {"title": "Program\nServices",
-         "values": 1076394,
-         "colors": "steelblue"},
-         {"title": "Management\nand General",
-         "values": 95105,
-         "colors": "royalblue"},
-         {"title": "Fundraising",
-         "values": 65639,
-         "colors": "dodgerblue"}
-        ]
-    }
-%}</p>
+<p><img alt="A pie chart" class="matplotlib" src="images/fa2019.png"/></p>
 <p>The following is a visualization of the Free Software Foundation's FY
 2019 financial statement. The original documents can be found at
 <a href="https://www.fsf.org/about/financial">https://www.fsf.org/about/financial</a>.</p>
@@ -557,7 +529,6 @@ Fund</a>.</p>
 </div>
 </div>
 <div class="pagebreak"></div>
-
 <h2 id="donors">Donors</h2>
 <p>This page is a snapshot of donors to the FSF. The majority of the
 organization's support each year comes from individuals giving less
@@ -738,12 +709,9 @@ care so much about free software.</p>
   members, and corporate patrons worldwide who make our work possible.</p>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "I value software freedom and the emphasis on controlling your own information."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I value software freedom and the emphasis on controlling your own information."</p></blockquote></div></p>
 <div class="column2">
-<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"></p>
+<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"/></p>
 </div>
 <div class="column2">
 <h2 id="associate-membership">Associate Membership</h2>
@@ -751,7 +719,7 @@ care so much about free software.</p>
 <p>Our mission is to promote computer user freedom and defend the rights
 of all software users, worldwide. Though free software is used more
 widely than ever, it is under threat from a wide range of interests
-that profit from controlling and surveiling computer users. You can
+that profit from controlling and surveilling computer users. You can
 help put control over computers back in the hands of the people who
 use them! Try <a href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements">a free software
 program</a>,
@@ -762,7 +730,6 @@ to free software by <a href="https://my.fsf.org/join">becoming a Free Software F
 Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
 </div>
 <div class="pagebreak"></div>
-
 <h2 id="leadership-and-staff">Leadership and Staff</h2>
 <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
 <h3 id="board-of-directors">Board of Directors</h3>
@@ -784,102 +751,101 @@ Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
 <div class="staffcolumn width-70 float-left">
 <h3 id="leadership">Leadership</h3>
 <div class="staff">
-<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/johns.jpg"></p>
+<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/derivatives/thumb/johns.jpg"/></p>
 <h4 id="john-sullivan">John Sullivan</h4>
 <p>Executive Director</p>
 </div>
 <div class="staff">
-<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/johnh.jpg"></p>
+<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/derivatives/thumb/johnh.jpg"/></p>
 <h4 id="john-hsieh">John Hsieh</h4>
 <p>Deputy Director, Clerk</p>
 </div>
 <div class="staff">
-<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/ruben.jpg"></p>
+<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/derivatives/thumb/ruben.jpg"/></p>
 <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
 <p>Chief Technology Officer </p>
 </div>
 <h3 id="licensing">Licensing</h3>
 <div class="staff">
-<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/donald.jpg"></p>
+<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/derivatives/thumb/donald.jpg"/></p>
 <h4 id="donald-robertson">Donald Robertson</h4>
 <p>Licensing &amp; Compliance Manager</p>
 </div>
 <div class="staff">
-<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/craig.jpg"></p>
+<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/derivatives/thumb/craig.jpg"/></p>
 <h4 id="craig-topham">Craig Topham</h4>
 <p>Copyright &amp; Licensing Associate </p>
 </div>
 <h3 id="campaigns_1">Campaigns</h3>
 <div class="staff">
-<p><img alt="Greg Farough" class="image-process-thumb" src="images/staff/greg.jpg"></p>
+<p><img alt="Greg Farough" class="image-process-thumb" src="images/staff/derivatives/thumb/greg.jpg"/></p>
 <h4 id="greg-farough">Greg Farough</h4>
 <p>Campaigns Manager</p>
 </div>
 <div class="staff">
-<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/dana.jpg"></p>
+<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/derivatives/thumb/dana.jpg"/></p>
 <h4 id="dana-morgenstein">Dana Morgenstein</h4>
 <p>Outreach &amp; Communications Coordinator</p>
 </div>
 <div class="staff">
-<p><img alt="Zoë Kooyman" class="image-process-thumb" src="images/staff/zoe.jpg"></p>
+<p><img alt="Zoë Kooyman" class="image-process-thumb" src="images/staff/derivatives/thumb/zoe.jpg"/></p>
 <h4 id="zoe-kooyman">Zoë Kooyman</h4>
 <p>Program Manager</p>
 </div>
 <h3 id="tech_1">Tech</h3>
 <div class="staff">
-<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/andrew.jpg"></p>
+<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/derivatives/thumb/andrew.jpg"/></p>
 <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
 <p>Senior Systems Administrator</p>
 </div>
 <div class="staff">
-<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/ian.jpg"></p>
+<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/derivatives/thumb/ian.jpg"/></p>
 <h4 id="ian-kelling">Ian Kelling</h4>
 <p>Senior Systems Administrator</p>
 </div>
 <div class="staff">
-<p><img alt="Michael McMahon" class="image-process-thumb" src="images/staff/michael.jpg"></p>
+<p><img alt="Michael McMahon" class="image-process-thumb" src="images/staff/derivatives/thumb/michael.jpg"/></p>
 <h4 id="michael-mcmahon">Michael McMahon</h4>
 <p>Web Developer</p>
 </div>
 <h3 id="operations">Operations</h3>
 <div class="staff">
-<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/mattlav.jpg"></p>
+<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/derivatives/thumb/mattlav.jpg"/></p>
 <h4 id="matt-lavallee">Matt Lavallee</h4>
 <p>Operations Assistant</p>
 </div>
 <div class="staff">
-<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/jeanne.jpg"></p>
+<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/derivatives/thumb/jeanne.jpg"/></p>
 <h4 id="jeanne-rasata">Jeanne Rasata</h4>
 <p>Assistant to the President</p>
 </div>
 <div class="staff">
-<p><img alt="Dawn Bryanton Peterson" class="image-process-thumb" src="images/staff/dawn.jpg"></p>
+<p><img alt="Dawn Bryanton Peterson" class="image-process-thumb" src="images/staff/derivatives/thumb/dawn.jpg"/></p>
 <h4 id="dawn-bryanton-peterson">Dawn Bryanton Peterson</h4>
 <p>Business Operations Manager</p>
 </div>
 </div>
-      </article>
+</article>
 </div>
 <footer class="bside-footer">
- <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
-  <div>
-    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-    <p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-  </div>
-
-  <nav>
-          <ul class="menu">
-	    <li><a class="highlight" href="FY2019.html">FY2019 Annual Report</a></li>
-            <li><a href="#licensing">Licensing</a></li>
-            <li><a href="#campaigns">Campaigns</a></li>
-            <li><a href="#tech">Tech</a></li>
-            <li><a href="#financials">Financials</a></li>
-            <li><a href="#donors">Donors</a></li>
-            <li><a href="#associate-membership">Join the FSF</a></li>
-	    <li><a href="extra/2019.pdf">⬇ PDF</a></li>
-          </ul>
-  </nav>
+<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
+<div>
+<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+<p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+</div>
+<nav>
+<ul class="menu">
+<li><a class="highlight" href="FY2019.html">FY2019 Annual Report</a></li>
+<li><a href="#licensing">Licensing</a></li>
+<li><a href="#campaigns">Campaigns</a></li>
+<li><a href="#tech">Tech</a></li>
+<li><a href="#financials">Financials</a></li>
+<li><a href="#donors">Donors</a></li>
+<li><a href="#associate-membership">Join the FSF</a></li>
+<li><a href="extra/2019.pdf">⬇ PDF</a></li>
+</ul>
+</nav>
 </footer>
-  </body>
+</body>
 </html>
\ No newline at end of file
diff --git a/output/FY2020.html b/output/FY2020.html
index 0bedd00..3843c4e 100644
--- a/output/FY2020.html
+++ b/output/FY2020.html
@@ -1,58 +1,54 @@
 <!DOCTYPE html>
+
 <html lang="en">
-  <head>
-    <title>FY2020 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet">
+<head>
+<title>FY2020 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <style>
 :root {
 	--background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg;
 }
 </style>
-<meta charset="utf-8">
-<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
-  <body>
+<meta charset="utf-8"/>
+<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
+<body>
 <header class="top-menu no-print">
-  <nav class="top-menu">
-    <ul>
-            <li><a class="highlight" href="/">Index of reports</a></li>
-            <li><a href="#">FY2020</a></li>
-            <li><a href="#toc">Table of Contents</a></li>
-            <li><a href="#associate-membership">Join the fsf</a></li>
-            <li><a href="extra/2020.pdf">⬇PDF</a></li>
-    </ul>
-  </nav>
+<nav class="top-menu">
+<ul>
+<li><a class="highlight" href="/">Index of reports</a></li>
+<li><a href="#">FY2020</a></li>
+<li><a href="#toc">Table of Contents</a></li>
+<li><a href="#associate-membership">Join the fsf</a></li>
+<li><a href="extra/2020.pdf">⬇PDF</a></li>
+</ul>
+</nav>
 </header>
-    <div class="document">
-      <div id="head">
-      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
-      <h1 class="title">FY2020 Annual Report</h1>
-      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2020</p></div>
-      <div class="dates"><p>(October 1, 2019 - September 30, 2020)</p></div>
-        <div class="grid">
-         <div class="column">
-          <h4><a href="#licensing">Licensing</a></h4>
-          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-         </div>
-         <div class="column">
-          <h4><a href="#campaigns">Campaigns</a></h4>
-          <p>Empowering you to understand, adopt, develop, and defend free software</p>
-         </div>
-         <div class="column">
-          <h4><a href="#tech">Tech</a></h4>
-          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-         </div>
-         <div class="column">
-           <h4><a href="#financials">Operations</a></h4>
-           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-         </div>
-        </div>
-        <div style="clear:both"></div>      </div>
-      <article>
-        <p>{% comment {</p>
-<p>Copyright (c) 2023 Free Software Foundation, Inc.</p>
-<p>This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
-  International license (https://creativecommons.org/licenses/by-sa/4.0/)</p>
-<p>}%}</p>
+<div class="document">
+<div id="head">
+<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
+<h1 class="title">FY2020 Annual Report</h1>
+<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2020</p></div>
+<div class="dates"><p>(October 1, 2019 - September 30, 2020)</p></div>
+<div class="grid">
+<div class="column">
+<h4><a href="#licensing">Licensing</a></h4>
+<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+</div>
+<div class="column">
+<h4><a href="#campaigns">Campaigns</a></h4>
+<p>Empowering you to understand, adopt, develop, and defend free software</p>
+</div>
+<div class="column">
+<h4><a href="#tech">Tech</a></h4>
+<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+</div>
+<div class="column">
+<h4><a href="#financials">Operations</a></h4>
+<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+</div>
+</div>
+<div style="clear:both"></div> </div>
+<article>
 <blockquote>
 <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.html">"as in freedom"</a> software.</p>
 <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2020 (October 1, 2019 — September 30, 2020) and includes a detailed financial statement.</p>
@@ -91,16 +87,16 @@ on much of the <a href="https://www.gnu.org/">GNU operating system</a>. The
 licensing team spent the year accepting copyright assignments from
 software developers and corporations, investigating GPL violations,
 and answering licensing questions from the community.</p>
-<p>Copyright &amp; licensing associate Craig Topham ecorded his first oggcast
-with the <a href="https://flossforscience.com/about/">FLOSS for science
+<p>Copyright &amp; licensing associate Craig Topham recorded his first
+oggcast with the <a href="https://flossforscience.com/about/">FLOSS for science
 podcast</a> out of Louisiana State
-University. It is available on the <a href="https://flossforscience.com/podcast/season3-epsiode-5">FLOSS for science Web
-site</a>.</p>
+University. It is available on the <a href="https://flossforscience.com/podcast/season3-epsiode-5">FLOSS for science
+website</a>.</p>
 <p>Finally, we updated our materials for our CLE seminars, making them
 more accessible as an ongoing resource. We also updated an entry on
 trade secrets in the GPL FAQ, as well as updates for other resources
 such as our license recommendation page.</p>
-<p><img alt="John Sullivan speaking at the FSF Continuing Legal Education Seminar in Raleigh, NC." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/john-cle.jpg"></p>
+<p><img alt="John Sullivan speaking at the FSF Continuing Legal Education Seminar in Raleigh, NC." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/john-cle.jpg"/></p>
 <p class="caption">John Sullivan, Executive Director of the FSF, does a presentation at the FSF Continuing Legal Education Seminar in Raleigh, North Carolina, in October 2019.</p>
 <p class="credit">Credit: Free Software Foundation, 2019. CC BY-SA 4.0 </p>
 </div>
@@ -108,53 +104,50 @@ such as our license recommendation page.</p>
 <h3 id="fy2020-at-a-glance">FY2020 at a glance</h3>
 <dl>
 <dt>241</dt>
-<dd>copyright assignments and disclaimers accepted  </dd>
+<dd>copyright assignments and disclaimers accepted</dd>
 <dt>10</dt>
-<dd>articles and blog posts published  </dd>
+<dd>articles and blog posts published</dd>
 <dt>121</dt>
-<dd>reports of GNU license violations investigated  </dd>
+<dd>reports of GNU license violations investigated</dd>
 <dt>3</dt>
-<dd>devices certified to Respect Your Freedom  </dd>
+<dd>devices certified to Respect Your Freedom</dd>
 <dt>1</dt>
-<dd>continuing legal education seminar conducted in Raleigh, North Carolina  </dd>
+<dd>continuing legal education seminar conducted in Raleigh, North Carolina</dd>
 <dt>16,355 packages</dt>
 <dd>packages in the Free Software Directory</dd>
 <dt>44,226</dt>
-<dd>unique visitors to RYF Web site</dd>
+<dd>unique visitors to RYF website</dd>
 </dl>
 </div>
 <div class="col1">
 <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
-<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"></p>
+<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"/></p>
 <p>The FSF's Respects Your Freedom (RYF) product certification program
 encourages the creation and sale of hardware that will do as much as
 possible to respect your freedom and privacy.</p>
 <p>In FY20, we certified three devices, the Talos II and Talos II lite
 from Raptor Engineering and the Wi-Fri ND2H Wi-Fi card from Libiquity.</p>
-<p>The new RYF Web page launched November 2019. The new site enables
-users to browse and search by categories and retailers, and makes
-finding what they are looking for simpler.</p>
+<p>The new RYF webpage launched November 2019. The new site enables users
+to browse and search by categories and retailers, and makes finding
+what they are looking for simpler.</p>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "I believe in Free Software!"
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I believe in Free Software!"</p></blockquote></div></p>
 <div class="col2">
 <h2 id="campaigns">Campaigns</h2>
-<h4 id="new-videos">New videos</h4>
+<h3 id="new-videos">New videos</h3>
 <p>The campaigns team released two new videos to help educate the public
 about free software. One is <a href="https://www.fsf.org/blogs/community/the-university-of-costumed-heroes-a-video-from-the-fsf"><em>The university of costumed
 heroes</em></a>,
 and the other is
-<a href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf">Shoetool</a></p>
+<a href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf"><em>Shoetool</em></a>.</p>
 <h3 id="special-events">Special events</h3>
 <p>In addition to our annual LibrePlanet conference, we celebrated the
 <a href="https://www.fsf.org/bulletin/2020/fall/fsf-at-35-why-free-software-matters-more-than-ever">FSF's
 thirty-fifth</a>
 anniversary online. Videos from the event are available on our <a href="https://media.libreplanet.org/u/libreplanet/tag/fsf35/">media
 archive site</a>.</p>
-<h4 id="community-engagements">Community engagements</h4>
+<h3 id="community-engagements">Community engagements</h3>
 <p>Zoë, John Hsieh, and John Sullivan joined a community meeting for the
 "FOSS Responders" working group. Due to the coronavirus and the FSF
 staff being out of office, the campaigns team did not host any other
@@ -167,64 +160,34 @@ with seven new interviews with prominent community members.</p>
 collective is the developer of Peertube, and the FSF is the only
 account on their personal server, chosen because of their respect for
 our commitment to free software.</p>
-</div>
-<div class="pagebreak"></div>
-<div class="col2">
-<h3 id="libreplanet-2020-free-the-future">LibrePlanet 2020: Free the Future</h3>
-<h4 id="lp2020-tech-updates-and-pandemic-response">LP2020 tech updates and pandemic response</h4>
-<p>The tech team switched gears a week before the conference to make an
-entirely digital conference. The methods originally used in the past
-to host remote speakers were reused to be able to host multiple remote
-speakers and slides while separately recording and streaming to a
-large audience. The system, which combines Jitsi Meet, IceCast2 and
-GStreamer custom scripts, was also documented and used as inspiration
-for other organizations that also moved to host online conferences
-this year.</p>
-<p>For the first time, we published an audio-only version of the talks
-from LibrePlanet 2020 to MediaGoblin.</p>
-<p>During the event, special attention was needed to mitigate an ongoing
-distributed denial-of service (DDoS) attack, which required taking
-multiple firewall and network routing countermeasures.</p>
-<p>We secured funding through the NLnet Foundation to start a project to
-develop a browser extension that can limit the functionality of the
-JavaScript engine, so potentially dangerous operations are disabled or
-altered so the user can run unknown scripts in a safer way. This is
-intended as a companion for LibreJS, as harmful scripts can exist
-regardless of their license. After securing funding, a similar project
-was found, and we are currently getting in contact with their authors
-to combine efforts; the project will be completed in FY21.</p>
-<h3 id="international-day-against-drm">International Day Against DRM</h3>
+<h3 id="international-day-against-drm-idad">International Day Against DRM (IDAD)</h3>
 <p>This year's IDAD saw the campaign targeting Netflix and streaming
 services generally, and like last year we encouraged our community to
-do two things: an action in protest of something we oppose, and asking
-them to participate in a "constructive" way to promote freedom. Last
-year, we paired our protest against Pearson with a hackathon on free
-culture textbooks. This year, we encouraged our community to call
-Netflix customer service and voice their opposition to DRM. Since this
-action was over the phone, we can't gather precise numbers, but we
-know that the Netflix call center we targeted was taken offline as a
-result of the protest, due to high call volume. This is a success for
-which we should be proud.</p>
+do two things:</p>
+<p>The first was to protest DRM and, instead, participate in a
+<em>constructive</em> way to promote freedom. Last year, we paired our
+protest against Pearson with a hackathon on free culture
+textbooks. This year, we encouraged our community to call Netflix
+customer service and voice their opposition to DRM. Since this action
+was over the phone, we couldn't gather precise numbers, but we know
+that the Netflix call center we targeted was taken offline as a result
+of the protest, due to high call volume. This is a success for which
+we should be proud.</p>
 <p>The second action we asked the community to participate in was a
-session on anti-DRM advocacy over BigBlueButton. We decided to do this
-fairly late in the IDAD planning stage, as until the FSF35 event, we
-didn't have enough experience with BigBlueButton to feel confident in
-including it. However, thanks to the great response we received for
-our FSF35 session, we decided to do one for IDAD as well. This was
-very well-attended for something that was first announced only in a
-later IDAD post. The session peaked at 54 participants from 5
-different countries, several of whom joined Zoë and Greg in the
-audio/video chat to share their experiences and advice campaigning
-against DRM. Due to the positive response, we even let the session
-continue an hour after it was scheduled to end. In general, the
-experience was a great demonstration of how much interest in software
-freedom issues can be generated in informal discussions with the
-community.</p>
-<p>Together with ANSOL, a Portuguese free software organization, we also
-encouraged people to document any active DRM legislation or court
-cases on the LibrePlanet wiki. This has helped us get information on
-how pervasive DRM is outside the US and EU, and in particular, we
-received good responses from Brazilian supporters of our campaign.</p>
+session on anti-DRM advocacy over BigBlueButton. The session peaked at
+fifty-four simultaneous participants from five different countries,
+several of whom joined Zoë and Greg in the audio/video chat to share
+their experiences and advice campaigning against DRM. Due to the
+positive response, we even let the session continue an hour after it
+was scheduled to end. In general, the experience was a great
+demonstration of how much interest in software freedom issues can be
+generated in informal discussions with the community.</p>
+<p>Additionally, together with ANSOL, a Portuguese free software
+organization, we encouraged people to document any active DRM
+legislation or court cases on the LibrePlanet wiki. This has helped us
+get information on how pervasive DRM is outside the US and EU, and, in
+particular, we received good responses from Brazilian supporters of
+our campaign.</p>
 <p>Eight other organizations outside the FSF participated in this year's
 IDAD. Several of these organizations posted anti-DRM blog posts in
 support of the event. These included <a href="https://creativecommons.org/2020/12/04/were-against-digital-rights-management-heres-why/">Creative
@@ -233,11 +196,12 @@ Commons</a>,
 and
 <a href="https://www.april.org/en/international-day-against-drm-friday-december-4th-2020">April</a>,
 among others.</p>
-<p><img alt="Screenshot of BBB discussion with Pouhiou and Eda Nano of Framasoft for FSF35 anniversary event.&quot;" class="image-process-article-image" src="https://static.fsf.org/nosvn/fy20photos/bbb-framasoft.png"></p>
+<p><img alt='Screenshot of BBB discussion with Pouhiou and Eda Nano of Framasoft for FSF35 anniversary event."' class="image-process-article-image" src="https://static.fsf.org/nosvn/fy20photos/bbb-framasoft.png"/></p>
 <p class="caption">The FSF held a number of online activities in 2020, utilizing free software tools such as BigBlueButton.</p>
 <p class="credit">Credit: Free Software Foundation, 2023. CC BY-SA 4.0</p>
 </div>
-<div class="column2">
+<div class="pagebreak"></div>
+<div class="col2">
 <h3 id="fy2020-at-a-glance_1">FY2020 at a glance</h3>
 <dl>
 <dt>137</dt>
@@ -252,8 +216,6 @@ among others.</p>
 <dt>192,853</dt>
 <dd>September, 2020</dd>
 </dl>
-</div>
-<div class="column2">
 <h3 id="libreplanet-2020">LibrePlanet 2020</h3>
 <dl>
 <dt>339</dt>
@@ -265,13 +227,33 @@ among others.</p>
 </dl>
 </div>
 <div class="pagebreak"></div>
-
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "Supporting the future of GNU, and I want to use the email forwarding service when contributing to projects."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Supporting the future of GNU, and I want to use the email forwarding service when contributing to projects."</p></blockquote></div></p>
 <div class="col2">
 <h2 id="tech">Tech</h2>
+<h3 id="libreplanet-2020-free-the-future">LibrePlanet 2020: Free the Future</h3>
+<h4 id="lp2020-tech-updates-and-pandemic-response">LP2020 tech updates and pandemic response</h4>
+<p>The tech team switched gears a week before the conference to make an
+entirely digital conference. The methods originally used in the past
+to host remote speakers were reused to be able to host multiple remote
+speakers and slides while separately recording and streaming to a
+large audience. The system, which combines Jitsi Meet, IceCast2, and
+GStreamer custom scripts, was also documented and used as inspiration
+for other organizations that also moved to host online conferences
+this year.</p>
+<p>For the first time, we published an audio-only version of the talks
+from LibrePlanet 2020 to MediaGoblin.</p>
+<p>During LibrePlanet, special attention was needed to mitigate an
+ongoing distributed denial-of-service (DDoS) attack, which required
+taking multiple firewall and network routing countermeasures.</p>
+<p>Also in FY20, we secured funding through the NLnet Foundation to start
+a project to develop a browser extension that can limit the
+functionality of the JavaScript engine, so potentially dangerous
+operations are disabled or altered so the user can run unknown scripts
+in a safer way. This is intended as a companion for LibreJS, as
+harmful scripts can exist regardless of their license. After securing
+funding, a similar project was found, and we are currently getting in
+contact with their authors to combine efforts; the project will be
+completed in FY21.</p>
 <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
 <p>The FSF tech team maintains and improves the infrastructure that runs
 both the Foundation's daily operations and the <a href="https://www.gnu.org/">GNU
@@ -296,9 +278,9 @@ thrive using solely free software.</p>
 <p>We launched a new video conference service as a member's benefit. A
   Jitsi Meet server was built and associated with the membership
   credentials system, with good reception from the public. The changes
-  made to Jitsi Meet improved upong its freedom (LibreJS) and privacy
-  (i.e. removing anti-features and 3rd party services), which were
-  made publicly available.</p>
+  made to Jitsi Meet improved upon its freedom (i.e. allowing it to
+  work with LibreJS enabled) and privacy (i.e. removing anti-features
+  and 3rd party services), which were made publicly available.</p>
 </li>
 <li>
 <p>Research on video conference sites for education and social use:
@@ -321,7 +303,7 @@ the COVID-19 pandemic. We wrote
 <a href="https://www.fsf.org/blogs/community/hackers-and-hospitals-how-you-can-help">two</a>
 <a href="https://www.fsf.org/bulletin/2020/spring/hackers-and-hospitals">articles</a>
 and gave one talk at the at the <a href="https://media.libreplanet.org/u/libreplanet/m/hackers-and-hospitals/"><em>Flatten The Curve</em>
-summit</a></p>
+summit</a>.</p>
 <h4 id="bulletin-now-online">Bulletin now online</h4>
 <p>We designed and launched an <a href="https://magazine.fsf.org/2020-spring/">magazine-style site for the
 <em>Bulletin</em></a> in collaboration
@@ -345,7 +327,7 @@ with the campaigns team.</p>
 maintaining gnu.org with the help of volunteers, and working with
 interns who are advancing their skills and knowledge in working with
 and creating free software.</p>
-<p><img alt="FSF Web Developer Michael McMahon poses with the 3D printers in his garage that are being used to manufacture protective gear and medical supplies in the HACKERS and HOSPITALS initiative.." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/michael-cover.jpg"></p>
+<p><img alt="FSF Web Developer Michael McMahon poses with the 3D printers in his garage that are being used to manufacture protective gear and medical supplies in the HACKERS and HOSPITALS initiative." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/michael-cover.jpg"/></p>
 <p class="caption">In response to the COVID-19 pandemic, free software supporters took swift action to assist hospitals by creating protective gear.</p>
 <p class="credit">Credit: Javier Sepulveda, 2020. Photo used with permission. </p>
 </div>
@@ -373,7 +355,7 @@ method for managing cryptocurrency wallets for the Foundation.</p>
 <p>The main infrastructure firewalls were redesigned with a much more
 strict set of policies, including blocking all unexpected outgoing
 traffic.</p>
-<p><img alt="The FSF tech team helps brings server hardware to life as part of the migration to a new colocation facility, June 2019." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/IMG_20190701_142702-techteamcolo.jpg"></p>
+<p><img alt="The FSF tech team helps brings server hardware to life as part of the migration to a new colocation facility, June 2019." class="image-process-article-image" src="https://static.fsf.org/nosvn/magazine/2020-spring/images/IMG_20190701_142702-techteamcolo.jpg"/></p>
 <p class="caption">In 2020, we added a KVM server to our 'gnuhope' stack, which allows us to run more virtual machines in the newer cluster.</p>
 <p class="credit">Credit: Rubén Rodríguez, 2020. CC BY-SA 4.0</p>
 </div>
@@ -389,15 +371,15 @@ treat everyone as a EU resident for the purpose of privacy policies,
 drafted and applied a new privacy policy, and added links to it from
 all relevant pages and sites.</p>
 <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
-<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"></a></p>
+<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=16"><img alt="GNU Radio logo" src="images/gnuradio.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=21"><img alt="GNUstep" src="https://static.fsf.org/nosvn/images/GNUstep_logo.png"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=58"><img alt="SeaGL logo" src="images/seagl.png"/></a></p>
 <p>The FSF acts as fiscal sponsor for free software projects and events
 whose scope and purpose align with the FSF’s mission. Participating
 projects benefit from the FSF’s nonprofit status, administrative
@@ -407,30 +389,11 @@ software community via the <a href="https://www.fsf.org/working-together/fund">W
 Fund</a>.</p>
 </div>
 <div class="pagebreak"></div>
-
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "Free software is necessary for personal freedom and freedom of information. It is our best tool to fight against mass survelliance and authoritarian states."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Free software is necessary for personal freedom and freedom of information. It is our best tool to fight against mass surveillance and authoritarian states."</p></blockquote></div></p>
 <h2 id="financial-statement">Financial Statement</h2>
-<p>{%
-    matplotlib {
-        "filename": "fa2020",
-        "data" : [
-         {"title": "Program\nServices",
-         "values": 1076394,
-         "colors": "steelblue"},
-         {"title": "Management\nand General",
-         "values": 95105,
-         "colors": "royalblue"},
-         {"title": "Fundraising",
-         "values": 65639,
-         "colors": "dodgerblue"}
-        ]
-    }
-%}</p>
-<p>The following is a visualization of the Free Software Foundation's FY
-2020 financial statement. The original documents can be found at
+<p><img alt="A pie chart" class="matplotlib" src="images/fa2020.png"/></p>
+<p>The following is a visualization of the Free Software Foundation's
+FY2020 financial statement. The original documents can be found at
 <a href="https://www.fsf.org/about/financial">https://www.fsf.org/about/financial</a>.</p>
 <div class="nocollapse" style="clear:both">
 <div class="column3">
@@ -765,7 +728,7 @@ care so much about free software.</p>
   "quote": "The FSF gives me hope today, and by joining, I want to support not just free software, but also freedom, justice and equality throughout the world."
 }%}</p>
 <div class="column2">
-<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"></p>
+<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"/></p>
 </div>
 <div class="column2">
 <h2 id="associate-membership">Associate Membership</h2>
@@ -773,7 +736,7 @@ care so much about free software.</p>
 <p>Our mission is to promote computer user freedom and defend the rights
 of all software users, worldwide. Though free software is used more
 widely than ever, it is under threat from a wide range of interests
-that profit from controlling and surveiling computer users. You can
+that profit from controlling and surveilling computer users. You can
 help put control over computers back in the hands of the people who
 use them! Try <a href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements">a free software
 program</a>,
@@ -787,7 +750,7 @@ Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
 <h2 id="leadership-and-staff">Leadership and Staff</h2>
 <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
 <h3 id="board-of-directors">Board of Directors</h3>
-<p><img alt="Geoffrey Knauth" class="width-50 colortone" src="https://web.archive.org/web/20200928074435im_/https://static.fsf.org/nosvn/images/staff-photos/board/geoff-in-maryland.jpg"></p>
+<p><img alt="Geoffrey Knauth" class="width-50 colortone" src="https://web.archive.org/web/20200928074435im_/https://static.fsf.org/nosvn/images/staff-photos/board/geoff-in-maryland.jpg"/></p>
 <h4 id="geoffrey-knauth">Geoffrey Knauth</h4>
 <p>President and Treasurer</p>
 <h4 id="alexandre-oliva">Alexandre Oliva</h4>
@@ -804,103 +767,102 @@ Member</a>. Learn more at <a href="https://fsf.org">https://fsf.org</a>.</p>
 <div class="staffcolumn width-70 float-left">
 <h3 id="leadership">Leadership</h3>
 <div class="staff">
-<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/johns.jpg"></p>
+<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/derivatives/thumb/johns.jpg"/></p>
 <h4 id="john-sullivan">John Sullivan</h4>
 <p>Executive Director</p>
 </div>
 <div class="staff">
-<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/johnh.jpg"></p>
+<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/derivatives/thumb/johnh.jpg"/></p>
 <h4 id="john-hsieh">John Hsieh</h4>
 <p>Deputy Director</p>
 </div>
 <div class="staff">
-<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/ruben.jpg"></p>
+<p><img alt="Rubén Rodríguez" class="image-process-thumb" src="images/staff/derivatives/thumb/ruben.jpg"/></p>
 <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
 <p>Chief Technology Officer </p>
 </div>
 <h3 id="licensing">Licensing</h3>
 <div class="staff">
-<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/donald.jpg"></p>
+<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/derivatives/thumb/donald.jpg"/></p>
 <h4 id="donald-robertson">Donald Robertson</h4>
 <p>Licensing &amp; Compliance Manager</p>
 </div>
 <div class="staff">
-<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/craig.jpg"></p>
+<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/derivatives/thumb/craig.jpg"/></p>
 <h4 id="craig-topham">Craig Topham</h4>
 <p>Copyright &amp; Licensing Associate </p>
 </div>
 <h3 id="campaigns_1">Campaigns</h3>
 <div class="staff">
-<p><img alt="Greg Farough" class="image-process-thumb" src="images/staff/greg.jpg"></p>
+<p><img alt="Greg Farough" class="image-process-thumb" src="images/staff/derivatives/thumb/greg.jpg"/></p>
 <h4 id="greg-farough">Greg Farough</h4>
 <p>Campaigns Manager</p>
 </div>
 <div class="staff">
-<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/dana.jpg"></p>
+<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/derivatives/thumb/dana.jpg"/></p>
 <h4 id="dana-morgenstein">Dana Morgenstein</h4>
 <p>Outreach &amp; Communications Coordinator</p>
 </div>
 <div class="staff">
-<p><img alt="Zoë Kooyman" class="image-process-thumb" src="images/staff/zoe.jpg"></p>
+<p><img alt="Zoë Kooyman" class="image-process-thumb" src="images/staff/derivatives/thumb/zoe.jpg"/></p>
 <h4 id="zoe-kooyman">Zoë Kooyman</h4>
 <p>Program Manager</p>
 </div>
 <h3 id="tech_1">Tech</h3>
 <div class="staff">
-<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/andrew.jpg"></p>
+<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/derivatives/thumb/andrew.jpg"/></p>
 <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
 <p>Senior Systems Administrator</p>
 </div>
 <div class="staff">
-<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/ian.jpg"></p>
+<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/derivatives/thumb/ian.jpg"/></p>
 <h4 id="ian-kelling">Ian Kelling</h4>
 <p>Senior Systems Administrator</p>
 </div>
 <div class="staff">
-<p><img alt="Michael McMahon" class="image-process-thumb" src="images/staff/michael.jpg"></p>
+<p><img alt="Michael McMahon" class="image-process-thumb" src="images/staff/derivatives/thumb/michael.jpg"/></p>
 <h4 id="michael-mcmahon">Michael McMahon</h4>
 <p>Web Developer</p>
 </div>
 <h3 id="operations">Operations</h3>
 <div class="staff">
-<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/mattlav.jpg"></p>
+<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/derivatives/thumb/mattlav.jpg"/></p>
 <h4 id="matt-lavallee">Matt Lavallee</h4>
 <p>Operations Assistant</p>
 </div>
 <div class="staff">
-<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/jeanne.jpg"></p>
+<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/derivatives/thumb/jeanne.jpg"/></p>
 <h4 id="jeanne-rasata">Jeanne Rasata</h4>
 <p>Membership Coordinator </p>
 </div>
 <div class="staff">
-<p><img alt="Dawn Bryanton Peterson" class="image-process-thumb" src="images/staff/dawn.jpg"></p>
+<p><img alt="Dawn Bryanton Peterson" class="image-process-thumb" src="images/staff/derivatives/thumb/dawn.jpg"/></p>
 <h4 id="dawn-bryanton-peterson">Dawn Bryanton Peterson</h4>
 <p>Business Operations Manager</p>
 </div>
 </div>
 </div>
-      </article>
+</article>
 </div>
 <footer class="bside-footer">
- <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
-  <div>
-    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-    <p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-  </div>
-
-  <nav>
-          <ul class="menu">
-	    <li><a class="highlight" href="FY2020.html">FY2020 Annual Report</a></li>
-            <li><a href="#licensing">Licensing</a></li>
-            <li><a href="#campaigns">Campaigns</a></li>
-            <li><a href="#tech">Tech</a></li>
-            <li><a href="#financials">Financials</a></li>
-            <li><a href="#donors">Donors</a></li>
-            <li><a href="#associate-membership">Join the FSF</a></li>
-	    <li><a href="extra/2020.pdf">⬇ PDF</a></li>
-          </ul>
-  </nav>
+<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
+<div>
+<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+<p>Download the <a href="https://vcs.fsf.org/?p=financial-reports.git">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+</div>
+<nav>
+<ul class="menu">
+<li><a class="highlight" href="FY2020.html">FY2020 Annual Report</a></li>
+<li><a href="#licensing">Licensing</a></li>
+<li><a href="#campaigns">Campaigns</a></li>
+<li><a href="#tech">Tech</a></li>
+<li><a href="#financials">Financials</a></li>
+<li><a href="#donors">Donors</a></li>
+<li><a href="#associate-membership">Join the FSF</a></li>
+<li><a href="extra/2020.pdf">⬇ PDF</a></li>
+</ul>
+</nav>
 </footer>
-  </body>
+</body>
 </html>
\ No newline at end of file
diff --git a/output/author/free-software-foundation.html b/output/author/free-software-foundation.html
index f5dc36b..56a52f0 100644
--- a/output/author/free-software-foundation.html
+++ b/output/author/free-software-foundation.html
@@ -1,69 +1,68 @@
 <!DOCTYPE html>
+
 <html lang="en">
-  <head>
-    <title>Free Software Foundation - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet">
-<meta charset="utf-8">
-<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-wide.css" rel="stylesheet">  </head>
-  <body>
+<head>
+<title>Free Software Foundation - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
+<meta charset="utf-8"/>
+<meta content="width=680" name="viewport"><link href="./theme/css/b-side-wide.css" rel="stylesheet"/> </meta></head>
+<body>
 <header class="top-menu no-print">
-  <nav class="top-menu">
-    <ul>
-            <li><a href="#">Free Software Foundation Annual Reports</a></li>
-            <li><a href="https://my.fsf.org">Join the fsf</a></li>
-    </ul>
-  </nav>
+<nav class="top-menu">
+<ul>
+<li><a href="#">Free Software Foundation Annual Reports</a></li>
+<li><a href="https://my.fsf.org">Join the fsf</a></li>
+</ul>
+</nav>
 </header>
-  <section>
-  	<div>
-	  <h1>Free Software Foundation</h1>  	  
+<section>
+<div>
+<h1>Free Software Foundation</h1>
 <div class="bside-summary">
 <h2><a href="/FY2020.html" rel="bookmark">Fiscal year 2020</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2023-06-15T10:20:00-04:00">October 1, 2019 - September 30, 2020</time></em></li>
-	<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2023-06-15T10:20:00-04:00">October 1, 2019 - September 30, 2020</time></em></li>
+<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="/FY2019.html" rel="bookmark">Fiscal year 2019</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2023-06-14T10:20:00-04:00">October 1, 2018 - September 30, 2019</time></em></li>
-	<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2023-06-14T10:20:00-04:00">October 1, 2018 - September 30, 2019</time></em></li>
+<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="/FY2018.html" rel="bookmark">Fiscal year 2018</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2023-06-13T10:20:00-04:00">October 1, 2017 - September 30, 2018</time></em></li>
-	<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2023-06-13T10:20:00-04:00">October 1, 2017 - September 30, 2018</time></em></li>
+<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
-	<li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
+<li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY16_LR.pdf" rel="bookmark">Fiscal year 2016</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2016-12-05T10:20:00-05:00">October 1, 2015 - September 30, 2016</time></em></li>
-	<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2016-12-05T10:20:00-05:00">October 1, 2015 - September 30, 2016</time></em></li>
+<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY2015_annual_report_LR.pdf" rel="bookmark">Fiscal year 2015</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2015-12-05T10:20:00-05:00">October 1, 2014 - September 30, 2015</time></em></li>
-	<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2015-12-05T10:20:00-05:00">October 1, 2014 - September 30, 2015</time></em></li>
+<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">Sources and materials</a></li>
 </ul>
-</div>  	</div>
-  </section>
-
+</div> </div>
+</section>
 <footer class="bside-footer">
- <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
-  <div>
-    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-    <p>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-  </div>
-
+<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
+<div>
+<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+<p>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+</div>
 </footer>
-  </body>
+</body>
 </html>
\ No newline at end of file
diff --git a/output/fy2015.html b/output/fy2015.html
index e379caa..b9b05fd 100644
--- a/output/fy2015.html
+++ b/output/fy2015.html
@@ -1,71 +1,70 @@
 <!DOCTYPE html>
+
 <html lang="en">
-  <head>
-    <title>FY2015 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet">
-<meta charset="utf-8">
-<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
-  <body>
+<head>
+<title>FY2015 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
+<meta charset="utf-8"/>
+<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
+<body>
 <header class="top-menu no-print">
-  <nav class="top-menu">
-    <ul>
-            <li><a class="highlight" href="/">Index of reports</a></li>
-            <li><a href="#">FY2015</a></li>
-            <li><a href="#toc">Table of Contents</a></li>
-            <li><a href="#associate-membership">Join the fsf</a></li>
-            <li><a href="extra/2015.pdf">⬇PDF</a></li>
-    </ul>
-  </nav>
+<nav class="top-menu">
+<ul>
+<li><a class="highlight" href="/">Index of reports</a></li>
+<li><a href="#">FY2015</a></li>
+<li><a href="#toc">Table of Contents</a></li>
+<li><a href="#associate-membership">Join the fsf</a></li>
+<li><a href="extra/2015.pdf">⬇PDF</a></li>
+</ul>
+</nav>
 </header>
-    <div class="document">
-      <div id="head">
-      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
-      <h1 class="title">FY2015 Annual Report</h1>
-      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2015</p></div>
-      <div class="dates"><p>(October 1, 2014 - September 30, 2015)</p></div>
-        <div class="grid">
-         <div class="column">
-          <h4><a href="#licensing">Licensing</a></h4>
-          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-         </div>
-         <div class="column">
-          <h4><a href="#campaigns">Campaigns</a></h4>
-          <p>Empowering you to understand, adopt, develop, and defend free software</p>
-         </div>
-         <div class="column">
-          <h4><a href="#tech">Tech</a></h4>
-          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-         </div>
-         <div class="column">
-           <h4><a href="#financials">Operations</a></h4>
-           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-         </div>
-        </div>
-        <div style="clear:both"></div>      </div>
-      <article>
-        
-      </article>
+<div class="document">
+<div id="head">
+<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
+<h1 class="title">FY2015 Annual Report</h1>
+<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2015</p></div>
+<div class="dates"><p>(October 1, 2014 - September 30, 2015)</p></div>
+<div class="grid">
+<div class="column">
+<h4><a href="#licensing">Licensing</a></h4>
+<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+</div>
+<div class="column">
+<h4><a href="#campaigns">Campaigns</a></h4>
+<p>Empowering you to understand, adopt, develop, and defend free software</p>
+</div>
+<div class="column">
+<h4><a href="#tech">Tech</a></h4>
+<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+</div>
+<div class="column">
+<h4><a href="#financials">Operations</a></h4>
+<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+</div>
+</div>
+<div style="clear:both"></div> </div>
+<article>
+</article>
 </div>
 <footer class="bside-footer">
- <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
-  <div>
-    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-    <p>Download the <a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-  </div>
-
-  <nav>
-          <ul class="menu">
-	    <li><a class="highlight" href="fy2015.html">FY2015 Annual Report</a></li>
-            <li><a href="#licensing">Licensing</a></li>
-            <li><a href="#campaigns">Campaigns</a></li>
-            <li><a href="#tech">Tech</a></li>
-            <li><a href="#financials">Financials</a></li>
-            <li><a href="#donors">Donors</a></li>
-            <li><a href="#associate-membership">Join the FSF</a></li>
-	    <li><a href="extra/2015.pdf">⬇ PDF</a></li>
-          </ul>
-  </nav>
+<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
+<div>
+<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+<p>Download the <a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+</div>
+<nav>
+<ul class="menu">
+<li><a class="highlight" href="fy2015.html">FY2015 Annual Report</a></li>
+<li><a href="#licensing">Licensing</a></li>
+<li><a href="#campaigns">Campaigns</a></li>
+<li><a href="#tech">Tech</a></li>
+<li><a href="#financials">Financials</a></li>
+<li><a href="#donors">Donors</a></li>
+<li><a href="#associate-membership">Join the FSF</a></li>
+<li><a href="extra/2015.pdf">⬇ PDF</a></li>
+</ul>
+</nav>
 </footer>
-  </body>
+</body>
 </html>
\ No newline at end of file
diff --git a/output/fy2016.html b/output/fy2016.html
index ac3d414..4c44885 100644
--- a/output/fy2016.html
+++ b/output/fy2016.html
@@ -1,71 +1,70 @@
 <!DOCTYPE html>
+
 <html lang="en">
-  <head>
-    <title>FY2016 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet">
-<meta charset="utf-8">
-<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
-  <body>
+<head>
+<title>FY2016 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
+<meta charset="utf-8"/>
+<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
+<body>
 <header class="top-menu no-print">
-  <nav class="top-menu">
-    <ul>
-            <li><a class="highlight" href="/">Index of reports</a></li>
-            <li><a href="#">FY2016</a></li>
-            <li><a href="#toc">Table of Contents</a></li>
-            <li><a href="#associate-membership">Join the fsf</a></li>
-            <li><a href="extra/2016.pdf">⬇PDF</a></li>
-    </ul>
-  </nav>
+<nav class="top-menu">
+<ul>
+<li><a class="highlight" href="/">Index of reports</a></li>
+<li><a href="#">FY2016</a></li>
+<li><a href="#toc">Table of Contents</a></li>
+<li><a href="#associate-membership">Join the fsf</a></li>
+<li><a href="extra/2016.pdf">⬇PDF</a></li>
+</ul>
+</nav>
 </header>
-    <div class="document">
-      <div id="head">
-      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
-      <h1 class="title">FY2016 Annual Report</h1>
-      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2016</p></div>
-      <div class="dates"><p>(October 1, 2015 - September 30, 2016)</p></div>
-        <div class="grid">
-         <div class="column">
-          <h4><a href="#licensing">Licensing</a></h4>
-          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-         </div>
-         <div class="column">
-          <h4><a href="#campaigns">Campaigns</a></h4>
-          <p>Empowering you to understand, adopt, develop, and defend free software</p>
-         </div>
-         <div class="column">
-          <h4><a href="#tech">Tech</a></h4>
-          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-         </div>
-         <div class="column">
-           <h4><a href="#financials">Operations</a></h4>
-           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-         </div>
-        </div>
-        <div style="clear:both"></div>      </div>
-      <article>
-        
-      </article>
+<div class="document">
+<div id="head">
+<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
+<h1 class="title">FY2016 Annual Report</h1>
+<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2016</p></div>
+<div class="dates"><p>(October 1, 2015 - September 30, 2016)</p></div>
+<div class="grid">
+<div class="column">
+<h4><a href="#licensing">Licensing</a></h4>
+<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+</div>
+<div class="column">
+<h4><a href="#campaigns">Campaigns</a></h4>
+<p>Empowering you to understand, adopt, develop, and defend free software</p>
+</div>
+<div class="column">
+<h4><a href="#tech">Tech</a></h4>
+<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+</div>
+<div class="column">
+<h4><a href="#financials">Operations</a></h4>
+<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+</div>
+</div>
+<div style="clear:both"></div> </div>
+<article>
+</article>
 </div>
 <footer class="bside-footer">
- <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
-  <div>
-    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-    <p>Download the <a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-  </div>
-
-  <nav>
-          <ul class="menu">
-	    <li><a class="highlight" href="fy2016.html">FY2016 Annual Report</a></li>
-            <li><a href="#licensing">Licensing</a></li>
-            <li><a href="#campaigns">Campaigns</a></li>
-            <li><a href="#tech">Tech</a></li>
-            <li><a href="#financials">Financials</a></li>
-            <li><a href="#donors">Donors</a></li>
-            <li><a href="#associate-membership">Join the FSF</a></li>
-	    <li><a href="extra/2016.pdf">⬇ PDF</a></li>
-          </ul>
-  </nav>
+<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
+<div>
+<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+<p>Download the <a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+</div>
+<nav>
+<ul class="menu">
+<li><a class="highlight" href="fy2016.html">FY2016 Annual Report</a></li>
+<li><a href="#licensing">Licensing</a></li>
+<li><a href="#campaigns">Campaigns</a></li>
+<li><a href="#tech">Tech</a></li>
+<li><a href="#financials">Financials</a></li>
+<li><a href="#donors">Donors</a></li>
+<li><a href="#associate-membership">Join the FSF</a></li>
+<li><a href="extra/2016.pdf">⬇ PDF</a></li>
+</ul>
+</nav>
 </footer>
-  </body>
+</body>
 </html>
\ No newline at end of file
diff --git a/output/fy2017.html b/output/fy2017.html
index 01bc4cb..5ffada0 100644
--- a/output/fy2017.html
+++ b/output/fy2017.html
@@ -1,64 +1,60 @@
 <!DOCTYPE html>
+
 <html lang="en">
-  <head>
-    <title>FY2017 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet">
+<head>
+<title>FY2017 Annual Report - Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <style>
 :root {
 	--background: #fffff6; --brightaccent: #ece1bd; --darkaccent: #ac4f30; --lightaccent: #d1b661; --colortone: -30deg;
 }
 </style>
-<meta charset="utf-8">
-<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
-  <body>
+<meta charset="utf-8"/>
+<meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
+<body>
 <header class="top-menu no-print">
-  <nav class="top-menu">
-    <ul>
-            <li><a class="highlight" href="/">Index of reports</a></li>
-            <li><a href="#">FY2017</a></li>
-            <li><a href="#toc">Table of Contents</a></li>
-            <li><a href="#associate-membership">Join the fsf</a></li>
-            <li><a href="extra/2017.pdf">⬇PDF</a></li>
-    </ul>
-  </nav>
+<nav class="top-menu">
+<ul>
+<li><a class="highlight" href="/">Index of reports</a></li>
+<li><a href="#">FY2017</a></li>
+<li><a href="#toc">Table of Contents</a></li>
+<li><a href="#associate-membership">Join the fsf</a></li>
+<li><a href="extra/2017.pdf">⬇PDF</a></li>
+</ul>
+</nav>
 </header>
-    <div class="document">
-      <div id="head">
-      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
-      <h1 class="title">FY2017 Annual Report</h1>
-      <div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2017</p></div>
-      <div class="dates"><p>(October 1, 2016 - September 30, 2017)</p></div>
-        <div class="grid">
-         <div class="column">
-          <h4><a href="#licensing">Licensing</a></h4>
-          <p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
-         </div>
-         <div class="column">
-          <h4><a href="#campaigns">Campaigns</a></h4>
-          <p>Empowering you to understand, adopt, develop, and defend free software</p>
-         </div>
-         <div class="column">
-          <h4><a href="#tech">Tech</a></h4>
-          <p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
-         </div>
-         <div class="column">
-           <h4><a href="#financials">Operations</a></h4>
-           <p>Running an efficient, effective nonprofit, using free software, supported by you</p>
-         </div>
-        </div>
-        <div style="clear:both"></div>      </div>
-      <article>
-        <p>{% comment {</p>
-<p>Copyright (c) 2022 Free Software Foundation, Inc.</p>
-<p>This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
-  International license (https://creativecommons.org/licenses/by-sa/4.0/)</p>
-<p>}%}</p>
+<div class="document">
+<div id="head">
+<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
+<h1 class="title">FY2017 Annual Report</h1>
+<div class="subtitle"><p>Highlighting activities and detailed financials for Fiscal Year 2017</p></div>
+<div class="dates"><p>(October 1, 2016 - September 30, 2017)</p></div>
+<div class="grid">
+<div class="column">
+<h4><a href="#licensing">Licensing</a></h4>
+<p>Educating you about free software licenses, advocating for copyleft and enforcing the GNU General Public License</p>
+</div>
+<div class="column">
+<h4><a href="#campaigns">Campaigns</a></h4>
+<p>Empowering you to understand, adopt, develop, and defend free software</p>
+</div>
+<div class="column">
+<h4><a href="#tech">Tech</a></h4>
+<p>Providing infrastructure to accelerate development and distribution of the free software you need</p>
+</div>
+<div class="column">
+<h4><a href="#financials">Operations</a></h4>
+<p>Running an efficient, effective nonprofit, using free software, supported by you</p>
+</div>
+</div>
+<div style="clear:both"></div> </div>
+<article>
 <blockquote>
 <p>The Free Software Foundation is a leader in the international movement for computer user freedom. We defend the rights of all software users and encourage the development and use of free <a href="https://www.gnu.org/philosophy/free-sw.en.html">"as in freedom"</a> software.</p>
 <p>This annual report highlights the Foundation's activities and achievements in fiscal year 2017 (October 1, 2016 — September 30, 2017) and includes a detailed financial statement.</p>
 </blockquote>
-<div class="width-33 float-left ">
-<p><img alt="Portrait of John Sullivan" class="image-process-article-image letter" src="images/john-sullivan.jpg"></p>
+<div class="width-33 float-left">
+<p><img alt="Portrait of John Sullivan" class="image-process-article-image letter" src="images/derivatives/article-image/john-sullivan.jpg"/></p>
 <blockquote>
 <p>Software filters the information we receive about the world and the messages we put out into the world, and that software must be free "as in freedom."</p>
 </blockquote>
@@ -74,7 +70,7 @@
 <p>FSF associate members drive this work, through their ongoing financial contributions, their commitment to the movement, and their sustained, informed, effective personal advocacy. If you haven't joined us yet, we need your support. We may be up against billions of dollars, but since we are fighting for billions of regular users, we have a massive advantage in numbers — so long as we can reach everyone. Please join us and help build these freedom-protecting defenses, without delay.</p>
 <p>Yours in freedom,</p>
 <div class="signature">
-<p><img alt="Signature" src="images/JohnS-signature.png"></p>
+<p><img alt="Signature" src="images/JohnS-signature.png"/></p>
 <p><strong>John Sullivan</strong></p>
 <p>Executive Director</p>
 <p>SEPTEMBER 2018</p>
@@ -108,7 +104,7 @@
 <p>In FY17, we celebrated the tenth anniversary of the GNU General Public License version 3 (GPL). This is the free software copyleft license that ensures the user's right to run, study, share, and modify software. In addition to being the steward of the GPL, the FSF holds copyright on much of the GNU operating system. The licensing team spent the year accepting copyright assignments from software developers and corporations, investigating GPL violations, and answering licensing questions from the community.</p>
 <p>We championed copylefted projects, publishing another seven installments in an ongoing series of conversations with free software developers who choose GNU licenses for their work. We also certified a record number of devices under our Respects Your Freedom certification program, which identifies devices that do as much as possible to respect user freedom.</p>
 <p>Along with answering hundreds of licensing questions from the public, dedicated volunteers continued to expand and improve the Free Software Directory for nearly two million annual visitors, and we made inroads with government, helping the US Department of Defense to distribute free software. We also organized volunteers to create a workaround for Web site maintainers who want to register as an agent under the US Digital Millennium Copyright Act (DMCA) while avoiding the nonfree JavaScript the process currently requires.</p>
-<p><img alt="Photo of a man with light brown hair, glasses, and a brown, white, and red sweater, holding two small mobile phones in his hands." class="image-process-article-image" src="images/licensing-gingerich_crop.jpg"></p>
+<p><img alt="Photo of a man with light brown hair, glasses, and a brown, white, and red sweater, holding two small mobile phones in his hands." class="image-process-article-image" src="images/derivatives/article-image/licensing-gingerich_crop.jpg"/></p>
 <p class="caption">Denver Gingerich, a developer of packages under the AGPLv3 and other GNU licenses, speaking at LibrePlanet 2017 about free software for mobile phones.</p>
 <p class="credit">CREDIT: Kori Feener, CC-BY 4.0</p>
 <h3 id="fy2017-at-a-glance">FY2017 at a glance</h3>
@@ -125,15 +121,12 @@
 <dd>visitors to the Free Software Directory</dd>
 </dl>
 <h3 id="respects-your-freedom-certification">Respects Your Freedom certification</h3>
-<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"></p>
+<p><img alt="RYF Logo" class="align-left width-40" src="images/RYF-logo.png"/></p>
 <p>The FSF's Respects Your Freedom product certification program encourages the creation and sale of hardware that will do as much as possible to respect your freedom and privacy.</p>
 <p>In FY17, fifteen devices from Technoethical became RYF certified: six laptops, two docking stations, a mainboard, three WiFi USB adapters, two internal WiFI devices, and a Bluetooth USB adapter. RYF certification was also awarded to three devices from Vikings: a USB stereo sound adapter, a mainboard, and a laptop, bringing the number of RYF certified devices to twenty-seven.</p>
 </div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "Free software — the GNU/Linux platform in particular — is what made it possible twenty years ago for me to learn the skills to become a professional system administrator. It has been a rewarding career!"
-}%}</p>
-<p><img alt="A photo of a wall in Florida. Spraypainted on the wall is 'DRM' with a red circle and crossed out." class="image-process-article-image" src="images/campaigns-drm.png"></p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"Free software — the GNU/Linux platform in particular — is what made it possible twenty years ago for me to learn the skills to become a professional system administrator. It has been a rewarding career!"</p></blockquote></div></p>
+<p><img alt="A photo of a wall in Florida. Spraypainted on the wall is 'DRM' with a red circle and crossed out." class="image-process-article-image" src="images/derivatives/article-image/campaigns-drm.png"/></p>
 <p class="caption">34th Street Wall, Gainesville, Florida</p>
 <p class="credit">Credit: Gavin Baker, CC-BY-SA 4.0 </p>
 <div class="col2">
@@ -150,7 +143,7 @@ International Day Against DRM</p>
 <p>Encrypted Media Extensions (EME) is just another way to dress up DRM. The FSF and the free software community organized to oppose a proposal by the World Wide Web Consortium (W3C) to make EME a Web standard. We called and wrote W3C president Tim Berners-Lee, asking him to keep the Web free. While we lost this battle, and EME became a Web standard, we're looking at our options for next steps. We are not giving up hope for a free Web, even if its inventor did.</p>
 <h3 id="free-people-free-net">Free people, free net</h3>
 <p>Internet freedom in the United States found itself on the national stage in 2017. Over the course of the year, Ajit Pai became chairman of the Federal Communications Commission (FCC) and instigated a war against net neutrality. The FSF joined with dozens of other organizations to raise awareness and organize in support of net neutrality.</p>
-<p><img alt="Sumana Harihareswara gives the closing keynote at LibrePlanet 2017" class="image-process-article-image" src="images/campaigns-stats-lp_small.jpg"></p>
+<p><img alt="Sumana Harihareswara gives the closing keynote at LibrePlanet 2017" class="image-process-article-image" src="images/derivatives/article-image/campaigns-stats-lp_small.jpg"/></p>
 <p class="caption">Sumana Harihareswara gives the closing keynote at LibrePlanet 2017</p>
 <p class="credit">Credit: Kori Feener, CC-BY 4.0</p>
 <div>
@@ -175,10 +168,7 @@ International Day Against DRM</p>
 </div>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "To fight the dystopia of a DRM-overgrown world."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"To fight the dystopia of a DRM-overgrown world."</p></blockquote></div></p>
 <div class="col2">
 <h2 id="tech">Tech</h2>
 <h3 id="infrastructure-for-free-software-development-and-activism">Infrastructure for free software development and activism</h3>
@@ -198,7 +188,7 @@ International Day Against DRM</p>
 </dl>
 <p>And the team collaborates with the free software community, maintaining gnu.org with the help of volunteers, and working with interns who are advancing their skills and knowledge in working with and creating free software.</p>
 <p>The team introduced some new infrastructure using distributed Ceph storage and multiple KVM hosts for our new virtual machines. They started the next round of upgrades, including the implementation of a new mail server stack supporting over three thousand free software project mailing lists, and improving the LibrePlanet conference streaming setup by using Ansible to manage the laptops used for streaming, introducing new hardware, and using HUBAngl (streaming software created by an FSF intern).</p>
-<p><img alt="A tiered classroom, filled with people. A person stands at the front of the room, beneath a large projection screen, giving a talk." class="image-process-article-image" src="images/sysadmin-libreplanet.jpg"></p>
+<p><img alt="A tiered classroom, filled with people. A person stands at the front of the room, beneath a large projection screen, giving a talk." class="image-process-article-image" src="images/derivatives/article-image/sysadmin-libreplanet.jpg"/></p>
 <p class="caption">The tech team maintains the free software infrastructure for all FSF operations, including the annual LibrePlanet conference.</p>
 <p class="credit">Credit: Kori Feener, CC-BY 4.0</p>
 <h3 id="defending-user-freedom-with-free-software">Defending user freedom with free software</h3>
@@ -216,38 +206,20 @@ International Day Against DRM</p>
 <dd>Amazon EC2 instances</dd>
 </dl>
 <h3 id="working-together-for-free-software">Working Together for Free Software</h3>
-<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"></a>
-<a class="logos" href="https://www.gnuradio.org/"><img alt="GNU Radio logo" src="images/gnuradio.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"></a>
-<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"></a>
-<a class="logos" href="https://seagl.org/"><img alt="SeaGL logo" src="images/seagl.png"></a></p>
+<p><a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=50"><img alt="GNU Guix logo" src="images/guix.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=22"><img alt="GNU Mailman logo" src="images/mailman.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=36"><img alt="GNU MediaGoblin logo" src="images/mediagoblin.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=10"><img alt="GNU Octave logo" src="images/octave.svg"/></a>
+<a class="logos" href="https://www.gnuradio.org/"><img alt="GNU Radio logo" src="images/gnuradio.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=57"><img alt="GNU Toolchain logo" src="images/gnu-toolchain.svg"/></a>
+<a class="logos" href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=19"><img alt="Replicant logo" src="images/replicant.svg"/></a>
+<a class="logos" href="https://seagl.org/"><img alt="SeaGL logo" src="images/seagl.png"/></a></p>
 <p>The FSF acts as fiscal sponsor for free software projects and events whose scope and purpose align with the FSF’s mission. Participating projects benefit from the FSF’s nonprofit status, administrative infrastructure, and fundraising expertise. In FY17, these eight projects received $67,130 in direct support from the free software community via the Working Together for Free Software Fund.</p>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "I discovered GNU, and then learned about all the amazing work the FSF does for the tech community."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I discovered GNU, and then learned about all the amazing work the FSF does for the tech community."</p></blockquote></div></p>
 <h2 id="financial-statement">Financial Statement</h2>
-<p>{%
-    matplotlib {
-        "filename": "fa2017",
-        "data" : [
-         {"title": "Program\nServices",
-         "values": 1076394,
-         "colors": "chocolate"},
-         {"title": "Management\nand General",
-         "values": 95105,
-         "colors": "sienna"},
-         {"title": "Fundraising",
-         "values": 65639,
-         "colors": "brown"}
-        ]
-    }
-%}</p>
+<p><img alt="A pie chart" class="matplotlib" src="images/fa2017.png"/></p>
 <p>The following is a visualization of the Free Software Foundation's FY 2017 financial statement. The original documents can be found <a href="https://www.fsf.org/about/financial">here</a>.</p>
 <div class="nocollapse" style="clear:both">
 <div class="column3">
@@ -411,7 +383,6 @@ International Day Against DRM</p>
 </div>
 </div>
 <div class="pagebreak"></div>
-
 <h2 id="donors">Donors</h2>
 <p>This list includes our patrons, in-kind supporters, and those who receive ThankGNUs for donations totaling over $500 in a year. The FSF appreciates and thanks the thousands of individual donors, members, and corporate patrons worldwide who make our work possible.</p>
 <h3 id="institutional-support">Institutional Support</h3>
@@ -580,22 +551,18 @@ International Day Against DRM</p>
 </ul>
 </div>
 <div class="pagebreak"></div>
-<p>{% separator {
-  "title": "Why I joined the FSF",
-  "quote": "I simply use GNU tools every day."
-}%}</p>
+<p><div class="quote-box-top"></div> <div class="quote-box"> <h4>Why I joined the FSF</h4> <blockquote><p>"I simply use GNU tools every day."</p></blockquote></div></p>
 <div class="col2">
-<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"></p>
+<p><img alt="An image of a keyboard" class="colortone" src="images/donors-opener.jpg"/></p>
 <h2 id="associate-membership">Associate Membership</h2>
 <h3 id="join-the-free-software-foundation">Join the Free Software Foundation</h3>
 <p>Our mission is to promote computer user freedom and defend the rights of all software users, worldwide. Though free software is used more widely than ever, it is under threat from a wide range of interests that profit from controlling and surveilling computer users. You can help put control over computers back in the hands of the people who use them! Try a free software program, or switch to a free operating system. Make a donation, or make a long term commitment to free software by becoming a Free Software Foundation Associate Member. Learn more at fsf.org.</p>
 </div>
 <div class="pagebreak"></div>
-
 <h2 id="leadership-and-staff">Leadership and Staff</h2>
 <div class="boardcolumn width-25 float-left" style="padding-right:2rem">
 <h3 id="board-of-directors">Board of Directors</h3>
-<p><img alt="Richard M. Stallman" class="width-60" src="images/richard-stallman.jpg"></p>
+<p><img alt="Richard M. Stallman" class="width-60" src="images/richard-stallman.jpg"/></p>
 <h4 id="richard-m-stallman">Richard M. Stallman</h4>
 <p>Founder and President</p>
 <h4 id="gerald-j-sussman">Gerald J. Sussman</h4>
@@ -614,87 +581,86 @@ International Day Against DRM</p>
 <div class="staffcolumn width-70 float-left">
 <h3 id="leadership">Leadership</h3>
 <div class="staff">
-<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/johns.jpg"></p>
+<p><img alt="John Sullivan" class="image-process-thumb" src="images/staff/derivatives/thumb/johns.jpg"/></p>
 <h4 id="john-sullivan">John Sullivan</h4>
 <p>Executive Director</p>
 </div>
 <div class="staff">
-<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/johnh.jpg"></p>
+<p><img alt="John Hsieh" class="image-process-thumb" src="images/staff/derivatives/thumb/johnh.jpg"/></p>
 <h4 id="john-hsieh">John Hsieh</h4>
 <p>Deputy Director</p>
 </div>
 <h3 id="licensing">Licensing</h3>
 <div class="staff">
-<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/donald.jpg"></p>
+<p><img alt="Donald Robertson" class="image-process-thumb" src="images/staff/derivatives/thumb/donald.jpg"/></p>
 <h4 id="donald-robertson">Donald Robertson</h4>
 <p>Licensing and Compliance Manager</p>
 </div>
 <div class="staff">
-<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/craig.jpg"></p>
+<p><img alt="Craig Topham" class="image-process-thumb" src="images/staff/derivatives/thumb/craig.jpg"/></p>
 <h4 id="craig-topham">Craig Topham</h4>
 <p>Copyright and Licensing Associate </p>
 </div>
 <h3 id="campaigns_1">Campaigns</h3>
 <div class="staff">
-<p><img alt="Molly de Blanc" class="image-process-thumb" src="images/staff/molly.jpg"></p>
+<p><img alt="Molly de Blanc" class="image-process-thumb" src="images/staff/derivatives/thumb/molly.jpg"/></p>
 <h4 id="molly-de-blanc">Molly de Blanc</h4>
 <p>Campaigns Manager</p>
 </div>
 <div class="staff">
-<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/dana.jpg"></p>
+<p><img alt="Dana Morgenstein" class="image-process-thumb" src="images/staff/derivatives/thumb/dana.jpg"/></p>
 <h4 id="dana-morgenstein">Dana Morgenstein</h4>
 <p>Outreach and Communications Coordinator</p>
 </div>
 <h3 id="tech_1">Tech</h3>
 <div class="staff">
-<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/andrew.jpg"></p>
+<p><img alt="Andrew Engelbrecht" class="image-process-thumb" src="images/staff/derivatives/thumb/andrew.jpg"/></p>
 <h4 id="andrew-engelbrecht">Andrew Engelbrecht</h4>
 <p>Senior Systems Administrator</p>
 </div>
 <div class="staff">
-<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/ian.jpg"></p>
+<p><img alt="Ian Kelling" class="image-process-thumb" src="images/staff/derivatives/thumb/ian.jpg"/></p>
 <h4 id="ian-kelling">Ian Kelling</h4>
 <p>Senior Systems Administrator</p>
 </div>
 <div class="staff">
-<p><img alt="Ruben Rodriguez" class="image-process-thumb" src="images/staff/ruben.jpg"></p>
+<p><img alt="Ruben Rodriguez" class="image-process-thumb" src="images/staff/derivatives/thumb/ruben.jpg"/></p>
 <h4 id="ruben-rodriguez">Rubén Rodríguez</h4>
 <p>Chief Technology Officer </p>
 </div>
 <h3 id="operations">Operations</h3>
 <div class="staff">
-<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/mattlav.jpg"></p>
+<p><img alt="Matt Lavallee" class="image-process-thumb" src="images/staff/derivatives/thumb/mattlav.jpg"/></p>
 <h4 id="matt-lavallee">Matt Lavallee</h4>
 <p>Operations Assistant</p>
 </div>
 <div class="staff">
-<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/jeanne.jpg"></p>
+<p><img alt="Jeanne Rasata" class="image-process-thumb" src="images/staff/derivatives/thumb/jeanne.jpg"/></p>
 <h4 id="jeanne-rasata">Jeanne Rasata</h4>
 <p>Assistant to the President </p>
 </div>
 </div>
-      </article>
+</article>
 </div>
 <footer class="bside-footer">
- <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
-  <div>
-    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-    <p>Download the <a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-  </div>
-
-  <nav>
-          <ul class="menu">
-	    <li><a class="highlight" href="fy2017.html">FY2017 Annual Report</a></li>
-            <li><a href="#licensing">Licensing</a></li>
-            <li><a href="#campaigns">Campaigns</a></li>
-            <li><a href="#tech">Tech</a></li>
-            <li><a href="#financials">Financials</a></li>
-            <li><a href="#donors">Donors</a></li>
-            <li><a href="#associate-membership">Join the FSF</a></li>
-	    <li><a href="extra/2017.pdf">⬇ PDF</a></li>
-          </ul>
-  </nav>
+<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
+<div>
+<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+<p>Download the <a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">sources</a> for the report including fonts, image source files and text. <br/>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+</div>
+<nav>
+<ul class="menu">
+<li><a class="highlight" href="fy2017.html">FY2017 Annual Report</a></li>
+<li><a href="#licensing">Licensing</a></li>
+<li><a href="#campaigns">Campaigns</a></li>
+<li><a href="#tech">Tech</a></li>
+<li><a href="#financials">Financials</a></li>
+<li><a href="#donors">Donors</a></li>
+<li><a href="#associate-membership">Join the FSF</a></li>
+<li><a href="extra/2017.pdf">⬇ PDF</a></li>
+</ul>
+</nav>
 </footer>
-  </body>
+</body>
 </html>
\ No newline at end of file
diff --git a/output/index.html b/output/index.html
index 506701f..593c8e3 100644
--- a/output/index.html
+++ b/output/index.html
@@ -1,75 +1,74 @@
 <!DOCTYPE html>
+
 <html lang="en">
-  <head>
-    <title>Free Software Foundation Annual Reports</title>
-<link href="./theme/css/b-side-base.css" rel="stylesheet">
-<meta charset="utf-8">
-<meta name="viewport" content="width=680" /><link href="./theme/css/b-side-wide.css" rel="stylesheet"><link href="./theme/css/b-side-post.css" rel="stylesheet">  </head>
-  <body>
+<head>
+<title>Free Software Foundation Annual Reports</title>
+<link href="./theme/css/b-side-base.css" rel="stylesheet"/>
+<meta charset="utf-8"/>
+<meta content="width=680" name="viewport"><link href="./theme/css/b-side-wide.css" rel="stylesheet"/><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
+<body>
 <header class="top-menu no-print">
-  <nav class="top-menu">
-    <ul>
-            <li><a href="#" >Free Software Foundation Annual Reports</a></li>
-            <li><a href="https://my.fsf.org">Join the fsf</a></li>
-    </ul>
-  </nav>
+<nav class="top-menu">
+<ul>
+<li><a href="#">Free Software Foundation Annual Reports</a></li>
+<li><a href="https://my.fsf.org">Join the fsf</a></li>
+</ul>
+</nav>
 </header>
-  <div class="document">
-  <div id="head" class="index">
-      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg"/>
-      <h1 style="color:#737373">Annual Reports</h1>
-      <p>Here you will find the Free Software Foundation's Annual Reports, starting with FY2015.</p><br>
-  </div>
-  <section>
-  	<div class="summarylist">
+<div class="document">
+<div class="index" id="head">
+<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
+<h1 style="color:#737373">Annual Reports</h1>
+<p>Here you will find the Free Software Foundation's Annual Reports, starting with FY2015.</p><br/>
+</div>
+<section>
+<div class="summarylist">
 <div class="bside-summary">
 <h2><a href="/FY2020.html" rel="bookmark">Fiscal year 2020</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2023-06-15T10:20:00-04:00">October 1, 2019 - September 30, 2020</time></em></li>
-	<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2023-06-15T10:20:00-04:00">October 1, 2019 - September 30, 2020</time></em></li>
+<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="/FY2019.html" rel="bookmark">Fiscal year 2019</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2023-06-14T10:20:00-04:00">October 1, 2018 - September 30, 2019</time></em></li>
-	<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2023-06-14T10:20:00-04:00">October 1, 2018 - September 30, 2019</time></em></li>
+<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="/FY2018.html" rel="bookmark">Fiscal year 2018</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2023-06-13T10:20:00-04:00">October 1, 2017 - September 30, 2018</time></em></li>
-	<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2023-06-13T10:20:00-04:00">October 1, 2017 - September 30, 2018</time></em></li>
+<li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
-	<li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
+<li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY16_LR.pdf" rel="bookmark">Fiscal year 2016</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2016-12-05T10:20:00-05:00">October 1, 2015 - September 30, 2016</time></em></li>
-	<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2016-12-05T10:20:00-05:00">October 1, 2015 - September 30, 2016</time></em></li>
+<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/Annual_Report_FY16_source_files.tar.gz">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
 <h2><a href="https://static.fsf.org/nosvn/annual-reports/FY2015_annual_report_LR.pdf" rel="bookmark">Fiscal year 2015</a></h2>
 <ul class="bulletless">
-	<li class="smaller dim"><em><time datetime="2015-12-05T10:20:00-05:00">October 1, 2014 - September 30, 2015</time></em></li>
-	<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">Sources and materials</a></li>
+<li class="smaller dim"><em><time datetime="2015-12-05T10:20:00-05:00">October 1, 2014 - September 30, 2015</time></em></li>
+<li class="smaller dim"><a href="https://static.fsf.org/nosvn/annual-reports/fy15-report.tar">Sources and materials</a></li>
 </ul>
-</div>  	</div>
-  </section>
-  </div>
-
+</div> </div>
+</section>
+</div>
 <footer class="bside-footer">
- <img src="theme/fsf-logo.svg" onerror="this.src='images/fsf-logo.png'" alt="Free Software Foundation logo"></p>
-  <div>
-    <p>Copyright &copy;  2015&ndash;2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
-    <p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
-    <p>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
-  </div>
-
+<img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
+<div>
+<p>Copyright ©  2015–2023  <a href="https://www.fsf.org">Free Software Foundation</a>, Inc. <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy">Privacy Policy</a>.</p>
+<p>Please support our work by joining us as an <a href="https://my.fsf.org/join">associate member</a>.</p>
+<p>This work is licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International license</a> (CC BY-SA 4.0).</p>
+</div>
 </footer>
-  </body>
+</body>
 </html>
\ No newline at end of file