From: Ruben Rodriguez <ruben@gnu.org>
Date: Mon, 27 Feb 2023 16:55:28 +0000 (+0100)
Subject: Validation corrections
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=00febd8e4051d3ef164c1ca14cd52ccd7afb2b68;p=financial-reports.git

Validation corrections
---

diff --git a/README.md b/README.md
index edbc9b1..5982d6c 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Note that although virtualenv and pip are free software, they are not in the Tri
     
     # Optionally, install font roboto. This can also be done with "sudo apt install fonts-roboto"
     pip install font-roboto
-    mkdir ~/.fonts ; cp ./lib/python*/site-packages/font_roboto/files/*ttf.ttf ~/.fonts
+    mkdir ~/.fonts ; cp ./lib/python*/site-packages/font_roboto/files/*.ttf ~/.fonts
 
 # Usage notes
 
diff --git a/content/2017.md b/content/2017.md
index 5ca7d2e..49db6cc 100644
--- a/content/2017.md
+++ b/content/2017.md
@@ -3,7 +3,9 @@ Summary: Highlighting activities and detailed financials for Fiscal Year 2017
 Date: 2017-12-05 10:20
 Slug: fy2017
 Fy: 2017
+Source: https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz
 Dates: October 1, 2016 - September 30, 2017
+Color: --background: #fffff6; --brightaccent: #ece1bd; --darkaccent: #ac4f30; --lightaccent: #d1b661; --colortone: -30deg;
 {% comment {
 
   Copyright (c) 2022 Free Software Foundation, Inc.
@@ -13,17 +15,7 @@ Dates: October 1, 2016 - September 30, 2017
 
 }%}
 
-<style>
-:root {
-    --background: #fffff6;
-    --brightaccent: #ece1bd;
-    --darkaccent: #ac4f30;
-    --lightaccent: #d1b661;
-    --colortone: -30deg;
-}
-</style>
-
-> 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 ["as in freedom"]() software.
+> 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 ["as in freedom"](https://www.gnu.org/philosophy/free-sw.en.html) software.
 
 > 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.
 
@@ -266,7 +258,7 @@ The FSF acts as fiscal sponsor for free software projects and events whose scope
 %}
 
 
-The following is a visualization of the Free Software Foundation's FY 2017 financial statement. The original documents can be found [here]().
+The following is a visualization of the Free Software Foundation's FY 2017 financial statement. The original documents can be found [here](https://www.fsf.org/about/financial).
 
 <div class="nocollapse" style="clear:both" markdown=1>
 
@@ -495,7 +487,6 @@ This list includes our patrons, in-kind supporters, and those who receive ThankG
 * Adam Ymeren 
 </div>
 
-
 <div class="pagebreak"></div>
 {% separator {
   "title": "Why I joined the FSF",
diff --git a/content/2018.md b/content/2018.md
index d2ec783..28a2f64 100644
--- a/content/2018.md
+++ b/content/2018.md
@@ -5,6 +5,9 @@ Slug: fy2018
 Dates: October 1, 2017 - September 30, 2018
 Fy: 2018
 Source: https://vcs.fsf.org/?p=financial-reports.git
+Color: --background: #f6faff; --brightaccent: #bde3ec; --darkaccent: #2870cc; --lightaccent: #79b4f2; --colortone: 185deg; 
+
+
 {% comment {
 
   Copyright (c) 2023 Free Software Foundation, Inc.
@@ -14,18 +17,7 @@ Source: https://vcs.fsf.org/?p=financial-reports.git
 
 }%}
 
-<style>
-/* Blue tones */
-:root {
-    --background: #f6faff;
-    --brightaccent: #bde3ec;
-    --darkaccent: #2870cc;
-    --lightaccent: #79b4f2;
-    --colortone: 185deg;
-}
-</style>
-
-> 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 ["as in freedom"]() software.
+> 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 ["as in freedom"](https://www.gnu.org/philosophy/free-sw.en.html) software.
 
 > This annual report highlights the Foundation's activities and achievements in fiscal year 2017 (October 1, 2017 — September 30, 2018) and includes a detailed financial statement.
 
@@ -777,7 +769,7 @@ or [switch to a free operating
 system](https://www.gnu.org/distros/free-distros.html). [Make a
 donation](https://my.fsf.org/donate), or make a long term commitment
 to free software by [becoming a Free Software Foundation Associate
-Member](https://my.fsf.org/join). Learn more at <fsf.org>.
+Member](https://my.fsf.org/join). Learn more at [fsf.org](https://www.fsf.org).
 
 </div>
 
diff --git a/output/author/free-software-foundation.html b/output/author/free-software-foundation.html
index 09cc708..ddf7585 100644
--- a/output/author/free-software-foundation.html
+++ b/output/author/free-software-foundation.html
@@ -3,15 +3,16 @@
 <html lang="en">
 <head>
 <title>Free Software Foundation - Free Software Foundation Annual Reports</title>
-<link href="" rel="canonical"/>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/><meta charset="utf-8"/>
+<link href="http://127.0.0.1:8000" rel="canonical"/>
+<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 class="active" href="https://my.fsf.org">Join the fsf</a></li>
+<li><a href="http://127.0.0.1:8000">Free Software Foundation Annual Reports</a></li>
+<li><a href="https://my.fsf.org">Join the fsf</a></li>
 </ul>
 </nav>
 </header>
@@ -19,16 +20,16 @@
 <div>
 <h1>Free Software Foundation</h1>
 <div class="bside-summary">
-<h2><a href="/fy2018.html" rel="bookmark">Fiscal year 2018</a></h2>
+<h2><a href="http://127.0.0.1:8000/fy2018.html" rel="bookmark">Fiscal year 2018</a></h2>
 <ul class="bulletless">
 <li>Highlighting activities and detailed financials for Fiscal Year 2018</li> <li class="smaller dim"><em><time datetime="2023-02-05T10:20:00-05: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>
+<h2><a href="http://127.0.0.1:8000/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
 <ul class="bulletless">
 <li>Highlighting activities and detailed financials for Fiscal Year 2017</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="">Sources and materials</a></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>
diff --git a/output/fy2015.html b/output/fy2015.html
index 11d1d10..82ae578 100644
--- a/output/fy2015.html
+++ b/output/fy2015.html
@@ -3,26 +3,25 @@
 <html lang="en">
 <head>
 <title>FY2015 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="" rel="canonical"/>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/><meta charset="utf-8"/>
+<link href="http://127.0.0.1:8000" rel="canonical"/>
+<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</a></li>
-<li><a href="">FY2015 Annual Report</a></li>
-<li><a class="active" href="#toc">Table of Contents</a></li>
-<li><a class="active" href="#associate-membership">Join the fsf</a></li>
-<li><a class="active" href="extra/2015.pdf">PDF</a></li>
+<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>
-<article>
-<section>
 <div class="document">
 <div id="head">
-<img class="fsflogo" src="./theme/fsf-logo.svg"/>
+<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>
@@ -45,9 +44,9 @@
 </div>
 </div>
 <div style="clear:both"></div> </div>
-</div>
-</section>
+<article>
 </article>
+</div>
 <footer class="bside-footer">
 <img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
 <div>
diff --git a/output/fy2016.html b/output/fy2016.html
index 2b80ed2..9756991 100644
--- a/output/fy2016.html
+++ b/output/fy2016.html
@@ -3,26 +3,25 @@
 <html lang="en">
 <head>
 <title>FY2016 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="" rel="canonical"/>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/><meta charset="utf-8"/>
+<link href="http://127.0.0.1:8000" rel="canonical"/>
+<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</a></li>
-<li><a href="">FY2016 Annual Report</a></li>
-<li><a class="active" href="#toc">Table of Contents</a></li>
-<li><a class="active" href="#associate-membership">Join the fsf</a></li>
-<li><a class="active" href="extra/2016.pdf">PDF</a></li>
+<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>
-<article>
-<section>
 <div class="document">
 <div id="head">
-<img class="fsflogo" src="./theme/fsf-logo.svg"/>
+<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>
@@ -45,9 +44,9 @@
 </div>
 </div>
 <div style="clear:both"></div> </div>
-</div>
-</section>
+<article>
 </article>
+</div>
 <footer class="bside-footer">
 <img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
 <div>
diff --git a/output/fy2017.html b/output/fy2017.html
index 6436f1d..6ecb7e0 100644
--- a/output/fy2017.html
+++ b/output/fy2017.html
@@ -3,26 +3,30 @@
 <html lang="en">
 <head>
 <title>FY2017 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="" rel="canonical"/>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/><meta charset="utf-8"/>
+<link href="http://127.0.0.1:8000" rel="canonical"/>
+<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 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</a></li>
-<li><a href="">FY2017 Annual Report</a></li>
-<li><a class="active" href="#toc">Table of Contents</a></li>
-<li><a class="active" href="#associate-membership">Join the fsf</a></li>
-<li><a class="active" href="extra/2017.pdf">PDF</a></li>
+<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>
-<article>
-<section>
 <div class="document">
 <div id="head">
-<img class="fsflogo" src="./theme/fsf-logo.svg"/>
+<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>
@@ -45,17 +49,9 @@
 </div>
 </div>
 <div style="clear:both"></div> </div>
-<style>
-:root {
-    --background: #fffff6;
-    --brightaccent: #ece1bd;
-    --darkaccent: #ac4f30;
-    --lightaccent: #d1b661;
-    --colortone: -30deg;
-}
-</style>
+<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="">"as in freedom"</a> software.</p>
+<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 id="toc" style="background:url(./images/toc-libreplanet.jpg)">
@@ -202,8 +198,8 @@ International Day Against DRM</p>
 <div class="pagebreak"></div>
 <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>
 <h2 id="financial-statement">Financial Statement</h2>
-<p><img "="" class="matplotlib" src="images/fa2018.png" type="image/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="">here</a>.</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 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">
 <h3 id="statement-of-financial-position">Statement of Financial Position</h3>
@@ -625,15 +621,14 @@ International Day Against DRM</p>
 <p>Assistant to the President </p>
 </div>
 </div>
-</div>
-</section>
 </article>
+</div>
 <footer class="bside-footer">
 <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="">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>
+<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">
diff --git a/output/fy2018.html b/output/fy2018.html
index e5884b6..cc9f17c 100644
--- a/output/fy2018.html
+++ b/output/fy2018.html
@@ -3,26 +3,30 @@
 <html lang="en">
 <head>
 <title>FY2018 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="" rel="canonical"/>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/><meta charset="utf-8"/>
+<link href="http://127.0.0.1:8000" rel="canonical"/>
+<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 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</a></li>
-<li><a href="">FY2018 Annual Report</a></li>
-<li><a class="active" href="#toc">Table of Contents</a></li>
-<li><a class="active" href="#associate-membership">Join the fsf</a></li>
-<li><a class="active" href="extra/2018.pdf">PDF</a></li>
+<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>
-<article>
-<section>
 <div class="document">
 <div id="head">
-<img class="fsflogo" src="./theme/fsf-logo.svg"/>
+<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>
@@ -45,18 +49,9 @@
 </div>
 </div>
 <div style="clear:both"></div> </div>
-<style>
-/* Blue tones */
-:root {
-    --background: #f6faff;
-    --brightaccent: #bde3ec;
-    --darkaccent: #2870cc;
-    --lightaccent: #79b4f2;
-    --colortone: 185deg;
-}
-</style>
+<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="">"as in freedom"</a> software.</p>
+<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, 2017 — September 30, 2018) and includes a detailed financial statement.</p>
 </blockquote>
 <div id="toc" style="background:url(images/toc-libreplanet.jpg)">
@@ -373,7 +368,7 @@ Free Software Fund</a>.</p>
 <div class="pagebreak"></div>
 <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><img "="" class="matplotlib" src="images/fa2018.png" type="image/png"/></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
 <a href="https://www.fsf.org/about/financial">here</a>.</p>
@@ -793,7 +788,7 @@ or <a href="https://www.gnu.org/distros/free-distros.html">switch to a free oper
 system</a>. <a href="https://my.fsf.org/donate">Make a
 donation</a>, or make a long term commitment
 to free software by <a href="https://my.fsf.org/join">becoming a Free Software Foundation Associate
-Member</a>. Learn more at <fsf.org>.</fsf.org></p>
+Member</a>. Learn more at <a href="https://www.fsf.org">fsf.org</a>.</p>
 </div>
 <div class="pagebreak"></div>
 <h2 id="leadership-and-staff">Leadership and Staff</h2>
@@ -882,9 +877,8 @@ Member</a>. Learn more at <fsf.org>.</fsf.org></p>
 <p>Assistant to the President </p>
 </div>
 </div>
-</div>
-</section>
 </article>
+</div>
 <footer class="bside-footer">
 <img alt="Free Software Foundation logo" onerror="this.src='images/fsf-logo.png'" src="theme/fsf-logo.svg"/>
 <div>
diff --git a/output/images/fa2018.png b/output/images/fa2018.png
index 6146b6a..0c45db5 100644
Binary files a/output/images/fa2018.png and b/output/images/fa2018.png differ
diff --git a/output/index.html b/output/index.html
index 99cf05e..2ff1d49 100644
--- a/output/index.html
+++ b/output/index.html
@@ -3,21 +3,22 @@
 <html lang="en">
 <head>
 <title>Free Software Foundation Annual Reports</title>
-<link href="" rel="canonical"/>
-<link href="./theme/css/b-side-base.css" rel="stylesheet"/><meta charset="utf-8"/>
+<link href="http://127.0.0.1:8000" rel="canonical"/>
+<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 class="active" href="">Free Software Foundation Annual Reports</a></li>
-<li><a class="active" href="https://my.fsf.org">Join the fsf</a></li>
+<li><a href="http://127.0.0.1:8000">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">
-<img class="fsflogo" src="./theme/fsf-logo.svg"/>
+<img alt="Free Software Foundation logo" class="fsflogo" src="./theme/fsf-logo.svg"/>
 <h1 style="color:#737373">Annual Reports</h1>
 <div class="grid">
 <div class="column">
@@ -41,16 +42,16 @@
 <section>
 <div class="summarylist">
 <div class="bside-summary">
-<h2><a href="/fy2018.html" rel="bookmark">Fiscal year 2018</a></h2>
+<h2><a href="http://127.0.0.1:8000/fy2018.html" rel="bookmark">Fiscal year 2018</a></h2>
 <ul class="bulletless">
 <li>Highlighting activities and detailed financials for Fiscal Year 2018</li> <li class="smaller dim"><em><time datetime="2023-02-05T10:20:00-05: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>
+<h2><a href="http://127.0.0.1:8000/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
 <ul class="bulletless">
 <li>Highlighting activities and detailed financials for Fiscal Year 2017</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="">Sources and materials</a></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>
diff --git a/output/theme/css/.b-side-base.css.swp b/output/theme/css/.b-side-base.css.swp
new file mode 100644
index 0000000..c6bf806
Binary files /dev/null and b/output/theme/css/.b-side-base.css.swp differ
diff --git a/output/theme/css/b-side-base.css b/output/theme/css/b-side-base.css
index 6a0a5ee..520af26 100644
--- a/output/theme/css/b-side-base.css
+++ b/output/theme/css/b-side-base.css
@@ -971,7 +971,7 @@ width:100%;
 border-spacing:0;
 }
 
-article h1{
+h1{
 clear:both;
 color:white
 }
@@ -1235,7 +1235,7 @@ background-color: var(--lightaccent);
 padding-bottom:2rem;
 }
 
-.document > blockquote{
+article > blockquote{
 border-left:none;
 max-width:60%;
 margin:0 auto;
@@ -1249,12 +1249,12 @@ font-size:1rem;
 line-height:1.5rem
 }
 
-.document > blockquote a{
+article > blockquote a{
 text-decoration:none;
 color:black;
 }
 
-.document > blockquote > p{
+article > blockquote > p{
 margin:1rem;
 padding:0;
 
diff --git a/pelicanconf.py b/pelicanconf.py
index da6c821..8d6e198 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -1,6 +1,6 @@
 AUTHOR = 'Free Software Foundation'
 SITENAME = 'Free Software Foundation Annual Reports'
-SITEURL = ''
+SITEURL = 'http://127.0.0.1:8000/'
 
 PATH = 'content'
 
diff --git a/plugins/matplotlib.py b/plugins/matplotlib.py
index a910584..7853008 100644
--- a/plugins/matplotlib.py
+++ b/plugins/matplotlib.py
@@ -93,10 +93,10 @@ def run_matplotlib(data, options=[]):
 
     title=data.get("title", None)
     if title is not None:
-      ax1.set_title(data.get("title", None), fontsize=24, fontfamily="Roboto Sans", fontweight='bold')
+      ax1.set_title(data.get("title", None), fontsize=24, fontfamily="Roboto", fontweight='bold')
     filename=data.get("filename", None)
-    plt.setp(pcts, color='white', fontweight='bold', fontsize=9, fontfamily="Roboto Sans")
-    plt.setp(texts, color='black', fontsize=12, fontfamily="Roboto Sans")
+    plt.setp(pcts, color='white', fontweight='bold', fontsize=9, fontfamily="Roboto")
+    plt.setp(texts, color='black', fontsize=12, fontfamily="Roboto")
     if not os.path.exists("./output/images"):
         os.mkdir("./output")
         os.mkdir("./output/images")
@@ -115,7 +115,7 @@ def matplotlib_parser(preprocessor, tag, markup):
         output = run_matplotlib(data)
         # Return embedded SVG image
         return (
-                '<img class="matplotlib" type="image/png" src=%s "/>'
+                '<img class="matplotlib" alt="A pie chart" src="%s">'
             % output
         )
 
diff --git a/theme/static/css/b-side-base.css b/theme/static/css/b-side-base.css
index 6a0a5ee..520af26 100644
--- a/theme/static/css/b-side-base.css
+++ b/theme/static/css/b-side-base.css
@@ -971,7 +971,7 @@ width:100%;
 border-spacing:0;
 }
 
-article h1{
+h1{
 clear:both;
 color:white
 }
@@ -1235,7 +1235,7 @@ background-color: var(--lightaccent);
 padding-bottom:2rem;
 }
 
-.document > blockquote{
+article > blockquote{
 border-left:none;
 max-width:60%;
 margin:0 auto;
@@ -1249,12 +1249,12 @@ font-size:1rem;
 line-height:1.5rem
 }
 
-.document > blockquote a{
+article > blockquote a{
 text-decoration:none;
 color:black;
 }
 
-.document > blockquote > p{
+article > blockquote > p{
 margin:1rem;
 padding:0;
 
diff --git a/theme/templates/article.html b/theme/templates/article.html
index 3d85221..1010d08 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -13,19 +13,16 @@
 {% endblock %}
 
 {% block main %}
-<article>
-  <section>
     <div class="document">
       <div id="head">
-      <img class="fsflogo" src="./theme/fsf-logo.svg">
+      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg">
       <h1 class="title">{{ article.title }}</h1>
       <div class="subtitle">{{ article.summary }}</div>
       <div class="dates"><p>({{ article.dates }})</p></div>
-
     {% include "partials/fsf-grid.html" %}
       </div>
-      {{ article.content }}
-    </div>
-  </section>
-</article>
+      <article>
+        {{ article.content }}
+      </article>
+</div>
 {% endblock %}
diff --git a/theme/templates/index.html b/theme/templates/index.html
index b257eb7..bca4e47 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -13,7 +13,7 @@
   {% endif %}
   <div class="document">
   <div id="head">
-      <img class="fsflogo" src="./theme/fsf-logo.svg"/>
+      <img class="fsflogo" alt="Free Software Foundation logo" src="./theme/fsf-logo.svg"/>
       <h1 style="color:#737373">Annual Reports</h1>
     {% include "partials/fsf-grid.html" %}
   </div>
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 26c028e..8181ae7 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -27,4 +27,4 @@
       {{ page.content }}
   </section>
 </article>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/theme/templates/partials/body-header.html b/theme/templates/partials/body-header.html
index f21d474..e89723b 100644
--- a/theme/templates/partials/body-header.html
+++ b/theme/templates/partials/body-header.html
@@ -5,14 +5,14 @@
         <li><a class="highlight" href="{{ SITEURL }}"><img class="badge" src="{{ SITEURL }}/{{ BADGE_IMAGE }}" alt="{{ SITENAME }}"></a></li>
       {% endif%} 
       {% if article %}
-            <li><a class="highlight" href="/"{% if output_file == 'index.html' %} class="active"{% endif %}>Index</a></li>
-            <li><a href="{{ link }}">{{ article.title }}</a></li>
-            <li><a class="active" href="#toc">Table of Contents</a></li>
-            <li><a class="active" href="#associate-membership">Join the fsf</a></li>
-            <li><a class="active" href="extra/{{ article.fy }}.pdf">PDF</a></li>
+            <li><a class="highlight" href="/"{% if output_file == 'index.html' %} {% endif %}>Index of reports</a></li>
+            <li><a href="{{ link }}#">FY{{ article.fy }}</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/{{ article.fy }}.pdf">⬇PDF</a></li>
        {% else %}
-            <li><a href="{{ SITEURL }}"{% if output_file == 'index.html' %} class="active"{% endif %}>{{ SITENAME }}</a></li>
-            <li><a class="active" href="https://my.fsf.org">Join the fsf</a></li>
+            <li><a href="{{ SITEURL }}"{% if output_file == 'index.html' %} {% endif %}>{{ SITENAME }}</a></li>
+            <li><a href="https://my.fsf.org">Join the fsf</a></li>
        {% endif %}
     </ul>
   </nav>
diff --git a/theme/templates/partials/head-style-base.html b/theme/templates/partials/head-style-base.html
index 64e7b28..38d3d88 100644
--- a/theme/templates/partials/head-style-base.html
+++ b/theme/templates/partials/head-style-base.html
@@ -1 +1,8 @@
 <link href="./theme/css/b-side-base.css" rel="stylesheet">
+{% if article and article.color %}
+<style>
+:root {
+	{{article.color}}
+}
+</style>
+{% endif %}