X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=v11%2Fgivingguide.html;h=dfa718b9706f3af775fc8e2132b01e276b2d7121;hb=HEAD;hp=27beb39fd2c70c71d03a2a06a4d3fb49abb1ce8a;hpb=1526716762a3e9f6a73a54d37a0454da9fdd38ee;p=fsf-giving-guide.git

diff --git a/v11/givingguide.html b/v11/givingguide.html
index 27beb39..1e57681 100644
--- a/v11/givingguide.html
+++ b/v11/givingguide.html
@@ -20,7 +20,7 @@
   <link rel="apple-touch-icon" sizes="76x76" href="img/favicons/apple-icon-76x76.png">
   <link rel="apple-touch-icon" sizes="114x114" href="img/favicons/apple-icon-114x114.png">
   <link rel="apple-touch-icon" sizes="120x120" href="img/favicons/apple-icon-120x120.png">
-  <link rel="apple-touch-icon" sizes="144x144" href="img/favicons/apple-icon-144x144.png"> 
+  <link rel="apple-touch-icon" sizes="144x144" href="img/favicons/apple-icon-144x144.png">
   <link rel="apple-touch-icon" sizes="152x152" href="img/favicons/apple-icon-152x152.png">
   <link rel="apple-touch-icon" sizes="180x180" href="img/favicons/apple-icon-180x180.png">
   <link rel="icon" type="image/png" sizes="192x192" href="img/favicons/android-icon-192x192.png">
@@ -40,12 +40,11 @@
   <!-- Our CSS -->
   <link rel="stylesheet" href="css/master.css">
 
-
   <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
   <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
   <!--[if lt IE 9]>
-  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.2/html5shiv.js"></script>
-  <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <script src="https://static.fsf.org/nosvn/libs/html5shiv/3.7.3/html5shiv.js"></script>
+    <script src="https://static.fsf.org/nosvn/libs/respond.js/1.4.2/respond.min.js"></script>
   <![endif]-->
 
   <script>
@@ -98,8 +97,6 @@
 
 <!-- Add banner and modal window here -->
 
-
-
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <!-- Brand and toggle get grouped for better mobile display -->
@@ -110,7 +107,7 @@
           <!-- <span class="icon-bar bar2"></span> -->
           <!-- <span class="icon-bar bar3"></span> -->
         </button>
-        <a class="navbar-brand" href="https://fsf.org/"><img class="brand" src="img/logo.png" alt="FSF" width="180" /></a>
+        <a class="navbar-brand" href="https://fsf.org/"><img class="brand" src="img/logo-1.png" alt="FSF" width="180" /></a>
         <!-- <span class="label label-warning"><a href="https://fsf.org/jfb">Join the FSF</a></span> -->
 
       </div>
@@ -138,19 +135,19 @@
 			<center>
 			  <hr />
 			  <!-- <iframe src="https://static.fsf.org/nosvn/videos/fsf-heroes/" id="fsf-heroes-video" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block; width: 50%; height: 67vw; max-height: 200px;"></iframe> -->
-            <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-dblock" />
+            <img src="img/Illustration.png" alt="large-illustration" class="img-responsive center-dblock" />
 			</center>
           </div>
           <div class="intro-text col-md-6">
-            <h1>Does the gift you're giving your loved ones respect their rights?</h1>
+            <h1>Does the gift you're giving your loved ones put someone else in control?</h1>
 <p>The COVID-19 pandemic has made us more reliant on technology than
-ever, which is an even better reason to think carefully about the
-choices we're making during the gift-giving season. Is that smart
-assistant smart enough to respect your friend or family member's
-rights? Do new gaming consoles like the PlayStation 5 restrict more than they
-entertain? Or does that shiny gadget come at a cost much higher than
-its price tag?</p>
-			<p>When we allow <a href="https://gnu.org/proprietary">proprietary software</a> created by Facebook, Amazon, Apple, Google, and countless other companies to handle our basic computing tasks, we put an enormous amount of power in their hands, power which they freely exploit. It's only through using <a href="https://www.gnu.org/philosophy/free-sw.html">free software</a>, and <a href="https://ryf.fsf.org">devices running free software</a>, that we can seize this power back.</p>
+ever, which is a compelling reason to think carefully about the
+choices we're making during the gift-giving season. Is that "smart
+assistant" smart enough to respect your friend or family member's
+freedom? Do new gaming consoles like the PlayStation 5 restrict more
+than they entertain? Does that shiny gadget come at a cost much higher
+than its price tag?</p>
+			<p>When we allow <a href="https://gnu.org/proprietary">proprietary software</a> created by Facebook, Amazon, Apple, Microsoft, Google, and countless other companies to handle our basic computing tasks, we put an enormous amount of power in their hands, power which they constantly exploit. It's only through using <a href="https://www.gnu.org/philosophy/free-sw.html">free software</a>, and <a href="https://ryf.fsf.org">devices running free software</a>, that we can seize this power back.</p>
 			<h4>Freedom is the gift that keeps on giving</h4>
 <p>Letting your loved ones know that
 you respect their privacy and freedom too much to cave in for the
