edits per dana suggestions.
[fsf-giving-guide.git] / v8 / givingguide.html
index 180581aa76ff1478820d2455122604d91cb6c039..1f3a22f12d8fdaf6420bb0c8349b58ca36d1d182 100644 (file)
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <title>Ethical Tech | Giving Guide</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <title>Ethical Tech | Giving Guide</title>
-  <meta name="description" content="This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive counterparts.">
+  <meta name="description" content="This is the Free Software Foundation (FSF) guide to smarter gift giving, compared with their restrictive counterparts.">
 
   <!-- Some Colors -->
   <!-- Chrome, Firefox OS and Opera -->
 
   <!-- Some Colors -->
   <!-- Chrome, Firefox OS and Opera -->
   <link rel="stylesheet" href="css/master.css">
 
   <script type="text/javascript">
   <link rel="stylesheet" href="css/master.css">
 
   <script type="text/javascript">
-  /** @licstart  The following is the entire license notice for the
-  *  JavaScript code in this page
-  *
-  *   Copyright (C) 2014-2017 Free Software Foundation
-  *
-  *   The JavaScript code in this page is free software: you can
-  *   redistribute it and/or modify it under the terms of the GNU
-  *   General Public License (GNU GPL) as published by the Free Software
-  *   Foundation, either version 3 of the License, or (at your option)
-  *   any later version.  The code is distributed WITHOUT ANY WARRANTY;
-  *   without even the implied warranty of MERCHANTABILITY or FITNESS
-  *   FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
-  *
-  *   As additional permission under GNU GPL version 3 section 7, you
-  *   may distribute non-source (e.g., minimized or compacted) forms of
-  *   that code without the copy of the GNU GPL normally required by
-  *   section 4, provided you include this license notice and a URL
-  *   through which recipients can access the Corresponding Source.
-  *
-  *  @licend  The above is the entire license notice
-  *  for the JavaScript code in this page.
-  */
+    /** @licstart  The following is the entire license notice for the
+     *  JavaScript code in this page
+     *
+     *   Copyright (C) 2014-2016 Free Software Foundation
+     *
+     *   The JavaScript code in this page is free software: you can
+     *   redistribute it and/or modify it under the terms of the GNU
+     *   General Public License (GNU GPL) as published by the Free Software
+     *   Foundation, either version 3 of the License, or (at your option)
+     *   any later version.  The code is distributed WITHOUT ANY WARRANTY;
+     *   without even the implied warranty of MERCHANTABILITY or FITNESS
+     *   FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+     *
+     *   As additional permission under GNU GPL version 3 section 7, you
+     *   may distribute non-source (e.g., minimized or compacted) forms of
+     *   that code without the copy of the GNU GPL normally required by
+     *   section 4, provided you include this license notice and a URL
+     *   through which recipients can access the Corresponding Source.
+     *
+     *  @licend  The above is the entire license notice
+     *  for the JavaScript code in this page.
+     */
   </script>
 
   <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
   </script>
 
   <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 
 <!-- ATTRACTIVE INFORMATIONAL ALERT / ASIDE BLOCK, SAVED HERE FOR REFERENCE
 
 
 <!-- ATTRACTIVE INFORMATIONAL ALERT / ASIDE BLOCK, SAVED HERE FOR REFERENCE
 
-<div class="alert alert-success center-block">
-<li class="info">
-<p>
-Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom" class="alert-link">certified to Respect Your Freedom</a> (RYF-certified).
-</p>
-</li>
-</div>
+      <div class="alert alert-success center-block">
+        <li class="info">
+          <p>
+            Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom" class="alert-link">certified to Respect Your Freedom</a> (RYF-certified).
+          </p>
+        </li>
+      </div>
 -->
 
 <body>
 -->
 
 <body>
@@ -98,7 +98,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
           <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>
           <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>
-        <!-- <span class="label label-warning"><a href="http://fsf.org/jfb">Join the FSF</a></span> -->
+        <!-- <span class="label label-warning"><a href="https://fsf.org/jfb">Join the FSF</a></span> -->
 
       </div>
 
 
       </div>
 
@@ -108,7 +108,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
           <li><a class="animated fadeIn" href="https://www.fsf.org/about/">About the FSF</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/campaigns/">Campaigns</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/donate/">Donate</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/about/">About the FSF</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/campaigns/">Campaigns</a></li>
           <li><a class="animated fadeIn" href="https://www.fsf.org/donate/">Donate</a></li>
-          <li><a class="animated fadeIn" href="http://shop.fsf.org/">Shop</a>
+          <li><a class="animated fadeIn" href="https://shop.fsf.org/">Shop</a>
           </ul>
 
         </div>
           </ul>
 
         </div>
@@ -125,15 +125,11 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-block" />
           </div>
           <div class="intro-text col-md-6">
             <img src="img/Illustration.png" alt="large-illutration" class="img-responsive center-block" />
           </div>
           <div class="intro-text col-md-6">
-            <h1>CLEVER TAG LINE HERE THANKS DANA</h1>
-            <h4>You can't always judge a book by its cover</h4>
-            <p>
-             It's hard to be sure what you're actually giving someone--especially when you're talking about digital media, electronics, and the newest batch of gadgets. With manufacturer restrictions going out of control, some gifts take away more than they give us.
-            </p>
-            <h4>But sometimes you can look inside</h4>
-            <p>
-             Ethical companies are making--and using--ethical technologies to make sure the gifts we give belong to those they're for. Whether you're looking for freedom and privacy or just the knowledge that that ebook will still be around six months from now, the Free Software Foundation's Ethical Giving Guide can help you find the perfect gift.
-            </p>
+            <h1>Give the gift of freedom!</h1>
+
+           <p>A new phone or computer can be the highlight of the holidays, but with proprietary software lurking under the wrapping paper, your thoughtful gift may be more naughty than nice.</p>
+<p>This guide replaces these holiday humbugs with better devices from ethical companies -- no creepy remote deletion of files, no punitive and mean rules about copying and sharing. Just products and software that respect the freedom and privacy of your loved ones: gifts you can feel good about.</p>
+<p>Plus, our crib notes below will help you explain why this version is better than the one they've heard of (and spread the word about software freedom, too).</p>
           </div>
         </div>
       </div>
           </div>
         </div>
       </div>
@@ -146,7 +142,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         <div class="row">
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
         <div class="row">
           <!-- Begin Action -->
           <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">Share</a>
+            <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 <span class="label label-default">#givefreely</span>. You might get a gift out of it!
             </p>
             <p>
               Use <span class="label label-default">#givefreely</span>. You might get a gift out of it!
             </p>
@@ -155,9 +151,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
 
           <!-- 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">Lead an event</a>
+            <a class="action-button" href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Host a Giving Guide Giveaway</a>
             <p>
             <p>
-              Print and distribute to holiday shoppers.
+              Download the printable version.
             </p>
 
           </div>
             </p>
 
           </div>
@@ -165,9 +161,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
 
           <!-- Begin Action -->
           <div class="action col-md-4 col-sm-4 text-center">
-            <a class="action-button" href="#charities">Donate instead</a>
+            <a class="action-button" href="#charities">Support free software activism</a>
             <p>
             <p>
