X-Git-Url: https://vcs.fsf.org/?p=fsf-giving-guide.git;a=blobdiff_plain;f=v10%2Fgivingguide.html;h=d353375f4c1190a6ed8aa2247b45cde96b2bd243;hp=d1e97b74f3d3450c29bc8103d460c258ace36cdc;hb=e84a243b56ed16055cde313daf526607a1b17190;hpb=60737a83a9b946493ef8411ab2ff1df136f66614

diff --git a/v10/givingguide.html b/v10/givingguide.html
index d1e97b7..d353375 100644
--- a/v10/givingguide.html
+++ b/v10/givingguide.html
@@ -99,9 +99,9 @@
 
 <!-- Add banner and modal window here -->
 
-<iframe src="//static.fsf.org/nosvn/banners/2019fundraiser-fall/" width="100%" height="100%" scrolling="no" style="overflow: hidden; margin: 0; border: 0 none; display: block;"></iframe>
+    <iframe src="//static.fsf.org/nosvn/banners/2020fundraiser-fall/" style="width: 100%; height: 150px; display: block; margin: 0; border: 0 none; overflow: hidden;"></iframe>
 
-            <!-- begin fsf-modal-window-elem campaign element -->
+            <!-- Begin fsf-modal-window-elem campaign element -->
             <link type="text/css" rel="stylesheet" href="https://static.fsf.org/nosvn/fonts/fa/css/font-awesome.min.css">
             <style>
 #fsf-modal-window-elem-container div {
@@ -211,14 +211,13 @@
 
 #fsf-modal-window-elem {
     overflow: auto;
-    zoom: 1;
     padding: 20px;
     border-style: solid;
     border-width: 5px;
-    border-color: #ff00ff;
+    border-color: #c44945;
     border-radius: 20px;
     box-shadow: 0px 0px 10px #111111;
-    background-color: #19003a;
+    background-color: #fff2ab;
 }
 
 #fsf-modal-window-elem-header {
@@ -229,8 +228,8 @@
     font-family: sans-serif,"Helvetica",Arial;
     font-weight: bold;
     font-size: 24px;
-    color: #edd400;
-    text-shadow: 0px 0px 8px #00378c;
+    color: #002047;
+    /* text-shadow: 0px 0px 8px #00378c; */
     padding-bottom: 20px;
     margin-top: 0px;
     margin-bottom: 0px;
@@ -273,9 +272,9 @@
 #fsf-modal-window-elem-buttons a {
     width: 100%;
     display: block;
-    text-align:center;
+    text-align: center;
     font-size:35px;
-    color:#FFFFFF;
+    color:#002047;
     text-decoration: none;
     font-family: sans-serif,"Helvetica",Arial;
     font-weight: normal;
@@ -300,7 +299,7 @@
 }
 
 #fsf-modal-window-elem-text a {
-    color: #edd400;
+    color: #002047;
     font-weight: 700;
     text-decoration: none;
 }
@@ -319,12 +318,12 @@
 
 #fsf-modal-window-elem-text p {
     font-family: sans-serif,"Helvetica",Arial;
-    font-size: 18px;
+    font-size: 17px;
     font-weight: normal;
     margin: 0px 0px 10px 0px;
     line-height: 20px;
-    color: #ffffff;
-    text-shadow: 0px 0px 8px #4600ba;
+    color: #002047;
+    /* text-shadow: 0px 0px 8px #004067;*/
 }
             </style>
             <div id="fsf-modal-window-elem-container" style="display: none;">
@@ -335,51 +334,65 @@
                                 <div id="fsf-modal-window-elem-close-button" onclick="//fsfModalWindowElemDontShowForAWhile();">
                                     <i class="fa fa-close">&#8203;</i>
                                 </div>
-                                <h2>Join us and make an impact!</h2>
+                                <h2>All aboard for software freedom!</h2>
                             </div>
                             <div id="fsf-modal-window-elem-left-column">
                                 <div id="fsf-modal-window-elem-text">
 
 <p>
 