@@ -170,27 +167,29 @@ newest Apple or Google device is a great gift in itself, and one that
           <div class="action col-md-4 col-sm-4 text-center">
             <a class="action-button" href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&amp;t=Check out the Free Software Foundation Ethical Tech Giving Guide">Tell your friends</a>
             <p>
-			  Use the hashtag <span class="label label-default">#givefreely</span> on social media sites like <a href="https://fsf.org/twitter">Twitter</a>, <a href="https://mastodon.social">Mastodon</a>, or <a href="https://www.gnu.org/software/social/">GNU social</a>. You might get a gift out of it yourself!
+			  Use the hashtag <span class="label label-default">#UserFreedom</span> on social media sites like <a href="https://mastodon.social">Mastodon</a>, <a href="https://www.gnu.org/software/social/">GNU social</a>, or <a href="https://fsf.org/twitter">Twitter</a>. You might get a gift out of it yourself!
             </p>
           </div>
           <!-- End Action -->
 
           <!-- Begin Action -->
-          <div class="action col-md-4 col-sm-4 text-center">
-            <a class="action-button" href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Unleash your advocacy</a>
+		            <div class="action col-md-4 col-sm-4 text-center">
+            <a class="action-button" href="https://my.fsf.org/gift-a-membership">Gift a membership</a>
             <p>
-Your fight for freedom doesn't have to end at home. Use this
-<a href="https://static.fsf.org/nosvn/giving-guide-printable/v10/en.zip">printable version</a> of the guide to spread the word.            </p>
-
+         	  Freedom is the gift that keeps on giving. By giving your friend or family member an <b>FSF associate membership</b>, you can show them you care <i>and</i> benefit the cause for global software freedom.
+            </p>
           </div>
           <!-- End Action -->
 
           <!-- Begin Action -->
+
           <div class="action col-md-4 col-sm-4 text-center">
-            <a class="action-button" href="#charities">Support free software</a>
+            <a class="action-button" href="">Unleash your advocacy</a>
             <p>
-              Donate to our suggested charities.
+			  Your fight for freedom doesn't have to end at home. Use this
+<a href="https://static.fsf.org/nosvn/giving-guide-printable/v11/en.zip">printable version</a> of the guide to spread the word.
             </p>
+
           </div>
           <!-- End Action -->
         </div>
@@ -214,13 +213,19 @@ Your fight for freedom doesn't have to end at home. Use this
 
             <!-- Buy/Download Button   -->
             <a id="get-item" class="btn get-item" role="button" data-toggle="collapse" href="#sellers" aria-expanded="false" aria-controls="sellers" style="display:none">
-              BUY</a>
+              BUY
+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
+</a>
             <div class="collapse" id="sellers">
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
                 <a href="https://shop.puri.sm/shop/librem-5/" class="seller action-button">Purism</a>
+				<p class="sale-info links">
+				  <a href="#purism-promotion">Sale details.</a></p>
               </div>
             </div>
 
@@ -233,21 +238,24 @@ Your fight for freedom doesn't have to end at home. Use this
                   <strong>Get it from</strong>
                 </p>
                 <a href="https://shop.puri.sm/shop/librem-5/" class="seller action-button">Purism</a>
+				<p class="sale-info links">
+				  <a href="#purism-promotion">Sale details.</a></p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
 
             <ul class="pros">
- <p>Why it's cool: While we're still waiting for it to be released, this
+ <p>Why it's cool: While we're still waiting to get our hands on one, this
 device looks promising. We're giving it a tentative recommendation
 because the company has publicly committed to doing the right things
    for prioritizing user freedom and privacy, and because we <i>have</i>