-              Help a free software organization in a friend's name.
+              Donate to our suggested charities in your friend/family member's name
             </p>
           </div>
           <!-- End Action -->
             </p>
           </div>
           <!-- End Action -->
@@ -183,11 +179,11 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 
       <!--Smartphones-->
       <div class="container smartphones">
 
       <!--Smartphones-->
       <div class="container smartphones">
-        <h3 class="title text-center">Smartphones</h3>
+        <h2 class="title text-center">Smartphones</h2>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
-            <img src="//static.fsf.org/nosvn/images/technoethical-replicant-s3.png" alt="replicant phone" class="center-block" />
-            <h5 class="text-center">Galaxy S3 with Replicant</h5>
+            <img src="/v8/img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
+            <h5 class="text-center">Galaxy Note 2 with Replicant</h5>
 
             <!-- 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/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">
@@ -201,7 +197,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </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>
+                <a href="https://tehnoetic.com/mobile-devices/tet-n2" class="seller action-button">Technoethical</a>
                 <div class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </div>
                 <div class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </div>
@@ -216,7 +212,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </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>
+                <a href="https://tehnoetic.com/mobile-devices/tet-n2" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </p>
                 <p class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </p>
@@ -226,27 +222,36 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <!-- End Buy/Download button -->
 
             <ul class="pros">
             <!-- End Buy/Download button -->
 
             <ul class="pros">
+ <p>Why it's cool: Ever feel like every time you pick up your smartphone, someone is watching you? This may not cut off their access entirely, but it will make their job a little harder.</p>
 
 
-              <li>
-                Runs the <a href="http://www.replicant.us">Replicant</a> free operating system, based on Android. Caveat: its modem hardware separately runs a nonfree system.
+<p> Your smartphone is so much more than a phone: it's a tiny computer you carry with you every day, and for many people around the world, it's their only internet-enabled device. Choosing one of these phones lets you bring software freedom everywhere you go.</p>
+
+<p>         You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or <a "https://tehnoetic.com/mobile-devices/tehnoetic-s3-phone-replicant">S3</a>, complete with replicant.</p>
+            </ul>
+          </div>
+          <!--End Good-->
+
+         <!-- start bad -->
+
+          <div class="good col-md-6 col-sm-6">
+           <ul class="pros">
+             <li>
+               Runs the <a href="https://www.replicant.us">Replicant</a> free operating system, based on Android.
               </li>
               <li>
                 Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
               </li>
               </li>
               <li>
                 Features <a href="https://www.f-droid.org/">F-Droid</a>, the free software catalogue that makes it easy to get all the applications you need without sacrificing control of your phone.
               </li>
+             <li>Note: While the main processor is exclusively running free software, the modem processor runs a Samsung nonfree system.</li>
             </ul>
             </ul>
-          </div>
-          <!--End Good-->
 
 
-          <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/iphone-blocked.png" alt="iphone" class="center-block fix-iphone" />
-            <h5 class="text-center">iPhone</h5>
+            <h5 class="text-center">Stay away from: iPhones</h5>
             <ul class="cons">
               <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
               <li>
                 iOS is a fully proprietary operating system, giving Apple control over the software on the devices.
               </li>
               <li>
             <ul class="cons">
               <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
               <li>
                 iOS is a fully proprietary operating system, giving Apple control over the software on the devices.
               </li>
               <li>
-                Apple uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
+                Apple uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to block competing software.
               </li>
             </ul>
           </div>
               </li>
             </ul>
           </div>
@@ -255,15 +260,21 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         <!--End Row-->
       </div>
       <!--End Container-->
         <!--End Row-->
       </div>
       <!--End Container-->
+      <!--End bad-->
 
 
-      <!--Full-Sized Laptops-->
+
+              <h2 class="title text-center">Laptops, Tablets, and Desktops</h2>
+
+ <!--Laptops-->
       <div class="container">
       <div class="container">
-        <h3 class="title text-center">Full-Sized Laptops</h3>
+        <h3 class="title text-center">Laptops</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
             <img src="img/products/t400.png" alt="t400" class="center-block" />
             <h5 class="text-center">T400 with GNU/Linux</h5>
 
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
             <img src="img/products/t400.png" alt="t400" class="center-block" />
             <h5 class="text-center">T400 with GNU/Linux</h5>
 
+
+           
             <!-- Buy/Download Button   -->
             <a id="get-item-full" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-full" aria-expanded="false" aria-controls="sellers-full" style="display:none">
               BUY
             <!-- Buy/Download Button   -->
             <a id="get-item-full" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-full" aria-expanded="false" aria-controls="sellers-full" style="display:none">
               BUY
@@ -280,6 +291,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </p>
                 <p class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </p>
+               <p>
+               <a href="https://minifree.org/product/libreboot-t400/" class="seller action-button">Minifree</a>
+               </p>
               </div>
             </div>
 
               </div>
             </div>
 
@@ -295,28 +309,36 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 <p class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </p>
                 <p class="sale-info links">
                   <a href="#technoethical-promotion">Sale details.</a>
                 </p>
+               <p>
+               <a href="https://minifree.org/product/libreboot-t400/" class="seller action-button">Minifree</a>
+               </p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
 
             <ul class="pros">
               </div>
             </noscript>
             <!-- End Buy/Download button -->
 
             <ul class="pros">
+             <p>Why it's cool: You need a reliable computer for work and play. This one is just dandy for both, minus icky DRM and spyware.</p>
+             <p>Setting up a fully free system is easier than it used to be, but can still seem daunting--especially if you've never done it before. Luckily, you can now get a new-to-you laptop that's ready to go out of the box.</p>
+             <p>Technoethical also has a <a href="https://tehnoetic.com/laptops/tet-t400s">T400s</a> available.</p>
+           </ul>
+
+          </div>
+          <!--End Good-->
+         
+         <!--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> Trisquel operating system and libreboot firmware.</li>
               <li>Durable hardware is meant to last and is easy to repair.</li>
               <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
             </ul>
               <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware.</li>
               <li>Durable hardware is meant to last and is easy to repair.</li>
               <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
             </ul>
-
-          </div>
-          <!--End Good-->
-
-          <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/macbook-blocked.png" alt="macbook" class="center-block fix-macbook" />
-            <h5 class="text-center">Apple Macbook Pro with macOS</h5>
+            <h5 class="text-center">Stay away from: Windows</h5>
             <ul class="cons">
             <ul class="cons">
-              <li>Runs on proprietary software that restricts the user's freedoms.</li>
-              <li>
-                Apple's App Store uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to restrict what you can do with your purchases.
+             <li>Runs on proprietary software that profits from treating the user as a product -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user
+                data.
               </li>
               </li>
-              <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
+              <!-- Commented out pending citation or confirmation <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</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>
             </ul>
           </div>
           <!--End Bad-->
             </ul>
           </div>
           <!--End Bad-->
@@ -324,7 +346,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         <!--End Row-->
       </div>
       <!--End Container-->
         <!--End Row-->
       </div>
       <!--End Container-->
-
+      
       <!--Compact Laptops-->
       <div class="container">
         <h3 class="title text-center">Compact Laptops</h3>
       <!--Compact Laptops-->
       <div class="container">
         <h3 class="title text-center">Compact Laptops</h3>