-Our associate members are the heart of the FSF's commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.
+In our 35 year journey, free software has become a vital global movement for user freedom.
+
+</p>
+
+<p>
+
+Without free software, we cannot and will not have a free society. Your membership fuels the voyage forward, and will help us reach our ultimate destination: full software freedom.
+
+</p>
+
+<p>
+
+Join us today for $10/month ($5 for students) and help us reach our January 18 goal of 500 new associate members!
 
 </p>
 
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN</a></span></p>
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2020&pk_kwd=learn-more&pk_source=modal">Read more</a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2020&pk_source=modal">Join</a></span></p>
 
                                 </div>
                             </div>
                             <div id="fsf-modal-window-elem-right-column">
                                 <div id="fsf-modal-window-elem-buttons" style="border-radius: 20px; box-shadow: 0px 0px 5px #0c2b2b;">
-                                    <div style="background-color:#ff00ff; border-top-right-radius: 20px; border-top-left-radius: 20px;">
-                                      <a style="text-shadow: 0px 0px 8px #b300b3;" href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-check-circle">&nbsp;</i>Join</a>
+                                    <div style="background-color:#c44945; border-top-right-radius: 20px; border-top-left-radius: 20px;">
+                                      <a style="text-shadow: 0px 0px 6px #e75e57;" href="https://my.fsf.org/join?pk_campaign=frfall2020&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-check-circle">&nbsp;</i>Join</a>
                                     </div>
 
-                                    <div style="background-color:#930093">
-                                      <a style="text-shadow: 0px 0px 8px #460046;" href="https://my.fsf.org/renew?pk_campaign=frfall2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-refresh">&nbsp;</i>Renew</a>
+                                    <!--<div style="background-color:#fff2ab">-->
+                                    <div style="background-color:#c8c4ff">
+                                      <a style="text-shadow: 0px 0px 4px #e75e57;" href="https://my.fsf.org/renew?pk_campaign=frfall2020&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-refresh">&nbsp;</i>Renew</a>
                                     </div>
 
-                                    <div style="background-color:#42009a; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; margin-bottom: 2px">
-                                      <a style="text-shadow: 0px 0px 8px #22004e;" href="https://my.fsf.org/donate?pk_campaign=frfall2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-money">&nbsp;</i>Donate</a>
+                                    <div style="background-color:#7745a8; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; margin-bottom: 2px">
+                                      <a style="text-shadow: 0px 0px 6px #fff2ab;" href="https://my.fsf.org/donate?pk_campaign=frfall2020&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-money">&nbsp;</i>Donate</a>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-                <script type="text/javascript">
+                <script>
 // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-3.0
 
-// licensed GPLv3-or-later by Andrew Engelbrecht
+// Licensed GPLv3-or-later by Andrew Engelbrecht
 
 var startTime, endTime, switchTextTime;
 
-startTime = new Date('2019-11-18T04:00:00Z');
-switchTextTime = new Date('2019-12-12T04:00:00Z');
-endTime = new Date('2020-01-01T04:00:00Z');
+startTime = new Date('2020-11-13T04:00:00Z');
+switchTextTime = new Date('2020-12-16T04:00:00Z');
+// endTime is unused.
+endTime = new Date('2021-01-01T04:00:00Z');
 