-evaluated and endorsed the operating system it will run.</p>
+   <a href="https://www.gnu.org/distros/free-distros.html">evaluated and endorsed</a> the operating system it will run.</p>
 <p>Considering
 that many people around the world use a mobile phone as their only
 Internet-enabled device, it's important to have confidence that your
 mobile phone isn't "listening in" on you to make more money for
 advertisers.</p>
+ <p>(Like many companies, Purism has made financial contributions to the FSF's work, but that is not a consideration when deciding what products we list in this Guide.)</p>
             </ul>
           </div>
           <!--End Good-->
@@ -261,9 +269,7 @@ advertisers.</p>
 			  </li>
               <li>Comes equipped with physical <a href="https://puri.sm/posts/lockdown-mode-on-the-librem-5-beyond-hardware-kill-switches/">killswitches</a> for the microphone, GPS, and Wi-Fi connections, making snitching on your whereabouts a physical impossibility.
               </li>
-<li>Please note that the secondary processor (or "baseband") on the device still contains nonfree software. To preserve your freedom and privacy, be sure to flip the killswitch after placing a call or sending a text.</li>
-			  <li>Pairing the phone with Purism's own cell service <a href="https://puri.sm/products/librem-awesim/">AweSIM</a> can provide you
-  with another layer of anonymity and privacy.
+<li>Please note that the cellular modem still contains nonfree baseband firmware. This nonfree software does not have access to the main CPU or memory. The device can be used for other purposes without the baseband firmware. We list it here because of the ubiquity of cell phones and the fact that this is the best option of which we're currently aware.</li>
             </ul>
 
             <h5 class="text-center">Stay away from: iPhone</h5>
@@ -272,7 +278,7 @@ advertisers.</p>
               It's not just Siri that's creepy: all Apple devices contain software that's hostile to users. Although they claim to be concerned about user privacy, they don't hesitate to <a href="https://www.gnu.org/proprietary/malware-apple.html#surveillance">put their users under surveillance</a>.
 			  </li>
               <li>
-                iOS is a fully <a href="https://gnu.org/proprietary/">proprietary operating system</a>, giving Apple control over the software on every Apple device. This means they're putting themselves as the "man in the middle" between us and every message we send to our friends.
+Apple prevents you from installing third-party free software on your own phone, and they use this control to censor apps that compete with or subvert Apple's profits.
               </li>
 	      <li>Apple has a history of exploiting their absolute control over their users to <a href="https://www.latimes.com/business/story/2019-10-08/apple-taiwan-flag-emoji-iphones-hong-kong">silence political activists</a> and help governments <a href="https://www.nytimes.com/2019/04/07/world/asia/china-xi-jinping-study-the-great-nation-app.html">spy on millions</a> of users.</li>
 			</ul>
@@ -372,7 +378,7 @@ advertisers.</p>
             <a id="get-item-x200" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-x200" aria-expanded="false" aria-controls="sellers-x200" style="display:none">
               BUY
               <!-- Begin Sale -->
-              <!-- <span class="sale" >sale</span> -->
+              <span class="sale" >sale</span>
               <!-- End Sale -->
 			</a>
             <div class="collapse" id="sellers-x200">
@@ -384,6 +390,8 @@ advertisers.</p>
 		<a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
 		</p>
 				<p>  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
+				<p class="sale-info links">
+				  <a href="#vikings-promotion">Sale details.</a></p>
               </div>
             </div>
 
@@ -398,7 +406,9 @@ advertisers.</p>
 		<p>
 		<a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
 		</p>
-<p>				  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
+				<p>				  <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a></p>
+				<p class="sale-info links">
+				  <a href="#vikings-promotion">Sale details.</a></p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
@@ -418,17 +428,17 @@ it's the laptop that's most frequently used in the FSF office!</p>
 	  <!--start bad-->
           <div class="good col-md-6 col-sm-6">
 	      <ul class="pros">
-            <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> <a href="https://trisquel.info">Trisquel</a> operating system and <a href="https://libreboot.org">Libreboot</a> firmware.</li>
+            <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> <a href="https://trisquel.info">Trisquel</a> operating system and <a href="https://libreboot.at">Libreboot</a> firmware.</li>
               <li>Durable hardware that's meant to be easy to repair.</li>
               <li>Created by small businesses that replace restrictive components from a stock laptop.</li>
             </ul>
-            <h5 class="text-center">Stay away from: Microsoft Windows</h5>
-            <ul class="cons">
-             <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product. It also <a href="https://www.fsf.org/news/the-fsfs-statement-on-windows-10">forces users to consent to data collection</a> for "targeted advertising."
-              </li>
-              <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
-	     <li>Looking at a computer that includes an Intel CPU? They come with the <a href="https://www.fsf.org/blogs/sysadmin/the-management-engine-an-attack-on-computer-users-freedom">Intel Management Engine</a>, a hardware-based backdoor that gives Intel permanent and privileged access to your computer.</li>
-	     </ul>
+          <h5 class="text-center">Stay away from: MacBook Air and MacBook Pro</h5>
+          <ul class="cons">
+	    <li>macOS is <a href="https://gnu.org/proprietary">proprietary software</a> that restricts its users' freedoms.</li>
+		<li>In early November 2020, macOS was caught alerting Apple each time a user <a href="https://sneak.berlin/20201112/your-computer-isnt-yours/">opens an app</a>. Even though Apple is <a href="https://support.apple.com/en-us/HT202491">making changes</a> to the service, it just goes to show how bad they try to be until there is an outcry.</li>
+              <li>Apple has been <a href="https://motherboard.vice.com/en_us/article/evmeya/apple-iphone-right-to-repair-california">opposing the Right to Repair home user devices</a> for years, and maintains totalitarian control over their hardware.</li>
+              <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a> that rats on you to advertisers.</li>
+            </ul>
           </div>
           <!--End Bad-->
       </div>
@@ -443,10 +453,14 @@ it's the laptop that's most frequently used in the FSF office!</p>
             <!-- Buy/Download Button   -->
             <a id="get-item-d8" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-d8" aria-expanded="false" aria-controls="sellers-d8" style="display:none;">
               BUY
+			  <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
             </a>
             <div class="collapse" id="sellers-d8">
               <div class="center-block seller-group">
                 <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
+				<p class="sale-info links"><a href="#vikings-promotion">Sale details</a></p>
               </div>
             </div>
 
@@ -459,28 +473,29 @@ it's the laptop that's most frequently used in the FSF office!</p>
                   <strong>Get it from</strong>
                 </p>
                 <a href="https://store.vikings.net/ryf-certified-hardware/d8ryf" class="seller action-button">Vikings</a>
+				<p class="sale-info links"><a href="#vikings-promotion">Sale details</a></p>
               </div>
             </noscript>
             <ul class="pros">
 <p>Why it's cool: The Vikings D8 is a robust desktop computer that can be scaled up or down according to your needs, and which is capable of doing everything from simple Web browsing and video playback to intense code compilation.</p>
 
-<p>You can order the Vikings D8 installed with the preferred <a href="https://trisquel.info">Trisquel</a> distribution of GNU/Linux, a fully free operating system that removes the user-hostile binary-only blobs lurking in the drivers of many common network and graphics cards, or, if you prefer, you can order the D8 installed with any other <a href="https://gnu.org/distros/free-distros.html">free distribution of GNU/Linux</a>.</p>
+<p>You can order the Vikings D8 installed with the FSF-endorsed <a href="https://trisquel.info">Trisquel</a> distribution of GNU/Linux, a fully free operating system that removes the user-hostile binary-only blobs lurking in the drivers of many common network and graphics cards, or, if you prefer, you can order the D8 installed with any other <a href="https://gnu.org/distros/free-distros.html">free distribution of GNU/Linux</a>.</p>
 </ul>
 </div>
 
 <div class="good col-md-6 col-sm-6">
 <ul class="pros">
-			  <li>Has room for three hard drives and four custom case fans.</li>
-			  <li>Quiet and energy efficient while maintaining a small form factor.</li>
+  <li>Want to graduate from the X200? The D8 is higher performing while still just as respectful of your freedom.</li>
+  <li>Has room for three hard drives and four custom case fans.</li>
+  <li>Despite being a mid-tower PC, it runs quietly, allowing you to surf the Web or code in peace.</li>
 			  </ul>
-          <h5 class="text-center">Stay away from: Apple laptops and desktops</h5>
-          <ul class="cons">
-	    <li>macOS is <a href="https://gnu.org/proprietary">proprietary software</a> that restricts its users' freedoms.</li>
-		<li>In early November 2020, macOS started alerting its masters at Apple each time a user <a href="https://sneak.berlin/20201112/your-computer-isnt-yours/">opens an app</a>.</li>
-              <li>Apple has been <a href="https://motherboard.vice.com/en_us/article/evmeya/apple-iphone-right-to-repair-california">opposing the Right to Repair home user devices</a> for years, and maintains totalitarian control over their hardware.</li>
-              <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a> that rats on you to advertisers.</li>
-	    <li>Avoid: MacBook Air (and MacBook Pro).</li>
-            </ul>
+            <h5 class="text-center">Desktops running Microsoft Windows</h5>
+            <ul class="cons">
+             <li>Windows is <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product. It <a href="https://www.fsf.org/news/the-fsfs-statement-on-windows-10">forces users to consent to data collection</a> for "targeted advertising."
+              </li>
+              <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
+	     <li>Looking at a computer that includes an Intel CPU? They come with the <a href="https://www.fsf.org/blogs/sysadmin/the-management-engine-an-attack-on-computer-users-freedom">Intel Management Engine</a>, a hardware-based backdoor that gives Intel -- or intruders -- permanent and privileged access to your computer.</li>
+	     </ul>
           </div>
           <!--End Bad-->
         </div>
@@ -594,7 +609,7 @@ numbers, which aids in password generation and encryption.</p>
            <div class="good col-md-6 col-sm-6">
             <ul class="pros">
               <li>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.</li>
-			  <li>Certified as part of our <a href="https://ryf.fsf.org">RYF</a> program.</li>
+			  <li>Certified as part of our <a href="https://ryf.fsf.org">Respects Your Freedom (RYF)</a> program.</li>
 			  <li>If you use the X200 laptop listed in this Guide, an adapter like this won't be necessary.</li>
             </ul>
         </div></div></div>
@@ -735,18 +750,20 @@ numbers, which aids in password generation and encryption.</p>
 <li>Many free (as in freedom) educational books are available through sites like <a href="https://flossmanuals.net">FLOSS Manuals</a>, a supporter of the <a href="https://dayagainstdrm.org/">International Day Against DRM 2019</a>.</li>
 <li>Looking to buy paper books? Check out the <a href="https://shop.fsf.org">GNU Press Shop</a> for your technical manuals and documentation needs.</li>
 			</ul>
-          </div>
+		  </div>
           <!--End Good-->
-	  <!--start bad-->
+		  <!--start bad-->
+		  <div class="good col-md-6 col-sm-6">
 	      <h5 class="text-center">Stay away from: Amazon</h5>
             <ul class="cons">
-<li>Amazon is one of the most notorious DRM offenders. They use this <a href="https://www.defectivebydesign.org/amazon">Orwellian control</a> over their devices and services to spy on users and keep them trapped in their &quot;walled garden.&quot;</li>
+<li>Amazon is one of the most notorious DRM offenders. They use this <a href="https://www.defectivebydesign.org/amazon">Orwellian control</a> over their devices and services to spy on users and keep them trapped in their walled garden.</li>
 <li>Read more about the dangers of DRM through our <a href="https://defectivebydesign.org">Defective by Design</a> campaign.</li>
 			</ul>
+		  </div>
+			<!--End Bad-->
 		</div>
-          <!--End Bad-->
-        </div>
         <!--End Row-->
+	  </div>
       <!--End Container-->
 
 	  <div class="container">
@@ -758,13 +775,14 @@ numbers, which aids in password generation and encryption.</p>
   <p>Despite the efforts of companies like Spotify, we can still dance to music in the free world. Thanks to the <a href="https://www.defectivebydesign.org/guide/audio">artists, producers, record labels, and shops</a> highlighted on on our <a href="https://www.defectivebydesign.org/guide/">Guide to DRM-free Living</a>, the rights-respecting options are nearly endless. Check out music from great labels and artists, including:</p>
 <li>All of the music on <a href="https://bandcamp.com">Bandcamp</a> is DRM-free and comes in a variety of formats, including patent-free ones like FLAC and Ogg Vorbis.</li>
 <li><a href="https://www.dischord.com/">Dischord Records</a>, a classic punk label providing music since 1980.</li>
-<li><a href="https://www.emusic.com/">Emusic</a> is a DRM-free replacement for services like Spotify and Apple Music.</li>
-<li><a href="https://folkways.si.edu/">Folkways</a>, providing digital downloads of the world's best folk and children's music, courtesy of the Smithsonian Institute.</li>
+<li><a href="https://www.emusic.com/">Emusic</a> offers DRM-free MP3 downloads, providing a local alternative to streaming services like Spotify or Apple Music.</li>
+  <li><a href="https://folkways.si.edu/">Folkways</a>, providing digital downloads of the world's best folk and children's music, courtesy of the Smithsonian Institute.</li>
+  <li><a href="https://hdtracks.com">HDTracks</a> is an online music shop offering thousands of DRM-free downloads for you to play at home.</li>
 </ul>
 		  </div>
           <div class="good col-md-6 col-sm-6">
 <ul class="cons">
-<li>Stay away from: Spotify, Apple Music, and all other major streaming services</li>
+  <h5 class="text-center">Stay away from: Spotify, Apple Music, and all other major streaming services</h5>
 <li>Spotify is only one of many offenders when it comes to putting DRM in music: all major streaming services do this, with the support of big record labels.</li>
 <li>In addition to streaming music encumbered by DRM, people who want to use Spotify are required to install additional proprietary software. Even Spotify's client for GNU/Linux relies on proprietary software.</li>
 <li><p>Apple Music is no better, and places heavy restrictions on the music streamed through the platform.</p></li>
@@ -782,12 +800,12 @@ numbers, which aids in password generation and encryption.</p>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
             <h5 class="text-center">DRM-free video</h5>
-<p>In the last year, we've all become a little more dependent on streaming media. But it's important to remember how streaming services can deprive you of important rights. "Dis-services" like Disney+ and Netflix mandate the use of a hardware-level backdoor called Widevine, giving them permanent access into deep components of your machine.</p>
-<p>Widevine prohibits these services from running on many older devices, as well as most computers running GNU/Linux, leaving families who can't afford a new computer or a new television out in the cold.</p>
+<p>In the last year, many people have unfortunately become more dependent on streaming media. But it's important to remember how streaming services can deprive you of important rights. "Dis-services" like Disney+ and Netflix mandate the use of a hardware-level backdoor called Widevine, giving them permanent access into deep components of your machine.</p>
+<p>Widevine prohibits these services from running on many older devices, leaving families who can't afford a new computer or a new television out in the cold.</p>
   <p>Try these video services and sites instead:</p>
 <ul class="pros">
   <li>Visit the <a href="https://archive.org/details/movies">Moving Internet Archive</a> for free (as in freedom) classic films and art projects.</li>
-<li>The <a href="https://cloud.blender.org/open-projects">Blender Open Movies</a> project has a collection of computer-animated films that were made entirely with <a href="https://blender.org">Blender</a>, an enormously popular free software tool.</li>
+<li>The <a href="https://studio.blender.org/films">Blender Open Movies</a> project has a collection of computer-animated films that were made entirely with <a href="https://blender.org">Blender</a>, an enormously popular free software tool.</li>
 <li><p>Visit the <a href="https://www.defectivebydesign.org/guide/">Guide to DRM-free Living</a> for more suggestions on how to stay a film lover and keep your freedom at the same time.</p></li>
 	    </ul>
 
@@ -798,8 +816,8 @@ numbers, which aids in password generation and encryption.</p>
           <div class="good col-md-6 col-sm-6">
             <h5 class="text-center">Stay away from: Netflix</h5>
               <ul class="cons">
-				<li><p>Netflix is continuing its <a href="https://defectivebydesign.org/netflix">disturbing trend</a> of making onerous DRM the norm for streaming media.</p>
-<li><p>They're also leveraging their newfound place in the <a href="https://torrentfreak.com/netflix-becomes-a-member-of-the-mpaa/">Motion Picture Association of America</a> (MPAA) to advocate for tighter restrictions on users, and were responsible for embedding DRM into the <a href="https://www.defectivebydesign.org/no-drm-in-html5">fabric of the Web</a>.</p</li>
+				<li><p>Netflix is continuing its <a href="https://defectivebydesign.org/netflix">disturbing trend</a> of making onerous DRM the norm for streaming media. That's why they're a target for this year's <a href="https://dayagainstdrm.org/">International Day Against DRM (IDAD)</a>.</p>
+<li><p>They're also leveraging their newfound place in the <a href="https://torrentfreak.com/netflix-becomes-a-member-of-the-mpaa/">Motion Picture Association of America</a> (MPAA) to advocate for tighter restrictions on users, and drove the effort to embed DRM into the <a href="https://www.defectivebydesign.org/no-drm-in-html5">fabric of the Web</a>.</p</li>
             </ul>
           </div>
           <!--End Bad-->
@@ -820,24 +838,23 @@ numbers, which aids in password generation and encryption.</p>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
 <p>In this section of our guide, we've highlighted some of the types of devices where there just isn't a choice on the market that actually respects your freedom. We hope you'll take this list as inspiration for the free software projects you contribute to and support.</p>
-          </div>
           <!--End Good-->
 
 	  <!-- start bad -->
-
-	  <div class="good col-md-6 col-sm-6">
 	    <h5 class="text-center">In need of development</h5>
 	    <ul class="pros">
 	      <li>Cameras</li>
 	      <li>eBook readers</li>
+		  <li>Home appliances</li>
 	      <li>Fitness trackers</li>
-	      <li>Watches</li>
+	      <li>Smartwatches</li>
 	      <li>Video gaming consoles</li>
   </ul>
+		  </div>
+		<div class="good col-md-6 col-sm-6" style="position:relative">
 	    <h5 class="text-center">Stay away from these devices:</h5>
             <ul class="cons">
 <li>Internet of Things connected home appliances, smart speakers, and virtual assistants are little more than spying devices brought into your home. These include Ring, Amazon Alexa, Amazon Echo, Google Home, Nest, Ecobee, and Sonos products.</li>
-<li>DRM can show up in many places that you wouldn't expect: even in the kitchen. Any device from the "Keurig 2.0" line will refuse to brew anything but officially sanctioned "K-cups." When brewing your tea or coffee this year, staying with the simpler option is smarter.</li>
 <li><p>The Nintendo Switch is a popular holiday gift, but few realize that Nintendo has utter control over the platform and offers little insight into how it really works -- or how it might be spying on you and your family. Not much has changed since our advice to <a href="https://www.defectivebydesign.org/nintendo">brick them</a> before they bricked the Nintendo DS.</p></li>
             </ul>
           </div>
@@ -855,32 +872,22 @@ numbers, which aids in password generation and encryption.</p>
           <h1 class="text-center">Recommended organizations for holiday donations</h1>
           <div class="row">
 	    <div class="col-md-4 col-md-offset-4 col-sm-4 col-sm-offset-4 col-xs-6 col-xs-offset-3">
-              <a href="https://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
+              <a href="https://www.fsf.org/"><img src="img/logo-1.png" alt="fsf" class="center-block img-responsive" /></a><br />
 <p>The Giving Guide is brought to you by the <a href="https://fsf.org">Free Software Foundation</a>. Our <a href="https://fsf.org/join">associate membership</a> program is the heart of the FSF's work campaigning for computer user freedom worldwide. We've been fighting for digital freedoms since 1985, and have no plans of stopping. Will you make your voice heard by <a href="https://fsf.org/appeal">joining today</a>?</p>
             </div>
           </div>
           <div style="height: 30px"></div>
           <div class="row">
 	    <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://april.org/"><img src="img/charities/april.png" alt="april" class="center-block img-responsive" /></a>
-            </div>
-	     <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://www.openrightsgroup.org/"><img src="img/charities/org.png" alt="ceataopen rights group logo" class="center-block img-responsive" /></a>
+              <a href="https://april.org/"><img src="img/charities/april.png" alt="April" class="center-block img-responsive" /></a>
             </div>
 	     <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://creativecommons.org/"><img src="img/charities/cc.png" alt="cc" class="center-block img-responsive" /></a>
+              <a href="https://creativecommons.org/"><img src="img/charities/cc.png" alt="Creative Commons" class="center-block img-responsive" /></a>
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://www.eff.org/"><img src="img/charities/eff.png" alt="eff" class="center-block img-responsive" /></a>
-            </div>
-	     <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://www.gnome.org/"><img src="img/charities/gnome.png" alt="gnome" class="center-block img-responsive" /></a>
-            </div>
+              <a href="https://www.torproject.org/"><img src="img/charities/tor.png" alt="Tor Foundation" class="center-block img-responsive" /></a></div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://sfconservancy.org/"><img src="img/charities/sfc.png" alt="sfc" class="center-block img-responsive" /></a>
-            </div>
-            <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://www.wikimedia.org/"><img src="img/charities/wikimedia.png" alt="wikimedia" class="center-block img-responsive" /></a>
+              <a href="https://www.wikimedia.org/"><img src="img/charities/wikimedia.png" alt="Wikimedia" class="center-block img-responsive" /></a>
             </div>
           </div>
         </div>
@@ -900,14 +907,14 @@ numbers, which aids in password generation and encryption.</p>
                 <div class="panel-body" id="promotion-details">
 <h2>Companies, distributors, and makers of freedom-friendly gadgets want to make it easier for you to give gifts that you feel good about. Check out these discounts and promotions.</h2>
             <ul style="list-style: none inside none;">
-	      <li id="GNU-promotion"><strong>GNU Press Shop: </strong>5% discount on all items using the coupon code <span class="label label-default">GIVEFREELY</span>. Code expires on December 31st. As always, FSF members get a 20% discount.</li>
+	      <li id="GNU-promotion"><strong>GNU Press Shop: </strong>5% discount on all items using the coupon code <span class="label label-default">GIVEFREELY</span>. Code expires on December 31st. As always, FSF members get a 20% discount. Together with this code, your associate membership could net you 25% off!</li>
+		  <li id="purism-promotion"><strong>Purism:</strong> 5% off of the Librem 5 with the discount code <span class="label label-default">GNULIDAYS</span>.</li>
+<li id="vikings-promotion"><strong>Vikings:</strong> 10% discount on <b>all</b> products and services between now and December 31, 2020. <b>Help the FSF:</b> Vikings will also make a donation to the FSF for each product purchased using the coupon code <span class="label label-default">LIBREFEST</span>.</li>
           <!--     <li id="libiquity-promotion"><strong>Libiquity: </strong>10% rebate off your subtotal price for any items you buy from the Web site. Libiquity will donate 5% of each purchase's subtotal price to the FSF. Ends at 00:00 EST on February 1st, 2019. Claim the rebate by sending the code <span class="label label-default">FSFGIVING</span> and your order number to <a href="mailto:sales@libiquity.com">sales@libiquity.com</a>. Libiquity will then credit the rebate amount to your payment method.</li> -->
           <!--     <li id="lulzbot-promotion"><strong>LulzBot: </strong><a href="https://www.lulzbot.com/lulzbot-sales-clearance-items">Features sales and clearance items on their Web site</a>.</li> -->
 	      <!-- <li id="minifree-promotion"><strong>Minifree: </strong><a href="https://minifree.org/">Offering a discount on all products through the end of the year.</a> -->
 	      <!-- <li id="technoethical-promotion"><strong>Technoethical:</strong> Discounts for all refurbished products until January 17th.</li> -->
 		      <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> 5% discount on <b>all</b> products is available to <a href="https://fsf.org/join">FSF members</a>.</li>
-                      <!-- <li id="vikings-promotion"><strong>Vikings:</strong> 5% discount on <b>all</b> products and services between now and February 1, 2019. <b>Help the FSF:</b> Vikings will also make a donation to the FSF for each product purchased using the coupon code  <span class="label label-default">fsfftw</span>.</li> -->
-
 </ul>
                   </div>
                 </div>
@@ -934,12 +941,12 @@ numbers, which aids in password generation and encryption.</p>
                     </p>
                     <p>The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms: </p>
                     <ul style="list-style: none inside none;">
-					  <li>Purism product image licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
-                      <li>X200 image in the public domain.</li>
-					  <li>NeuG image licensed under the <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0</a> license.</li>
-                      <li>ThinkPenguin images are licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li> 
-                      <!-- <li>Technoethical Replicant S3 image licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li> -->
-		      <li>Photo of bookshelf by <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a> licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> license.</li>
+					  <li>Purism product image copyright © 2019, Purism. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
+                      <li>X200 product image in the public domain.</li>
+					  <li>Vikings product images copyright © 2019, Vikings GmbH. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
+					  <li>NeuG product image copyright © 2020, Free Software Foundation, Inc. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li>
+                      <li>ThinkPenguin product images © 2019, ThinkPenguin, Inc. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a> license.</li> 
+		      <li>Bookshelf photo copyright © 2010, <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a>. Licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> license.</li>
                   </div>
                 </div>
               </div>
@@ -955,7 +962,7 @@ numbers, which aids in password generation and encryption.</p>
           <div class="container-fluid">
             <div class="row">
               <div class="col-md-4 col-sm-4 footer-logo">
-                <a href="https://fsf.org/"><img src="img/fsf-footer.png" alt="FSF" class="center-block footer-logo img-responsive" /></a>
+                <a href="https://fsf.org/"><img src="img/logo-1.png" alt="FSF" class="center-block footer-logo img-responsive" /></a>
               </div>
               <div class="col-md-8 col-sm-8">
                 <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —
@@ -1001,7 +1008,7 @@ numbers, which aids in password generation and encryption.</p>
 </script>
 <!-- End Piwik Code -->
 <!-- Piwik Image Tracker -->
-<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- <noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /><noscript> -->
 <!-- End Piwik -->
       </body>