@@ -333,6 +355,9 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
             <img src="img/products/x200.png" alt="x200" class="center-block" />
             <h5 class="text-center">X200 with GNU/Linux</h5>
 
             <img src="img/products/x200.png" alt="x200" class="center-block" />
             <h5 class="text-center">X200 with GNU/Linux</h5>
 
+
+
+           
             <!-- Buy/Download Button   -->
             <a id="get-item-compact" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-compact" aria-expanded="false" aria-controls="sellers-compact" style="display:none">
               BUY
             <!-- Buy/Download Button   -->
             <a id="get-item-compact" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-compact" aria-expanded="false" aria-controls="sellers-compact" style="display:none">
               BUY
@@ -353,9 +378,14 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  Technoethical's X200 has not yet been evaluated for <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification, but global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
+                  Technoethical's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
                 </p>
                 </p>
-                <!--<a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>-->
+                   <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a>
+                <p class="sale-info links">
+                  Viking's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#viking-promotion">Sale details.</a>
+
+                </p>
+            
               </div>
             </div>
 
               </div>
             </div>
 
@@ -373,29 +403,38 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  Technoethical's X200 has not yet been evaluated for <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification, but global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
+                  Technoethical's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified, and global shipping is available. <a href="#technoethical-promotion">Sale details.</a>
                 </p>
                 </p>
-                <!--<a href="https://minifree.org/product/libreboot-x200/" class="seller action-button">Minifree</a>-->              </div>
+                           <a href="https://store.vikings.net/x200-ryf-certfied" class="seller action-button">Vikings</a>
+                <p class="sale-info links">
+                  Viking's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified. Global shipping is available. <a href="#viking-promotion">Sale details.</a></p>
+ </div>
             </noscript>
             <!-- End Buy/Download button -->
             </noscript>
             <!-- End Buy/Download button -->
+
+           <!-- start good -->
             <ul class="pros">
             <ul class="pros">
-              <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with libreboot firmware. The X200 sold by Libiquity is also certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
-              <li>Durable hardware is meant to last and is easy to repair.</li>
-              <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+             <p>Why it's cool: Take it to the office, take it to the cafe, take it to class, take it home and set it up on the counter so you can listen to NPR while you cook. Do all of this the easy way.</p>
+
+<p>This machine is made to go everywhere with you, and thanks to Libiquity and Technoethical, you can have your mobility and your freedom too.</p>
             </ul>
 
           </div>
           <!--End Good-->
 
             </ul>
 
           </div>
           <!--End Good-->
 
-          <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/lenovo-blocked.png" alt="lenovo" class="center-block" />
-            <h5 class="text-center">Lenovo U31 with Windows</h5>
+         <!--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> Trisquel operating system with libreboot firmware. The X200 sold by Libiquity is also certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
+              <li>Durable hardware is meant to last and is easy to repair.</li>
+              <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+          <h5 class="text-center">Stay away from: Apple</h5>
             <ul class="cons">
             <ul class="cons">
-              <li>Runs on proprietary software that profits from treating the user as a product -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user
-                data.
+              <li>Runs on proprietary software that restricts the user's freedoms.</li>
+              <li>
+                 Apple app stores use <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to restrict what you can do with your purchases.
               </li>
               </li>
-              <!-- Commented out pending citation or confirmation <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</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>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
             </ul>
           </div>
           <!--End Bad-->
             </ul>
           </div>
           <!--End Bad-->
@@ -404,93 +443,146 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
       </div>
       <!--End Container-->
 
       </div>
       <!--End Container-->
 
-      <!-- Begin Recommended Template -->
-      <div class="container-fluid recommended-section">
-        <!-- <h1 class="text-center"></h1> -->
-        <div class="row">
-          <div class="col-md-5 col-sm-6 recommended-img">
-            <img src="img/products/eoma.png" alt="LibreTea Computer Card in Earth-friendly chassis" class="center-block" />
+      <!--convertible Laptops-->
+      <div class="container">
+        <h3 class="title text-center">Convertible Laptops/Tablets</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <img src="//static.fsf.org/nosvn/images/technoethical-x200t.png" alt="Technoethical convertible tablet laptop" class="center-block" />
+            <h5 class="text-center">X200t with GNU/Linux</h5>
 
             <!-- Buy/Download Button   -->
 
             <!-- Buy/Download Button   -->
-            <a href="https://www.crowdsupply.com/eoma68/micro-desktop" class="btn get-item" role="button" href="#sellers-card">PRE-ORDER</a>
+            <a id="get-item-convertible" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-convertible" aria-expanded="false" aria-controls="sellers-convertible" style="display:none">
+              BUY
+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
+            </a>
+            <div class="collapse" id="sellers-convertible">
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+
+                <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
+                <p class="sale-info links">
+                  <a href="#technoethical-promotion">Sale details.</a>
+                </p>
+              </div>
+            </div>
+
+            <script>
+            document.getElementById('get-item-convertible').style.display = '';
+            </script>
+            <noscript>
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+
+                                <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
+                                <p class="sale-info links">
+                                  <a href="#technoethical-promotion">Sale details.</a>
+                                </p>           </div>
+            </noscript>
             <!-- End Buy/Download button -->
             <!-- End Buy/Download button -->
+            <ul class="pros">
+ <p>Why it's cool: Use it as a laptop or as a table with a built-in stylus. It may not be a brand-new concept, but it'll always feel a little futuristic.</p>
 
 
+<p>Enjoy all the portability of a tablet, without having to hunt-and-peck every letter when it comes time to do some work. It's versatile, multi-purpose, and stylish, and fits smoothly into every environment in your life (without pummeling you with the abuses of proprietary software).</p>
+            </ul>
 
           </div>
 
           </div>
-          <div class="col-md-7 col-sm-6">
-            <h5 class="text-center">LibreTea computer in modular chassis</h5>
+          <!--End Good-->
+
+         <!--start bad-->
+          <div class="good col-md-6 col-sm-6">
             <ul class="pros">
             <ul class="pros">
-              <li>Interchangeable components for easy repairs and reduced waste.</li>
-              <li>Hardware designs available so you can 3D-print new parts!</li>
-              <li>Comes with the <a href="https://www.gnu.org/distros/free-distros.en.html">Free Software Foundation-endorsed</a> Parabola operating system. This product is pending <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certification.</li>
+          <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with libreboot firmware.</li>
+              <li>Durable hardware is meant to last and is easy to repair.</li>
+              <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+             </ul>
+            <h5 class="text-center">Stay away from: Microsoft Surface</h5>
+              <ul class="cons">
+ <li>Runs on proprietary software that profits from treating the user as a product -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user
+                data.
+              </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>
             </ul>
           </div>
             </ul>
           </div>
+          <!--End Bad-->
         </div>
         </div>
-        <!-- End Row -->
+        <!--End Row-->
       </div>
       </div>
-      <!-- End Container -->
+      <!--End Container-->
 
 
     <!--3D Printers-->
<!--Desktops-->
       <div class="container">
       <div class="container">
-        <h3 class="title text-center">3D Printers</h3>
+        <h3 class="title text-center">Desktops</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
-            <img src="img/products/lulzbot.png" alt="lulzbot" class="center-block" />
-            <h5 class="text-center">LulzBot Mini</h5>
-
+            <img src="img/products/desktop.png" alt="The Workstation, a tower computer by Vikings" class="center-block" />
+            <h5 class="text-center">D16 Workstation with GNU/Linux</h5>
+           
             <!-- Buy/Download Button   -->
             <!-- Buy/Download Button   -->