-// possibly switch the text that is displayed in the modal window, depending
+// Possibly switch the text that is displayed in the modal window, depending
 // upon the current date.
 function fsfModalWindowElemMaybeSwitchText () {
 
@@ -387,29 +400,29 @@ function fsfModalWindowElemMaybeSwitchText () {
 
     now = new Date();
     if (now.getTime() < switchTextTime.getTime()) {
-        return; // don't switch the dbd text
+        return; // Do not switch the text
     }
 
-    // switch dbd text
+    // Switch text
     document.getElementById("fsf-modal-window-elem-text").innerHTML =' \
 \
-<p>Our associate members are the heart of the FSF\'s commitment to a society where software respects our freedom and dignity. Every individual that takes a stand will help us reach our goal to welcome 600 new free software advocates by December 31st.<\/p> \
+<p>In our 35 year journey, free software has become a vital global movement for user freedom.<\/p><p>Without free software, we cannot and will not have a free society. Your membership fuels the voyage forward, and will help us reach our ultimate destination: full software freedom.<\/p><p>Join us today for $10\/month ($5 for students) and help us reach our January 18 goal of 500 new associate members!<\/p> \
 \
-<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2019&pk_kwd=learn-more&pk_source=modal">READ MORE<\/a> | <a href="https://my.fsf.org/join?pk_campaign=frfall2019&pk_source=modal2">JOIN<\/a><\/span><\/p>';
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=frfall2020&pk_kwd=learn-more&pk_source=modal">Read more<\/a> |  <a href="https://my.fsf.org/join?pk_campaign=frfall2020&pk_source=modal">Join<\/a><\/span><\/p>';
 }
 
-// show fsf-modal-window-elem if it hasn't been previously closed by
+// Show fsf-modal-window-elem if it has not been previously closed by
 // the user, nor recently hit "maybe later",
 // and the campaign is still happening
 function fsfModalWindowElemMaybeShow () {
 
     var pattern, noShowFsfModalWindowElementP, now;
 
-    // see if cookie says not to show element
-    pattern = /showFsfFall2019FundraiserModalWindowElementP\s*=\s*false/;
+    // See if cookie says not to show element
+    pattern = /showFsfFall2020FundraiserModalWindowElementP\s*=\s*false/;
     noShowFsfModalWindowElementP = pattern.test(document.cookie);
 
-//// uncomment here to enable modal window hiding
+//// Uncomment here to enable modal window hiding
     if (!noShowFsfModalWindowElementP) {
         setTimeout(function () {
             // display the element
@@ -418,14 +431,16 @@ function fsfModalWindowElemMaybeShow () {
     }
 }
 
-// call this first to set the proper text
+// Call this first to set the proper text.
 fsfModalWindowElemMaybeSwitchText();
-// call this right away to avoid flicker
-fsfModalWindowElemMaybeShow();
-
+// Check if appeal is the url.
+if (window.location.href.indexOf("appeal") == -1) {
+  // Call this right away to avoid flicker.
+  fsfModalWindowElemMaybeShow();
+}
 
-// get the time `plusDays` in the future.
-// can be a fraction.
+// Get the time `plusDays` in the future.
+// This can be a fraction.
 function daysInFuture (plusDays) {
     var now, future;
 
@@ -434,56 +449,61 @@ function daysInFuture (plusDays) {
     return future.toGMTString();
 }
 
-// hide the fsf-modal-window-elem
+// Hide the fsf-modal-window-elem
 function fsfModalWindowElemHide () {
     document.getElementById("fsf-modal-window-elem-container").style.display="none";
 }
 
-// optionally hide elem and set a cookie to keep the fsf-modal-window-elem hidden for the next `forDays`.
+// Optionally hide elem and set a cookie to keep the fsf-modal-window-elem hidden for the next `forDays`.
 function fsfModalWindowElemDontShowForDays (forDays, hideNow) {
     if (hideNow === true) {
         fsfModalWindowElemHide();
     }
-    //document.cookie = "showFsfFall2019FundraiserModalWindowElementP=false; path=/; domain=.fsf.org; expires=" + daysInFuture(forDays);
-    document.cookie = "showFsfFall2019FundraiserModalWindowElementP=false; path=/; expires=" + daysInFuture(forDays);
+    //document.cookie = "showFsfFall2020FundraiserModalWindowElementP=false; path=/; domain=.fsf.org; expires=" + daysInFuture(forDays);
+    document.cookie = "showFsfFall2020FundraiserModalWindowElementP=false; path=/; SameSite=Strict; Secure; expires=" + daysInFuture(forDays);
 }
 
-// hide the element from now to two weeks after closing it
+// Hide the element from now to two weeks after closing it
 function fsfModalWindowElemDontShowForAWhile () {
     fsfModalWindowElemDontShowForDays(7, true);
 }
 
-// keep the element visible for now, but don't show it for a while
+// Keep the element visible for now, but do not show it for a while
 function fsfModalWindowElemFollowedLink () {
     fsfModalWindowElemDontShowForDays(14, false);
 }
 
-// close popup if user clicks trasparent part
+// Check if visiting appeal page.
+if (window.location.href.indexOf("appeal") > -1) {
+  fsfModalWindowElemDontShowForAWhile();
+}
+
+// Close popup if user clicks trasparent part
 document.getElementById("fsf-modal-window-elem-container").addEventListener("click", function(event){
     fsfModalWindowElemDontShowForAWhile();
 });
 
-// don't close popup if clicking non-trasparent part (with the text and buttons)
+// Do not close popup if clicking non-trasparent part (with the text and buttons)
 document.getElementById("fsf-modal-window-elem").addEventListener("click", function(event){
     event.stopPropagation();
 });
 
-// close popup if user clicks X icon
+// Close popup if user clicks X icon
 document.getElementById("fsf-modal-window-elem-close-button").addEventListener("click", function(event){
     fsfModalWindowElemDontShowForAWhile();
 });
 
-// disable popup if user clicks one of the main buttons
+// Disable popup if user clicks one of the main buttons
 document.getElementById("fsf-modal-window-elem-buttons").addEventListener("click", function(event){
     fsfModalWindowElemFollowedLink();
 });
 
-// disable popup if user clicks one of the "Read more" link
+// Disable popup if user clicks one of the "Read more" link
 document.getElementById("fsf-modal-window-text-link").addEventListener("click", function(event){
     fsfModalWindowElemFollowedLink();
 });
 
-// close popup if user presses escape key 
+// Close popup if user presses escape key
 window.addEventListener("keydown",  function  (event)  {
     switch  (event.key)  {
         case  "Escape":
@@ -493,11 +513,10 @@ window.addEventListener("keydown",  function  (event)  {
             return;
     }
 },  true);
-
 // @license-end
                 </script>
             </div>
-            <!-- end fsf-modal-window-elem campaign element -->
+            <!-- End fsf-modal-window-elem campaign element -->
 
   <nav class="navbar navbar-default">
     <div class="container-fluid">
@@ -534,24 +553,24 @@ window.addEventListener("keydown",  function  (event)  {
       <div class="container">
         <div class="row">
           <div class="illustration col-md-6">
+			<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" />
+			</center>
           </div>
           <div class="intro-text col-md-6">
             <h1>Does the gift you're giving your loved ones respect their rights?</h1>
-			<p>Let your loved ones know that you respect them too much
-to give them gifts that invade their privacy and abuse their freedom.
-This Giving Guide is full of gifts that you can feel good about
-instead.</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>
 <p>When picking a gift this year, we urge you to think carefully about
 the choice you're making. Is that smart assistant smart enough to
 respect your friend or family member's rights? Does that tablet really
 have their best interest in mind? 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>
 			<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
-newest Apple or Google product is a great gift in itself, and one that
+newest Apple or Google device is a great gift in itself, and one that
   you can feel good about.</p>
           </div>
         </div>
@@ -658,6 +677,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>
             </ul>
 
             <h5 class="text-center">Stay away from: iPhone</h5>
@@ -679,7 +699,7 @@ advertisers.</p>
 	   <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
           <h5 class="text-center">Galaxy S3 with Replicant</h5>
-            <img src="img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
+            <img src="img/products/mobile_s3.png" alt="replicant phone" class="center-block" />
             <!-- Buy/Download Button   -->
             <a id="get-item-replicant" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-replicant" aria-expanded="false" aria-controls="sellers" style="display:none">
               BUY
@@ -692,7 +712,10 @@ advertisers.</p>
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
+				<p>                <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a></p>
+				                <p class="sale-info links">
+                  <a href="#technoethical-promotion">Sale details.</a>		  
+                </p>
               </div>
             </div>
 
@@ -734,13 +757,13 @@ advertisers.</p>
               <li>
                 Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalog that makes it easy to get all the applications you need without sacrificing control of your phone.
               </li>
-	      <li>Note: While the main processor exclusively runs free software, the modem processor runs a Samsung nonfree system.</li>
+	      <li>Note: While the main processor exclusively runs free software, the modem processor runs Samsung's nonfree system.</li>
             </ul>
 
             <h5 class="text-center">Stay away from: Google Pixel</h5>
             <ul class="cons">
 <li>The Google Pixel line (and most Android devices) aren't just
-  restricted by Widevine DRM. They also come with
+  restricted by Widevine's <a href="https://www.gnu.org/philosophy/can-you-trust.html">treacherous</a> DRM. They also come with
 <a href="https://gnu.org/proprietary">proprietary</a> Google apps that
 <a href="https://www.gnu.org/proprietary/malware-google.html">subjugate users</a>.</li>
 			</ul>
@@ -762,6 +785,9 @@ advertisers.</p>
             <!-- Buy/Download Button   -->
             <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>
+              <!-- End Sale -->
 			</a>
             <div class="collapse" id="sellers-x200">
               <div class="center-block seller-group">
@@ -771,7 +797,10 @@ advertisers.</p>
            	<p>
 		<a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
 		</p>
+				<p><a href="https://tehnoetic.com/laptops/tet-x200" class="seller action-button">Technoethical</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="#technoethical-promotion">Sale details.</a></p>
               </div>
             </div>
 
@@ -785,8 +814,12 @@ advertisers.</p>
                 </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>
+			<p><a href="https://tehnoetic.com/laptops/tet-x200" class="seller action-button">Technoethical</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="#technoethical-promotion">Sale details.</a>		  
+                </p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
@@ -946,7 +979,10 @@ numbers, which aids in password generation and encryption.</p>
               </a>
               <div class="collapse" id="sellers-mini-adapter">
                 <div class="center-block seller-group">
-                  <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
+				  <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
+<p class="sale-info links">
+  <a href="#technoethical-promotion">Sale details</a></p>
+                  <p><a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a></p>
                   <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>
                   </p>
@@ -961,6 +997,9 @@ numbers, which aids in password generation and encryption.</p>
                   <p style="color: #6b6b6b">
                     <strong>Get it from</strong>
                   </p>
+				  <p><a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150" class="seller action-button">Technoethical</a></p>
+<p class="sale-info links">
+  <a href="#technoethical-promotion">Sale details</a></p>
                   <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-gnu-linux-tpe-n150usb" class="seller action-button">ThinkPenguin</a>
 <p class="sale-info links">
                     <a href="#thinkpenguin-promotion">Sale details.</a>
@@ -1142,7 +1181,7 @@ numbers, which aids in password generation and encryption.</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, courtesy of the Smithsonian Institute.</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>
 </ul>
 		  </div>
           <div class="good col-md-6 col-sm-6">
@@ -1165,7 +1204,7 @@ 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>This year has brought us some disturbing &quot;advances&quot; from streaming services like <a href="https://www.theverge.com/2019/11/11/20960441/netflix-ditching-old-roku-devices-because-of-drm">Netflix</a> and <a href="https://www.androidpolice.com/2019/10/22/disney-will-only-work-on-devices-that-support-the-strictest-widevine-l3-drm/">Disney+</a>. Both companies have mandated the use of a hardware-level backdoor called Widevine, giving them permanent access into deep components of your machine.</p>
+<p>This year has brought us some disturbing &quot;advances&quot; from streaming services like <a href="https://www.theverge.com/2019/11/11/20960441/netflix-ditching-old-roku-devices-because-of-drm">Netflix</a> and <a href="https://www.androidpolice.com/2019/10/22/disney-will-only-work-on-devices-that-support-the-strictest-widevine-l3-drm/">Disney+</a>. Both companies have mandated the use of a <a href="https://www.gnu.org/philosophy/can-you-trust.html">treacherous computing</a> scheme called <a href="https://www.androidauthority.com/widevine-explained-821935/">Widevine</a>, giving them the power to choose what you can and cannot do on your own device.</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>Try these video services and sites instead:</p>
 <ul class="pros">
@@ -1220,6 +1259,7 @@ numbers, which aids in password generation and encryption.</p>
 	    <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>
@@ -1286,7 +1326,7 @@ numbers, which aids in password generation and encryption.</p>
           <!--     <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 the end of December.</li>
+	      <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> -->
 
@@ -1365,19 +1405,26 @@ numbers, which aids in password generation and encryption.</p>
         <!-- Our JS -->
         <script src="js/magic.js" charset="utf-8"></script>
 
-        <!-- Piwik -->
-        <script type="text/javascript">
-        // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-        var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-        document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-        try {
-          var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-          piwikTracker.trackPageView();
-          piwikTracker.enableLinkTracking();
-        } catch (err) {}
-        // @license-end
-        </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-        <!-- End Piwik Tracking Code -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u = (("https:" == document.location.protocol) ? "https" : "http") + "://"+"piwik.fsf.org//";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+  // @license-end
+</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>
+<!-- End Piwik -->
       </body>
 
       </html>