-            <a id="get-item-print" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-print" aria-expanded="false" aria-controls="sellers-print" style="display:none">
+            <a id="get-item-compact" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-compact" aria-expanded="false" aria-controls="sellers-compact" style="display:none">
               BUY
               <!-- Begin Sale -->
               <span class="sale" >sale</span>
               <!-- End Sale -->
             </a>
               BUY
               <!-- Begin Sale -->
               <span class="sale" >sale</span>
               <!-- End Sale -->
             </a>
-            <div class="collapse" id="sellers-print">
+            <div class="collapse" id="sellers-compact">
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
+
+                <a href="https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
                 <p class="sale-info links">
-                  <a href="#lulzbot-promotion">Sale details.</a>
+                 The D16 Workstation is not Respects Your Freedoms certified at this point.
                 </p>
               </div>
             </div>
 
                 </p>
               </div>
             </div>
 
-            <script>
-            document.getElementById('get-item-print').style.display = '';
+             <script>
+            document.getElementById('get-item-compact').style.display = '';
             </script>
             <noscript>
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
             </script>
             <noscript>
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
+                <a href="https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
                 <p class="sale-info links">
-                  <a href="#lulzbot-promotion">Sale details.</a>
-                </p>
+                 The Workstation is not Respects Your Freedoms certified at this point.
+               </p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
               </div>
             </noscript>
             <!-- End Buy/Download button -->
+
             <ul class="pros">
             <ul class="pros">
-              <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.</li>
-              <li>Performance and seamless interface <a href="http://www.tomsguide.com/us/lulzbot-mini-3d-printer,review-2744.html">earned it "Editor's Choice"</a> in Tom's Guide's 2016 3D printer comparison.</li>
-              <li>Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
+<p>Why it's cool: Sometimes you need heavy-duty computing power that a laptop just can't provide.</p>
+
+<p>Gamers, video editors, and other users may want or need a more powerful machine – a desktop is the answer when you really need that extra push. Also good for users who want a bigger screen.</p>
+             <p>Vikings offers three desktop computers. (ThinkPenguin also <a href="https://www.thinkpenguin.com/catalog/desktop-computers-gnu-linux">has desktops</a>.)
             </ul>
             </ul>
+
           </div>
           <!--End Good-->
           </div>
           <!--End Good-->
-
-          <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/printer-blocked.png" alt="printer" class="center-block" />
-            <h5 class="text-center">Makerbot Replicator Mini</h5>
+         
+         <!--start bad-->
+          <div class="good col-md-6 col-sm-6">
+             <ul class="pros">
+               <li>Options of coming with the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel or Parabola operating systems.</li>
+               <li>Choose between corebook and Libreboot.</li>
+               <li>Customize and specialize to your needs.</li>
+            </ul>
+            <h5 class="text-center">Stay away from: Intel Management Engine</h5>
             <ul class="cons">
             <ul class="cons">
-              <li>
-                MakerWare software is proprietary, restricting freedom and stifling innovation.
-              </li>
-
-              <li>
-                MakerBot was founded with a more freedom-respecting philosophy, but has since <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">announced an increasingly proprietary approach</a> and distanced itself from the community that formed around it.
+             <li>Intel Management Engine is a little piece of firmware that performs various tasks while computers are booting, running, and sleeping. This poses a <a href="https://www.fsf.org/blogs/licensing/intel-me-and-why-we-should-get-rid-of-me">major security risk and threat to user freedom</a>. While there's not actually anything that can be done about Intel ME at the moment, it's good to know what's lurking inside your computer.
               </li>
               </li>
+              <!-- Commented out pending citation or confirmation <li>Includes Management Engine, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</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>
             </ul>
           </div>
           <!--End Bad-->
             </ul>
           </div>
           <!--End Bad-->
@@ -499,12 +591,15 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
       </div>
       <!--End Container-->
 
       </div>
       <!--End Container-->
 
-      <!-- Begin Recommended Template -->
-      <div class="container-fluid recommended-section">
-        <!-- <h1 class="text-center"></h1> -->
-        <div class="row">
+      
+      <!--start container-->
+        <!-- Begin Recommended Template -->
+      <div class="container">
+        <h2 class="title text-center">Wireless Adapters</h2>
+        <div class="row is-table-row">
           <div class="col-md-5 col-sm-6 recommended-img">
             <img src="//static.fsf.org/nosvn/images/technoethical-adapter.png" alt="Mini Wi-Fi Adapter" class="center-block" />
           <div class="col-md-5 col-sm-6 recommended-img">
             <img src="//static.fsf.org/nosvn/images/technoethical-adapter.png" alt="Mini Wi-Fi Adapter" class="center-block" />
+               <h5 class="text-center">Mini Wi-Fi Adapter</h5>
 
             <!-- Buy/Download Button   -->
             <a id="get-item-mini-adapter" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-mini-adapter" aria-expanded="false" aria-controls="sellers-mini-adapter" style="display:none; top:205px;">
 
             <!-- Buy/Download Button   -->
             <a id="get-item-mini-adapter" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-mini-adapter" aria-expanded="false" aria-controls="sellers-mini-adapter" style="display:none; top:205px;">
@@ -546,13 +641,19 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
               </div>
             </noscript>
             <!-- End Buy/Download button -->
               </div>
             </noscript>
             <!-- End Buy/Download button -->
+  
+ <!--start pros-->
+            <ul class="pros">
+             <p>Why it's cool: Trying to go 100% free? Do it the easy way – just plug this into your USB port and you're ready to go.</p>
+            </ul>
+           </div>
 
 
-          </div>
-          <div class="col-md-7 col-sm-6">
-            <h5 class="text-center">Mini Wi-Fi Adapter</h5>
+           <div class="good col-md-6 col-sm-6">
             <ul class="pros">
             <ul class="pros">
-              <li>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. If you use a laptop listed in this guide, an adapter like this won't be necessary.</li>
+              <li>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.</li>
               <li><a href="https://www.fsf.org/ryf">Certified to Respect Your Freedom</a>.</li>
               <li><a href="https://www.fsf.org/ryf">Certified to Respect Your Freedom</a>.</li>
+             <li>Options from Technoethical and ThinkPenguin.</li>
+             <li>If you use a laptop listed in this guide, an adapter like this won't be necessary.</li>
             </ul>
           </div>
         </div>
             </ul>
           </div>
         </div>
@@ -560,80 +661,13 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
       </div>
       <!-- End Container -->
 
       </div>
       <!-- End Container -->
 
-      <!--Compact Laptops-->
-      <div class="container">
-        <h3 class="title text-center">Convertible Laptops/Tablets</h3>
-        <div class="row is-table-row">
-          <div class="good col-md-6 col-sm-6">
-            <img src="//static.fsf.org/nosvn/images/technoethical-x200t.png" alt="Technoethical convertible tablet laptop" class="center-block" />
-            <h5 class="text-center">X200t with GNU/Linux</h5>
-
-            <!-- Buy/Download Button   -->
-            <a id="get-item-convertible" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-convertible" aria-expanded="false" aria-controls="sellers-convertible" style="display:none">
-              BUY
-              <!-- Begin Sale -->
-              <span class="sale" >sale</span>
-              <!-- End Sale -->
-            </a>
-            <div class="collapse" id="sellers-convertible">
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
-
-                <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
-                <p class="sale-info links">
-                  <a href="#technoethical-promotion">Sale details.</a>
-                </p>
-              </div>
-            </div>
-
-            <script>
-            document.getElementById('get-item-convertible').style.display = '';
-            </script>
-            <noscript>
-              <div class="center-block seller-group">
-                <p style="color: #6b6b6b">
-                  <strong>Get it from</strong>
-                </p>
+  <!-- Begin Recommended Template -->
 
 
-                                <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
-                                <p class="sale-info links">
-                                  <a href="#technoethical-promotion">Sale details.</a>
-                                </p>           </div>
-            </noscript>
-            <!-- End Buy/Download button -->
-            <ul class="pros">
-              <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with libreboot firmware.</li>
-              <li>Durable hardware is meant to last and is easy to repair.</li>
-              <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
-            </ul>
-
-          </div>
-          <!--End Good-->
-
-          <div class="bad col-md-6 col-sm-6">
-            <img src="//static.fsf.org/nosvn/images/microsoft-surface-blocked.png" alt="lenovo" class="center-block" />
-            <h5 class="text-center">Microsoft Surface</h5>
-            <ul class="cons">
-              <li>Runs on proprietary software that profits from treating the user as a product -- <a href="https://edri.org/microsofts-new-small-print-how-your-personal-data-abused/">each account is assigned an advertising ID</a> to help Microsoft sell user
-                data.
-              </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>
-            </ul>
-          </div>
-          <!--End Bad-->
-        </div>
-        <!--End Row-->
-      </div>
-      <!--End Container-->
-
-      <!-- Begin Recommended Template -->
-      <div class="container-fluid recommended-section">
-        <!-- <h1 class="text-center"></h1> -->
-        <div class="row">
+ <div class="container">
+        <div class="row is-table-row">
           <div class="col-md-5 col-sm-6 recommended-img">
             <img src="img/products/thinkpenguin-long-range-adapter.png" alt="Long-range Wi-Fi Adapter" class="center-block" />
           <div class="col-md-5 col-sm-6 recommended-img">
             <img src="img/products/thinkpenguin-long-range-adapter.png" alt="Long-range Wi-Fi Adapter" class="center-block" />
+           <h5 class="text-center">Long Range Wi-Fi Adapter</h5>
 
             <!-- Buy/Download Button   -->
             <a id="get-item-long-range-adapter" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-long-range-adapter" aria-expanded="false" aria-controls="sellers-long-range-adapter" style="display:none; top:205px;">
 
             <!-- Buy/Download Button   -->
             <a id="get-item-long-range-adapter" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-long-range-adapter" aria-expanded="false" aria-controls="sellers-long-range-adapter" style="display:none; top:205px;">
@@ -669,11 +703,11 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
 
           </div>
           <div class="col-md-7 col-sm-6">
 
           </div>
           <div class="col-md-7 col-sm-6">
-            <h5 class="text-center">Long-Range Wi-Fi Adapter
             </h5>
             <ul class="pros">
               <li>More powerful than its smaller cousin, and can be further upgraded with a larger antenna.</li>
               <li><a href="https://www.fsf.org/ryf">Certified to Respect Your Freedom</a>.</li>
             </h5>
             <ul class="pros">
               <li>More powerful than its smaller cousin, and can be further upgraded with a larger antenna.</li>
               <li><a href="https://www.fsf.org/ryf">Certified to Respect Your Freedom</a>.</li>
+             <li>Multiple options from Technoethical and ThinkPenguin.</li>
             </ul>
           </div>
         </div>
             </ul>
           </div>
         </div>
@@ -681,111 +715,7 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
       </div>
       <!-- End Container -->
 
       </div>
       <!-- End Container -->
 
-      <!--eBooks-->
-      <div class="container">
-        <h3 class="title text-center">eBooks</h3>
-        <div class="row is-table-row">
-          <div class="good col-md-6 col-sm-6">
-            <img src="img/products/gutenberg.png" alt="gutenberg" class="center-block" />
-            <h5 class="text-center">Project Gutenberg</h5>
-
-            <!-- Buy/Download Button   -->
-            <a href="https://www.gutenberg.org/" class="btn get-item" role="button" href="#sellers-card">DOWNLOAD</a>
-            <!-- End Buy/Download button -->
-            <ul class="pros">
-              <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
-              <li>The original purveyor of eBooks free of <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> (Digital Restrictions Management), <a href="https://www.defectivebydesign.org/guide/ebooks">inspiring many others</a>.</li>
-              <li>Enjoy the freedom to read your ebooks on any device.</li>
-            </ul>
-          </div>
-          <!--End Good-->
-
-          <div class="bad col-md-6 col-sm-6">
-            <img src="img/products/amazon-blocked.png" alt="amazon" class="center-block fix-amazon" />
-            <h5 class="text-center">Amazon.com</h5>
-            <ul class="cons">
-              <li>
-                Amazon can remotely block or delete individual ebooks or your entire library with no warning or explanation (<a href="http://www.defectivebydesign.org/node/2250">they've done it before</a>).
-              </li>
-              <li>
-                Amazon uses <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> to prevent you from sharing your favorite books with friends or moving them between readers.
-              </li>
-              <li>
-                Amazon openly claims
-                <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">you don't actually own or control your ebooks.</a>
-              </li>
-            </ul>
-          </div>
-          <!--End Bad-->
-        </div>
-        <!--End Row-->
-      </div>
-      <!--End Container-->
-
-      <div class="alert alert-success center-block">
-        <li class="info">
-          <p>The Free Software Foundation, as a small publisher of
-            books, recommends not purchasing on Amazon. If you do, please use <a  class="alert-link" href="https://smile.amazon.com">smile.amazon.com</a> to designate a nonprofit to receive some of the money.</p>
-          </li>
-        </div>
-
-        <!--Graphic Design-->
-        <div class="container">
-          <h3 class="title text-center">Graphic Design</h3>
-          <div class="row is-table-row">
-            <div class="good col-md-6 col-sm-6">
-              <img src="img/products/gimp-inkscape.png" alt="GIMP and Inskacape" class="center-block" />
-              <h5 class="text-center">GIMP and Inkscape</h5>
-
-              <!-- Buy/Download Button   -->
-              <a id="get-item-gimp" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-gimp" aria-expanded="false" aria-controls="sellers-gimp" style="display:none; width: 150px; margin-left: -75px;">
-                DOWNLOAD
-              </a>
-              <div class="collapse" id="sellers-gimp">
-                <div class="center-block seller-group">
-                  <a href="https://www.gimp.org/downloads/" class="seller action-button" style="background-color: #565040; color: white">GIMP</a>
-                  <a href="https://inkscape.org/en/" class="seller action-button" style="background-color: #000; color: white">Inkscape</a>
-                </div>
-              </div>
-
-              <script>
-              document.getElementById('get-item-gimp').style.display = '';
-              </script>
-              <noscript>
-                <div class="center-block seller-group">
-                  <p style="color: #6b6b6b">
-                  </p>
-                  <a href="https://www.gimp.org/downloads/" class="seller action-button" style="background-color: #565040; color: white">GIMP</a>
-                  <a href="https://inkscape.org/en/" class="seller action-button" style="background-color: #000; color: white">Inkscape</a>
-                </div>
-              </noscript>
-              <!-- End Buy/Download button -->
-              <ul class="pros">
-                <li>Free software, with thriving developer communities.</li>
-                <li>Designed for free formats, but can also open files created in other programs.</li>
-                <li>Wide variety of plugins grants limitless features.</li>
-                <li>Easy to install on all major operating systems.</li>
-              </ul>
-            </div>
-            <!--End Good-->
-
-            <div class="bad col-md-6 col-sm-6">
-              <img src="img/products/adobe-blocked.png" alt="adobe" class="center-block" />
-              <h5 class="text-center">Photoshop and Illustrator</h5>
-              <ul class="cons">
-                <li>Proprietary software controlled by Adobe.</li>
-                <li>Shuts down when its DRM is unable to verify the costly required subscription, even if it's actually up to date.</li>
-                <li>Prefers locked-down proprietary formats.</li>
-              </ul>
-            </div>
-            <!--End Bad-->
-          </div>
-          <!--End Row-->
-        </div>
-        <!--End Container-->
-
-
-        <!-- Begin Recommended Template -->
+    <!-- Begin Recommended Template -->
         <div class="container-fluid recommended-section">
           <!-- <h1 class="text-center"></h1> -->
           <div class="row">
         <div class="container-fluid recommended-section">
           <!-- <h1 class="text-center"></h1> -->
           <div class="row">
@@ -838,45 +768,209 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         </div>
         <!-- End Container -->
 
         </div>
         <!-- End Container -->
 
-        <!--Gift Cards-->
-        <div class="container">
-          <h3 class="title text-center">Gift Cards</h3>
-          <div class="row is-table-row">
-            <div class="good col-md-6 col-sm-6">
-              <img src="img/products/fsf-card.png" alt="fsf card" class="center-block" />
-              <h5 class="text-center">FSF Membership Card</h5>
-
-              <!-- Buy/Download Button   -->
-              <a href="https://my.fsf.org/join" class="btn get-item" role="button" href="#sellers-card">BUY</a>
-              <!-- End Buy/Download button -->
-              <ul class="pros">
-                <li>Join over 3,500 active members working to make a better world built on free software.</li>
-                <li>Enjoy a host of <a href="https://www.fsf.org/associate/benefits">member benefits</a>, including admission to the <a href="https://www.libreplanet.org/conference">yearly LibrePlanet conference</a>.</li>
-                <li>Membership donations are tax-deductible in the US. For a smaller gift, <a href="https://www.fsf.org/donate">donate in a friend's name</a>.</li>
-              </ul>
+      <!--3D Printers-->
+      <div class="container">
+        <h3 class="title text-center">3D Printers</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <img src="img/products/lulzbot.png" alt="lulzbot" class="center-block" />
+            <h5 class="text-center">LulzBot Mini</h5>
 
 
+            <!-- Buy/Download Button   -->
+            <a id="get-item-print" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-print" aria-expanded="false" aria-controls="sellers-print" style="display:none">
+              BUY
+              <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
+            </a>
+            <div class="collapse" id="sellers-print">
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
+                <p class="sale-info links">
+                  <a href="https://www.lulzbot.com">Lulzbot</a> is having general sales Black Friday through Cyber Monday. <a href="#lulzbot-promotion">Sale details.</a>
+                 
+                </p>
+              </div>
             </div>
             </div>
-            <!--End Good-->
 
 
-            <div class="bad col-md-6 col-sm-6">
-              <img src="img/products/itunes-blocked.png" alt="itunes" class="center-block fix-itunes" />
-              <h5 class="text-center">iTunes Cards</h5>
+            <script>
+            document.getElementById('get-item-print').style.display = '';
+            </script>
+            <noscript>
+              <div class="center-block seller-group">
+                <p style="color: #6b6b6b">
+                  <strong>Get it from</strong>
+                </p>
+                <a href="https://www.lulzbot.com/store?pk_campaign=fsf16&pk_kwd=store" class="seller action-button">LulzBot</a>
+                <p class="sale-info links">
+                  <a href="#lulzbot-promotion">Sale details.</a>
+                </p>
+              </div>
+            </noscript>
+            <!-- End Buy/Download button -->
+            <ul class="pros">
+              <p>Why it's cool: Think ahead: if you give this to your friend or relative, they might use it next year to make YOU a gift.</p>
+
+<p>3D printers are an amazing learning and exploration tool for kids and a fun toy for grownups, and they've come a long way from their origins in the early 2000s. Keep it free and fun by digging into the zillions of free software options for modeling, and communities that share freely licensed designs.</p>
+           </ul>
+          </div>
+          <!--End Good-->
+
+          <div class="good col-md-6 col-sm-6">
+           <ul class="pros">
+              <li>Performance and seamless interface <a href="https://www.tomsguide.com/us/lulzbot-mini-3d-printer,review-2744.html">earned it "Editor's Choice"</a> in <em>Tom's Guide</em>'s 2016 3D printer comparison.</li>
+              <li>Hardware designs available to make customization easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
+            </ul>
+            <h5 class="text-center">Stay away from: Makerbot</h5>
+            <ul class="cons">
+              <li>
+                MakerWare software is proprietary, restricting freedom and stifling innovation.
+              </li>
+              <li>
+                MakerBot was founded with a more freedom-respecting philosophy, but has since <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">announced an increasingly proprietary approach</a> and distanced itself from the community that formed around it.
+              </li>
+            </ul>
+          </div>
+          <!--End Bad-->
+        </div>
+        <!--End Row-->
+      </div>
+      <!--End Container-->
+
+
+           <h1 class="title text-center">Books, Games, Music, and Video</h1>
+      
+      <!--ebooks-->
+      <div class="container">
+        <h3 class="title text-center">Books</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <h5 class="text-center">DRM-free Ebooks</h5>
+
+            <ul class="pros">
+             <p>There are <a href="https://www.defectivebydesign.org/guide/ebooks">a lot of options</a> for where to get your literature fix without any pesky DRM. We're highlighting some publishers and shops who are offering deals for you!</p>
+             <li><a href="https://www.delphiclassics.com/">Delphi Classics</a> has a wide range of classic literature available in English, French, German, Italian, and Spanish. Use the code <b>fsfdelphi</b> for <b>30% off</b> orders over $10 through the end of December.</li>
+             <li><a href="https://tienda.edicionesbabylon.es/en/">Ediciones Babylon</a> can supply you with all of your Spanish language needs for comics, art, novellas, and novels. Use the code <b>FSFDISCOUNTEB</b> for <b>5% off</b> all the way through March 2018.</li>
+            <li><a href="https://www.nostarch.com/">No Starch Press</a> pecializes in educational, instructional, and how-to books on everything from arduinos to system administration. Use the code <b>ETHICTECH</b> for <b>40% off</b> through January 10th, 2018.</li>
+           </ul>
+
+          </div>
+          <!--End Good-->
+         
+         <!--start bad-->
+          <div class="good col-md-6 col-sm-6">
+             <ul class="pros">
+            <h5 class="text-center">Stay away from: Amazon</h5>
+            <ul class="cons">
+             <li>Amazon is one of the <a href="https://www.defectivebydesign.org/amazon">most notorious of DRM offenders</a>. Whether it's their Kindle e-reader or their countless DRM-encumbered ebooks, Amazon is the place to go if you want to <a href="https://www.defectivebydesign.org/amazon-kindle-swindle">let someone else snatch away texts</a> from your personal library.</li>
+            <li>Where's O'Reilly? While the publisher's ebooks are still available from third party sellers (in both DRM-free and DRM-encumbered formats), O'Reilly themselves stopped selling their DRM-free catalogue earlier in 2017.</li>
+            </ul>
+          </div>
+          <!--End Bad-->
+        </div>
+        <!--End Row-->
+      </div>
+      <!--End Container-->
+
+      <!--ebooks-->
+      <div class="container">
+        <h3 class="title text-center">Games</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <h5 class="text-center">DRM-free Games</h5>
+
+           <ul class="pros">
+           <p>Gaming systems have adopted all sorts of DRM technologies -- allowing gaming companies to limit your access to games and even the ability to brick whole systems. However, there's hope in the wide world of DRM-free games!</p>
+             <li><a href="https://www.gog.com/">Good Old Games</a> thinks you should not just be able to play with your friends, but share with them. They carry all kinds of games -- action, adventure, RPGs, strategy game s-- and even movies specially for gamers.</li>
+             <li><a href="https://www.humblebundle.com/">Humble Bundle</a> first made its name with pay-what-you-want DRM-free books, and have since expanded to a whole range of games.
+               <li>We'd be remiss to not mention <a href="http://www.nethack.org/">Nethack</a>, a game well loved by many gamers and free software nerds. A classic <a href="https://en.wikipedia.org/wiki/Roguelike">roguelike</a> with a <a href="http://nethack.org/common/license.html">classic, freedom-respecting license</a>, there's no reason to not feel good sharing this game.</li>
+               </ul>
+          </div>
+          <!--End Good-->
+
+         <!--start bad-->
+          <div class="good col-md-6 col-sm-6">
+            <ul class="cons">
+            <h5 class="text-center">Stay away from: XBox</h5>
               <ul class="cons">
               <ul class="cons">
-                <li> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> on everything (except music) controls what you can do with your purchases.
-                </li>
+ <li>Over the years XBox has gone back and forth with their use of DRM with a current pro-DRM stance. It's best to just stay away since we can never tell when they're just going to change their minds</li>.
+<li>A quick note on Sony: The <a href="https://www.cinemablend.com/games/It-Official-Again-PS4-Has-DRM-Fees-Internet-Registration-Check-56594.html">PlayStation 4</a> runs games DRM-free. However, there is enough non-free software running on the system that we cannot recommend it in good conscience.</li>
+            </ul>
+          </div>
+          <!--End Bad-->
+        </div>
+        <!--End Row-->
+      </div>
+      <!--End Container-->
 
 
-                <li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
 
 
-                <li> Requires proprietary software to use, even to download DRM-free music.</li>
-              </ul>
-            </div>
-            <!--End Bad-->
+      <!--Music-->
+      <div class="container">
+        <h3 class="title text-center">Music</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <h5 class="text-center">DRM-free Music</h5>
+
+           <!-- start good -->
+            <ul class="pros">
+             <p>Many consider music essential to the richness of the human experience. Thanks to the <a href="https://www.defectivebydesign.org/guide/audio">many artists, producers, record labels, and shops</a> highlighted on <a href="https://defectivebydesign.org">Defective by Design</a>, the rights-respecting options are nearly endless. Check out music from great labels and artists, including:</p>
+              <li><a href="http://www.dischord.com/">Dischord Records</a>, a classic punk label providing music since 1980.</li>
+             <li><a href="https://folkways.si.edu/">Folkways</a>, courtesy of the Smithsonian Institute.</li>
+             <li><a href="http://www.mergerecords.com/shop">Merge Records</a>, home to Grammy-winning and well-loved indie darlings.</li>
+             <li><a href="http://www.nin.com/">Nine Inch Nails</a></li>
+             <li><a href="https://www.theymightbegiants.com/">They Might Be Giants</a></li>
+           </ul>
+
           </div>
           </div>
-          <!--End Row-->
+          <!--End Good-->
 
 
+         <!--start bad-->
+          <div class="good col-md-6 col-sm-6">
+            <ul class="cons">
+             <h5 class="text-center">Stay away from: Spotify</h5>
+           <p>DRM is the unfortunate standard for so much of major music available. While Spotify certainly isn't the only offender, they're the one we are choosing to highlight.</p>
+          <p>In addition to streaming music encumbered by DRM, people who want to use Spotify are required to install additional proprietary software. <a href="https://www.spotify.com/us/download/linux/">Spotify's build for GNU/Linux</a> is available as a Debian package that requires Debian non-free and comes with "<a href="https://www.debian.org/distrib/packages">onerous license conditions</a>."</p>
+            </ul>
+          </div>
+          <!--End Bad-->
         </div>
         </div>
-        <!--End Container-->
+        <!--End Row-->
+      </div>
+      <!--End Container-->
+
+      <!--Video-->
+      <div class="container">
+        <h3 class="title text-center">Video</h3>
+        <div class="row is-table-row">
+          <div class="good col-md-6 col-sm-6">
+            <h5 class="text-center">DRM-free Video</h5>
+            <ul class="pros">
+             <p>As winter comes to the Northern Hemisphere, it's the perfect time to curl up under a blanket and watch some DRM-free video. In the Southern Hemisphere? Enjoy relaxing with a great movie actually owned by you.</p>
+              <p>You can <a href="https://www.defectivebydesign.org/guide/video">find your DRM-free video fix</a> at places including:</p>
+             <li><a href="http://www.comedydirect.com/">ComedyDirect</a> can make you laugh while storing your videos locally.</li>
+             <li><a href="https://archive.org/details/movies">Moving Image Archive</a>, is a section of <a href="https://archive.org">Archive.org</a> containing thousands of film releases, available to stream or download.</li>
+             <li><a href="https://durian.blender.org/download/">Sintel</a> has a huge selection of DRM-free films made with free software.</li>
+             <li><a href="http://wolfeondemand.com/">WolfeOnDemand</a> provides for all of your LGBTQ watching desires.</li>
+           </ul>
 
 
+          </div>
+          <!--End Good-->
+
+         <!--start bad-->
+          <div class="good col-md-6 col-sm-6">
+            <h5 class="text-center">Stay away from: Netflix</h5>
+              <ul class="cons">
+               <p>Whether it's <a href="https://www.defectivebydesign.org/blog/tell_netflix_nix_drm_original_productions">using major studios as scapegoats for using DRM</a> or <a href="https://www.w3.org/2017/09/pressrelease-eme-recommendation.html.en">pushing for DRM as an official W3C Recommendations</a>, Netflix has been at the front line of getting DRM into media online and in your home.</p>
+            </ul>
+          </div>
+          <!--End Bad-->
+        </div>
+        <!--End Row-->
+      </div>
+      <!--End Container-->
 
       </section>
       <!--End comparisons-->
 
       </section>
       <!--End comparisons-->
@@ -886,36 +980,39 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         <div class="container">
           <h1 class="text-center">Recommended organizations for holiday donations</h1>
           <div class="row">
         <div class="container">
           <h1 class="text-center">Recommended organizations for holiday donations</h1>
           <div class="row">
-            <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.sfconservancy.org/"><img src="img/charities/sfc.png" alt="sfc" class="center-block img-responsive" /></a>
+            <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>
-            <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.eff.org/"><img src="img/charities/eff.png" alt="eff" class="center-block img-responsive" /></a>
+            <div class="col-md-3 col-sm-4 col-xs-6">
+              <a href="https://ceata.org/"><img src="img/charities/ceata.png" alt="ceata" class="center-block img-responsive" /></a>
             </div>
             </div>
-            <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.creativecommons.org/"><img src="img/charities/cc.png" alt="cc" class="center-block img-responsive" /></a>
+            <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>
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://wikimedia.org/"><img src="img/charities/wikimedia.png" alt="wikimedia" class="center-block img-responsive" /></a>
+              <a href="https://www.eff.org/"><img src="img/charities/eff.png" alt="eff" class="center-block img-responsive" /></a>
             </div>
             </div>
-            <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.softwarefreedom.org/"><img src="img/charities/sflc.png" alt="sflc" class="center-block img-responsive" /></a>
+            <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>
             <div class="col-md-3 col-sm-4 col-xs-6">
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.gnome.org/"><img src="img/charities/gnome.png" alt="gnome" class="center-block img-responsive" /></a>
+              <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">
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
-              <a href="https://ceata.org/"><img src="img/charities/ceata.png" alt="ceata" 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 class="col-md-3 col-sm-4 col-xs-6">
-              <a href="http://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
+           <div class="col-md-3 col-sm-4 col-sx-6">
+              <a href="https://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
             </div>
           </div>
         </div>
             </div>
           </div>
         </div>
+          </div>
+        </div>
       </section>
       <!-- End Donations -->
 
       <!-- Begin Promotion details -->
       </section>
       <!-- End Donations -->
 
       <!-- Begin Promotion details -->
+
       <section class="promotion-details">
         <div class="container">
           <div class="row">
       <section class="promotion-details">
         <div class="container">
           <div class="row">
@@ -925,14 +1022,16 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                   <h1 class="fix-margin">Promotion details</h1>
                 </div>
                 <div class="panel-body" id="promotion-details">
                   <h1 class="fix-margin">Promotion details</h1>
                 </div>
                 <div class="panel-body" id="promotion-details">
-
-                  <ul style="list-style: none inside none;">
+<h2>Companies, distributors, and makers of freedom-friendly gadgets and media 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="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFGIVING16</span> at checkout.</li>
                     <li id="libiquity-promotion"><strong>Libiquity:</strong>            Receive a 5% 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, 2017. 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="technoethical-promotion"><strong>Technoethical:</strong>
                     <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFGIVING16</span> at checkout.</li>
                     <li id="libiquity-promotion"><strong>Libiquity:</strong>            Receive a 5% 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, 2017. 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="technoethical-promotion"><strong>Technoethical:</strong>
-                      Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFHOLIDAYS</span> at checkout.</li>
-                      <li id="lulzbot-promotion"><strong>LulzBot:</strong> Receive two gratis, 1 kilogram reels of <a href="https://www.lulzbot.com/store/filament/ngen?pk_campaign=fsf16&pk_kwd=ngen">nGen</a> filament when you buy any 3D printer. Ends at 00:00 EST on February 1st, 2017. Use the coupon code  <span class="label label-default">FSF2016</span>. Cannot be combined with other offers.</li>
-                    </ul>
+                      Receive a 5% discount on any items you buy from the Web site. Ends at 00:00 EST on February 1st, 2017. Use the coupon code <span class="label label-default">FSFHOLIDAYS</span> at checkout.</li> -->
+                      <li id="lulzbot-promotion"><strong>LulzBot: </strong><a href="https://www.lulzbot.com/black-friday-cyber-monday-preview">Black Friday and Cyber Monday discounts</a> are available through their site.</li>
+                      <li id="vikings-promotion"><strong>Vikings:</strong> 5% discount on <b>all</b> products and services between now and February 1, 2018. <b>Help the FSF!</b> Vikings will also make a donation for each product purchased using this code. Use the coupon code  <span class="label label-default">fsfftw</span>.</li>
+
+</ul>
                   </div>
                 </div>
               </div>
                   </div>
                 </div>
               </div>
@@ -944,6 +1043,29 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         </section>
         <!-- End Promotion details   -->
 
         </section>
         <!-- End Promotion details   -->
 
+             <!-- Start Respects Your Freedoms -->
+      <section class="promotion-details">
+        <div class="container">
+          <div class="row">
+            <div class="col-md-12">
+              <div class="panel-default">
+                <div class="panel-heading">
+                  <h1 class="fix-margin">Respects Your Freedoms</h1>
+                </div>
+                <div class="panel-body" id="promotion-details">
+                 <p>The FSF certifies hardware that <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">respecting your freedoms</a>. These items arrive installed with free software, and you can see a  <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">complete list</a> of RYF products on FSF.org.</p>
+                  <p>We would never recommend you use, run, or give proprietary software. However, one part of RYF certification is the promise that one can install any software they wish on the device. This includes proprietary software. Free software is about many things, including the right to choose what is on your device. We urge you to keep your gifts and own devices fully free -- it's not only the responsible thing, but the right thing.</p>
+                    </div>
+                </div>
+              </div>
+              <!-- End Panel -->
+            </div>
+            <!-- End Row -->
+          </div>
+          <!-- End Container -->
+        </section>
+        <!-- End Respects Your Freedoms   -->
+
         <!-- Begin Licenses -->
         <section class="licenses">
           <div class="container">
         <!-- Begin Licenses -->
         <section class="licenses">
           <div class="container">
@@ -960,21 +1082,10 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
                     <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>X200, T400, iPhone, and ISP-provided router images are in the public domain.</li>
                     <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>X200, T400, iPhone, and ISP-provided router images are in the public domain.</li>
-                      <li>LulzBot 3D printer photo by Aleph Objects is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>FSF USB membership card by FSF is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>iTunes gift card is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>Macbook Pro PSD by andrew-gw is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>Astounding Stories is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                      <li>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</li>
-                      <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are registered trademarks.</li>
-                      <li>Technoethical Replicant s3, Wi-Fi Dongle, and X200t by Technoethical 2016-2017 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>
-                      <li>The Lenovo U31 image is copyright Lenovo.</li>
-                      <li>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>
-                      <li>The MakerBot logo is copyright MakerBot Industries.</li>
-                      <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
-                      <li><a href="https://www.flickr.com/photos/janitors/12907608763">Microsoft Surface 2</a> by <a href="https://www.flickr.com/photos/janitors/">Kārlis Dambrāns</a> licensed under CC By 2.0.</li>
-                    </ul>
+                      <li>LulzBot 3D printer photo by Aleph Objects is licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                      <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                      <li>Technoethical Replicant N2, Wi-Fi Dongle, and X200t by Technoethical 2016-2017 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>
+                      <li>LibreTea computer with modular chassis image by Luke Kenneth Casson Leighton licensed under<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</li>   </ul>
                   </div>
                 </div>
               </div>
                   </div>
                 </div>
               </div>