removed justification of modal text
[fsf-giving-guide.git] / v9 / givingguide.html
index e90893bfb320b550fd9acb47a67c0b4ccfc8b415..cc33c45091c50e546b83a9cb95e4f2b6ed73e386 100644 (file)
   <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.2/html5shiv.js"></script>
   <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
   <![endif]-->
+
+  <script>
+    /*
+
+    @licstart  The following is the entire license notice for the 
+    JavaScript code in this page.
+
+    Copyright (c) 2016 Reda Lazri
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    @licend  The above is the entire license notice
+    for the JavaScript code in this page.
+
+    */
+  </script>
+
 </head>
 
 <!-- ATTRACTIVE INFORMATIONAL ALERT / ASIDE BLOCK, SAVED HERE FOR REFERENCE
 -->
 
 <body>
-  <iframe src="//static.fsf.org/nosvn/banners/2018fundraiser/" width="100%" height="100%" scrolling="no" style="overflow: hidden; border: 0 none; display: block;"></iframe>
+
+    <iframe src="//static.fsf.org/nosvn/banners/2019fundraiser-spring/" width="100%" height="100%" scrolling="no"
+      style="overflow: hidden; margin: 0; border: 0 none; display: block;">
+    </iframe>
+
+            <!-- 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 {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+}
+
+@media screen and (min-width: 700px) {
+
+    #fsf-modal-window-elem-outer-v-center {
+        display: table;
+        position: absolute;
+        height: 100%;
+        width: 100%;
+    }
+    #fsf-modal-window-elem-inner-v-center {
+        display: table-cell;
+        vertical-align: middle;
+    }
+
+    #fsf-modal-window-elem {
+        width: 687px;
+        margin-left: auto;
+        margin-right: auto;
+    }
+
+    #fsf-modal-window-elem-right-column {
+        float: right;
+        width: 280px;
+        padding-left: 20px;
+    }
+
+    #fsf-modal-window-elem-left-column {
+        width: 100%;
+        float: left;
+        margin-right: -280px;
+    }
+
+    #fsf-modal-window-elem-text {
+        margin-right: 280px;
+    }
+}
+
+@media screen and (max-width: 699px) {
+
+    #fsf-modal-window-elem {
+
+        -ms-box-orient: horizontal;
+        display: -webkit-box;
+        display: -moz-box;
+        display: -ms-flexbox;
+        display: -moz-flex;
+        display: -webkit-flex;
+        display: flex;
+
+        -webkit-flex-flow: row wrap;
+        flex-flow: row wrap;
+    }
+
+    #fsf-modal-window-elem {
+        width: 80vw;
+        margin-left: 10vw;
+        margin-right: 10vw;
+        margin-top: 40px;
+        margin-bottom: 40px;
+    }
+
+    #fsf-modal-window-elem-right-column {
+        width: 100%;
+        order: 1;
+    }
+
+    #fsf-modal-window-elem-left-column {
+        width: 100%;
+        order: 2;
+    }
+
+    #fsf-modal-window-elem-text {
+        margin-top: 20px;
+    }
+}
+
+@media screen and (max-width: 360px) {
+    .long-button-text {
+        font-size: 25px !important;
+    }
+}
+
+#fsf-modal-window-elem-container {
+    position: fixed;
+    z-index: 10000;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background-color: rgba(0,0,0,0.8);
+
+    font-weight: normal;
+}
+
+#fsf-modal-window-elem a, a:active, a:focus {
+    outline: none;
+}
+
+#fsf-modal-window-elem {
+    overflow: auto;
+    zoom: 1;
+    padding: 20px;
+    border-style: solid;
+    border-width: 5px;
+    border-color: #0065ff;
+    border-radius: 20px;
+    box-shadow: 0px 0px 10px #111111;
+    background-color: #1d0c3b;
+}
+
+#fsf-modal-window-elem-header {
+    width: 100%;
+}
+
+#fsf-modal-window-elem-header h2 {
+    font-family: sans-serif,"Helvetica",Arial;
+    font-weight: bold;
+    font-size: 24px;
+    color: #fdd538;
+    text-shadow: 0px 0px 8px #00378c;
+    padding-bottom: 20px;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    border: none;
+}
+
+#fsf-modal-window-elem-close-button {
+    float: right;
+    height: 40px;
+    margin-right: -20px;
+    margin-top: -20px;
+    padding: 11px;
+    color: #888;
+    cursor: pointer;
+}
+
+#fsf-modal-window-elem-close-button:hover {
+    color: #aaf;
+}
+
+#fsf-modal-window-elem-right-column {
+    text-align: center;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+            user-select: none;
+}
+
+#fsf-modal-window-elem-buttons div {
+    height:53.333px;
+    line-height: 53.333px;
+    margin-left:auto;
+    margin-right:auto;
+    display:block;
+}
+
+#fsf-modal-window-elem-buttons {
+}
+
+#fsf-modal-window-elem-buttons a {
+    width: 100%;
+    display: block;
+    text-align:center;
+    font-size:35px;
+    color:#FFFFFF;
+    text-decoration: none;
+    font-family: sans-serif,"Helvetica",Arial;
+    font-weight: normal;
+}
+
+#fsf-modal-window-elem-maybe-later {
+    margin-top: 5px;
+    margin-bottom: -5px;
+}
+
+#fsf-modal-window-elem-maybe-later a {
+    color: #367c93;
+    line-height: 20px;
+    text-decoration: none;
+    cursor: pointer;
+    font-weight: normal;
+    font-family: sans-serif,"Helvetica",Arial;
+    font-size: 16px;
+}
+
+#fsf-modal-window-elem-text {
+}
+
+#fsf-modal-window-elem-text a {
+    color: #fdd538;
+    font-weight: 700;
+    text-decoration: none;
+}
+
+#fsf-modal-window-elem-text a:hover {
+    color: #fd8e1b;
+}
+
+#fsf-modal-window-elem-text a:focus {
+    color: #fd8e1b;
+}
+
+#fsf-modal-window-elem-text a:active {
+    color: #ffac30;
+}
+
+#fsf-modal-window-elem-text p {
+    font-family: sans-serif,"Helvetica",Arial;
+    font-size: 18px;
+    font-weight: normal;
+    margin: 0px 0px 10px 0px;
+    line-height: 20px;
+    color: #ffffff;
+    text-shadow: 0px 0px 8px #4600ba;
+}
+            </style>
+            <div id="fsf-modal-window-elem-container" style="display: none;">
+                <div id="fsf-modal-window-elem-outer-v-center">
+                    <div id="fsf-modal-window-elem-inner-v-center">
+                        <div id="fsf-modal-window-elem">
+                            <div id="fsf-modal-window-elem-header">
+                                <div id="fsf-modal-window-elem-close-button" onclick="//fsfModalWindowElemDontShowForAWhile();">
+                                    <i class="fa fa-close"></i>
+                                </div>
+                                <h2>Become a member today and help the FSF fight for user freedom!</h2>
+                            </div>
+                            <div id="fsf-modal-window-elem-left-column">
+                                <div id="fsf-modal-window-elem-text">
+
+<p>
+
+Our large, diverse group of members and donors help the Free Software
+Foundation remain proudly independent. Join us today and help us achieve our
+goal of 200 new members in only 28 days (July 15). 
+
+</p>
+
+<p>
+
+Small contributions create a big impact! 
+
+</p>
+
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=fr_sp2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://my.fsf.org/join?pk_campaign=fr_sp2019&pk_source=modal2">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:#3498DB; border-top-right-radius: 20px; border-top-left-radius: 20px;">
+                                      <a style="color:#fdd538;text-shadow: 0px 0px 8px #2670a1;" href="https://my.fsf.org/join?pk_campaign=fr_sp2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-check-circle">&nbsp;</i>Join</a>
+                                    </div>
+
+                                    <div style="background-color:#2ecc71">
+                                      <a style="text-shadow: 0px 0px 8px #219452;" href="https://my.fsf.org/renew?pk_campaign=fr_sp2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-refresh"></i> Renew</a>
+                                    </div>
+
+                                    <div style="background-color:#1abc9c; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; margin-bottom: 2px">
+                                      <a style="text-shadow: 0px 0px 8px #138c74;" href="https://my.fsf.org/donate?pk_campaign=fr_sp2019&pk_source=modal" onclick="//fsfModalWindowElemFollowedLink();"><i class="fa fa-money"></i> Donate</a>
+                                    </div>
+                                </div>
+                                <!--
+                                <div id="fsf-modal-window-elem-maybe-later">
+                                    <a onclick="//fsfModalWindowElemMaybeLater();">maybe later</a>
+                                </div>
+                                -->
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <script type="text/javascript">
+// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-3.0
+
+// licensed GPLv3-or-later by Andrew Engelbrecht
+
+var startTime, endTime, switchTextTime;
+
+startTime = new Date('2019-05-30T04:00:00Z');
+switchTextTime = new Date('2019-06-28T04:00:00Z');
+endTime = new Date('2019-07-12T04:00:00Z');
+
+// possibly switch the text that is displayed in the modal window, depending
+// upon the current date.
+function fsfModalWindowElemMaybeSwitchText () {
+
+    var now;
+
+    now = new Date();
+    if (now.getTime() < switchTextTime.getTime()) {
+        return; // don't switch the dbd text
+    }
+
+    // switch dbd text
+    document.getElementById("fsf-modal-window-elem-text").innerHTML =' \
+\
+<p>Our large, diverse group of members and donors help the Free Software Foundation remain proudly independent. Join us and help us achieve our goal of 200 new members before July 15!</p> <p>Small contributions create a big impact!</p> \
+\
+<p><span id="fsf-modal-window-text-link"><a href="https://www.fsf.org/appeal?pk_campaign=fr_sp2019&pk_kwd=learn-more&pk_source=modal">READ MORE</a> | <a href="https://my.fsf.org/join?pk_campaign=fr_sp2019&pk_source=modal2">JOIN</a></span></p>';
+}
+
+// show fsf-modal-window-elem if it hasn't been previously closed by
+// the user, nor recently hit "maybe later",
+// and the campaign is still happening
+function fsfModalWindowElemMaybeShow () {
+
+    var pattern, noShowFsfModalWindowElementP, now;
+
+    now = new Date();
+    if (now.getTime() < startTime.getTime() || now.getTime() > endTime.getTime()) {
+        return; // don't show the fsf-modal-window-elem
+    }
+
+    // see if cookie says not to show element
+    pattern = /showFsfSpring2019FundraiserModalWindowElementP\s*=\s*false/;
+    noShowFsfModalWindowElementP = pattern.test(document.cookie);
+
+//// uncomment here to enable modal window hiding
+    if (!noShowFsfModalWindowElementP) {
+        setTimeout(function () {
+            // display the element
+            document.getElementById("fsf-modal-window-elem-container").style.display="block";
+        }, 0);
+    }
+}
+
+// call this first to set the proper text
+fsfModalWindowElemMaybeSwitchText();
+// call this right away to avoid flicker
+fsfModalWindowElemMaybeShow();
+
+
+// get the time `plusDays` in the future.
+// can be a fraction.
+function daysInFuture (plusDays) {
+    var now, future;
+
+    now = new Date();
+    future = new Date(now.getTime() + Math.floor(1000 * 60 * 60 * 24 * plusDays));
+    return future.toGMTString();
+}
+
+// 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`.
+function fsfModalWindowElemDontShowForDays (forDays, hideNow) {
+    if (hideNow === true) {
+        fsfModalWindowElemHide();
+    }
+    //document.cookie = "showFsfSrping2019FundraiserModalWindowElementP=false; path=/; domain=.fsf.org; expires=" + daysInFuture(forDays);
+    document.cookie = "showFsfSpring2019FundraiserModalWindowElementP=false; path=/; expires=" + daysInFuture(forDays);
+}
+
+// hide the element from now to two weeks after closing it
+function fsfModalWindowElemDontShowForAWhile () {
+    fsfModalWindowElemDontShowForDays(14, true);
+}
+// hide the element from now to past the date of the campaign
+//function fsfModalWindowElemDontShowAgain () {
+//    fsfModalWindowElemDontShowForDays(120, true);
+//}
+// don't show the element for a while
+//function fsfModalWindowElemMaybeLater () {
+//    fsfModalWindowElemDontShowForDays(1, true);
+//}
+// keep the element visible for now, but don't show it for a while
+function fsfModalWindowElemFollowedLink () {
+    fsfModalWindowElemDontShowForDays(14, false);
+}
+
+// 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)
+document.getElementById("fsf-modal-window-elem").addEventListener("click", function(event){
+    event.stopPropagation();
+});
+// close popup if user clicks X icon
+document.getElementById("fsf-modal-window-elem-close-button").addEventListener("click", function(event){
+    fsfModalWindowElemDontShowForAWhile();
+});
+//// close popup if user clicks maybe-later div
+//document.getElementById("fsf-modal-window-elem-maybe-later").addEventListener("click", function(event){
+//    fsfModalWindowElemMaybeLater();
+//});
+// 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
+document.getElementById("fsf-modal-window-text-link").addEventListener("click", function(event){
+    fsfModalWindowElemFollowedLink();
+});
+// close popup if user presses escape key 
+window.addEventListener("keydown",  function  (event)  {
+    switch  (event.key)  {
+        case  "Escape":
+            fsfModalWindowElemDontShowForAWhile();
+            break;
+        default:
+            return;
+    }
+},  true);
+
+// @license-end
+                </script>
+            </div>
+            <!-- end fsf-modal-window-elem campaign element -->
+
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <!-- Brand and toggle get grouped for better mobile display -->
         <ul class="nav navbar-nav">
           <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://my.fsf.org/join?pk_campaign=fall18&pk_kwd=ggjoin">Join</a></li>
           <li><a class="animated fadeIn" href="https://shop.fsf.org/">Shop</a>
           </ul>
 
           <div class="intro-text col-md-6">
             <h1>Give the gift of freedom!</h1>
 
-           <p>New electronics can be the highlight of your holiday, but so many of the phones, computers, and toys come with proprietary software and privacy disrespecting and surveillance tools hidden inside.</p>
-<p>This guide replaces these holiday humbugs with better devices from ethical companies&mdash;no <a href="https://gnu.org/proprietary" style="color: gold">creepy remote deletion of files or punitive and mean rules about copying and sharing</a>. Just products and software that respect the freedom and privacy of your loved ones: gifts you can feel good about.</p>
-<p>We also hope the Guide will help you find new ways to talk about why these kinds of devices are risky to your user freedom, and why it's important to respect your freedoms.</p>
+           <p>New electronic gadgets make great presents for family and friends, but so many of the phones, computers, and toys come with proprietary programs, privacy-disrespecting software, and surveillance tools hidden inside.</p>
+           <p>This guide replaces these holiday humbugs with better devices from ethical companies &mdash; no <a href="https://gnu.org/proprietary">creepy remote deletion of files or punitive and mean rules about copying and sharing</a>. Just products and software that respect the freedom and privacy of your loved ones: gifts you can feel good about.</p>
+           
+<p>Most of the devices in this list carry a <a href="https://fsf.org/ryf">Respects Your Freedom</a> (RYF) hardware product certification, which means that the product meets our high standards for endorsement. RYF-certified devices make great purchases and great gifts at any time of year – learn more and explore the full list <a href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">on our Web site</a>.</p>
+
+<p>We also hope that our Giving Guide will help you find new ways to talk about how these kinds of devices deny users their freedom, and why it's important to respect your freedoms.</p>
+
           </div>
         </div>
       </div>
         <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">
+          <h5 class="text-center">Galaxy S3 with Replicant</h5>
             <img src="img/products/mobile_n2.png" alt="replicant phone" class="center-block" />
-            <h5 class="text-center">Galaxy S3 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">
                 </p>
                 <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
                 <div class="sale-info links">
-                  <a href="#technoethical-promotion">Sale details.</a>
+                  <a href="#technoethical-promotion">Sale details</a>
                 </div>
               </div>
             </div>
                 </p>
                 <a href="https://tehnoetic.com/tehnoetic-s3-phone-replicant" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  <a href="#technoethical-promotion">Sale details.</a>
+                  <a href="#technoethical-promotion">Sale details</a>
                 </p>
                 <!-- End Sale Info -->
               </div>
             <!-- End Buy/Download button -->
 
             <ul class="pros">
- <p>Why it's cool: 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. You <i>can</i> have a phone that respects your freedoms while still making calls, running your favorite apps, and sending all the text messages you want.</p>
+ <p>Why it's cool: 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. You <i>can</i> run your favorite apps and send all the text messages you want, while still running free software.</p>
 
-<p>         You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or an <a "https://tehnoetic.com/tet-n2">N2 phone/tablet</a>, complete with Replicant.</p>
+<p>         You can also get an <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant">S2</a> or an <a href="https://tehnoetic.com/tet-n2">N2 phone/tablet</a>, complete with Replicant.</p>
             </ul>
           </div>
           <!--End Good-->
               <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>10% of sales profits from Technoethical are donated to Replicant.</li>
-             <li>Note: While the main processor is exclusively running 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 a Samsung nonfree system.</li>
             </ul>
 
             <h5 class="text-center">Stay away from: iPhone</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 <a href="https://gnu.org/proprietary">proprietary operating system</a>, giving Apple control over the software on the devices
+                iOS is a fully <a href="https://gnu.org/proprietary">proprietary operating system</a>, giving Apple control over the software on every Apple device.
               </li>
              <li>Avoid: iPhone XR, iPhone XS, iPhone X, and other models.</li>
             </ul>
         <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>
+            <img src="img/products/t400.png" alt="t400" class="center-block" />
 
 
            
                </p>
                 <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  <a href="#technoethical-promotion">Sale details.</a>
+                  <a href="#technoethical-promotion">Sale details</a>
                 </p>
               </div>
             </div>
                </p>
                 <a href="https://tehnoetic.com/tet-t400" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
-                  <a href="#technoethical-promotion">Sale details.</a>
+                  <a href="#technoethical-promotion">Sale details</a>
                 </p>
               </div>
             </noscript>
             <!-- End Buy/Download button -->
 
             <ul class="pros">
-             <p>Why it's cool: The T400 is a popular laptop for running GNU/Linux because of how well-suited it is to work and play. Now you can get it completely free, with these RYF certified options.</p>
-             <p>Setting up a fully free system is easier than it used to be, but can still seem daunting&mdash;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>Why it's cool: The T400 is a popular laptop for running GNU/Linux because of how well-suited it is to work and play. Now you can get it completely free, with these RYF-certified options.</p>
+             <p>Setting up a fully free system is easier than it used to be, but can still seem daunting &mdash; 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 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 be easy to repair.</li>
+              <li>Durable hardware is meant to last, and is easy to repair.</li>
               <li>Created by small businesses that replace all restrictive components from a stock laptop.</li>
-             <li>Whether you purchase from Minifree or Technoethical, your T400 will be Respects your Freedom certified.</li>
+             <li>Whether you purchase from Minifree or Technoethical, your T400 will be <a href="https://fsf.org/ryf">Respects Your Freedom certified</a>.</li>
             </ul>
             <h5 class="text-center">Stay away from: Microsoft Windows</h5>
             <ul class="cons">
-             <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product&mdash;<a href="https://privacy.microsoft.com/en-US/privacystatement">forces users to consent to data collection</a> for purposes including "targeted advertising."
+             <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that profits from treating the user as a product &mdash; <a href="https://privacy.microsoft.com/en-US/privacystatement">forces users to consent to data collection</a> for purposes including "targeted advertising."
               </li>
               <li>Mandatory Windows updates force users to test potentially unstable new versions. <a href="https://www.fsf.org/campaigns/windows">Read more about Windows's abuses.</a></li>
-            <li>You can find Windows on computers like the Dell Inspiron, HP EliteBook, and Lenovo Ideapad.</li>
             <li>Looking at a computer that includes an Intel CPU? Intel comes with <a href="https://www.fsf.org/blogs/sysadmin/the-management-engine-an-attack-on-computer-users-freedom">Management Engine</a>, a hardware-based backdoor that gives Intel a permanent backdoor into your computer.</li>
             </ul>
           </div>
         <h3 class="title text-center">Compact Laptops</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
+                <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">
                 <p class="sale-info links">
                   Libiquity's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified, but shipping is limited to the US. <a href="#libiquity-promotion">Sale details.</a>
 
+                </p>
+                               <a href="https://minifree.org/product/libreboot-x200-tablet/" class="seller action-button">Minifree</a>
+                <p class="sale-info links">
+                  Minifree's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified.
+
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a><br>
                 <p class="sale-info links">
                 <a href="https://shop.libiquity.com/product/taurinus-x200" class="seller action-button">Libiquity</a>
                 <p class="sale-info links">
                   Libiquity's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a>-certified, but shipping is limited to the US. <a href="#libiquity-promotion">Sale details.</a>
+                </p>
+                                               <a href="https://minifree.org/product/libreboot-x200-tablet/" class="seller action-button">Minifree</a>
+                <p class="sale-info links">
+                  Minifree's X200 is <a href="https://www.fsf.org/ryf">Respects Your Freedom</a> certified.
+
                 </p>
                 <a href="https://tehnoetic.com/tet-x200" class="seller action-button">Technoethical</a>
                 <p class="sale-info links">
             <ul class="pros">
              <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 rock out while you cook. Do all of this the easy way.</p>
 
-<p>This machine is made to go everywhere with you and thanks to our friends who make RYF products, you can have your mobility and your freedom too.</p>
+             <p>This machine is made to go everywhere with you, and thanks to our friends who make RYF-certified products, you can have your mobility and your freedom, too.</p>
             </ul>
 
           </div>
           <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>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">
            <li>Runs on <a href="https://gnu.org/proprietary">proprietary software</a> that restricts the user's freedoms.</li>
               <li>Apple has been <a href="https://motherboard.vice.com/en_us/article/evmeya/apple-iphone-right-to-repair-california">opposing the Right to Repair</a> for years.</li>
               <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
-             <li>Avoid: MacBook Air (and MacBook Pro)</li>
+           <li>Avoid: MacBook Air (and MacBook Pro).</li>
+           <li>Note: Apple laptops come complete with <a href="https://www.fsf.org/blogs/sysadmin/the-management-engine-an-attack-on-computer-users-freedom">Intel Management Engine</a> as well.</li>
             </ul>
           </div>
           <!--End Bad-->
         <h3 class="title text-center">Convertible Laptops/Tablets</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
+                       <h5 class="text-center">X200t with GNU/Linux</h5>
             <img src="https://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">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-
-                              <a href="https://minifree.org/product/libreboot-x200-tablet/" class="seller action-button">Minifree</a>
+               <p>
+                 <a href="https://minifree.org/product/libreboot-x200-tablet/" class="seller action-button">Minifree</a>
+               </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 = '';
                                 <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>
-               
-                <a href="https://tehnoetic.com/tet-x200t" class="seller action-button">Technoethical</a>
-              </div>
-            </div>
+                                </p>     
+             </div>
+           </noscript>
 
-            <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 -->
+           
             <ul class="pros">
  <p>Why it's cool: Use it as a laptop or as a tablet with a built-in stylus. It may not be a brand-new concept, but it'll always feel a little futuristic.</p>
 
          <!--start bad-->
           <div class="good col-md-6 col-sm-6">
             <ul class="pros">
-          <li>Runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system with libreboot firmware.</li>
-              <li>Durable hardware is meant to last and is easy to repair.</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: iPad Pro</h5>
                 <li>
                 Apple uses <a href="https://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">Digital Restrictions Management (DRM)</a> to block competing software.
                 </li>
-               <li>Apple's App Store has been <a href="https://www.defectivebydesign.org/blog/apple_app_store_anniversary_marks_ten_years_proprietary_appsploitation">threatening user freedom for ten years</a>. From user surveillance to allowing governments to control app access, the Apple App Store has it all. </li>
+               <li>Apple's App Store has been <a href="https://www.defectivebydesign.org/blog/apple_app_store_anniversary_marks_ten_years_proprietary_appsploitation">threatening user freedom for ten years</a>. From user surveillance to allowing governments to control app access, the Apple App Store has done it all. </li>
             </ul>
           </div>
           <!--End Bad-->
         <h3 class="title text-center">Desktops</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
+                       <h5 class="text-center">D16 Workstation with GNU/Linux</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   -->
             <a id="get-item-desktop" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-desktop" aria-expanded="false" aria-controls="sellers-desktop" style="display:none">
                 </p>
                 <a href="https://store.vikings.net/libre-friendly-hardware/vikings-d16-workstation" class="seller action-button">Vikings</a>
                 <p class="sale-info links">
-                The D16 Workstation is not Respects Your Freedom certified at this point. <a href="#vikings-promotion">Sale details.</a>
+               <a href="#vikings-promotion">Sale details.</a>
                 </p>
               </div>
             </div>
             <ul class="pros">
 <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>Gamers, video editors, and other users may want or need a more powerful machine &mdash;  a desktop is the answer when you really need that extra push. Also good for users who want a bigger screen.</p>
             </ul>
 
           </div>
          <!--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>Free boot firmware.</li>
-               <li>Customize and specialize to your needs.</li>
+               <li>Choose from two operating systems: the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> operating systems Trisquel and Parabola.</li>
+               <li>Comes with free boot firmware.</li>
+               <li>You can customize and specialize this model to your needs -- the essence of user freedom!</li>
+
             </ul>
             <h5 class="text-center">Stay away from: Apple iMac</h5>
             <ul class="cons">
-             <p>An iMac puts designers and film makers at risk:</p>
-              <li><a href="https://www.adobe.com/products/premiere-rush.html">Adobe Premiere Rush</a> rents Mac (and Windows) users access to video editing software in exchange for control over their files.</li>
+             <p>An iMac puts designers and filmmakers at risk:</p>
+              <li>Adobe Premiere Rush rents Mac (and Windows) users access to video editing software in exchange for control over their files.</li>
              </ul>
           <h5 class="text-center">Stay away from: Alienware Area-51 Threadripper</h5>
             <ul class="cons">
         <h3 class="title text-center">3D Printers</h3>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6">
+                       <h5 class="text-center">LulzBot Mini</h5>
             <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">
             </noscript>
             <!-- End Buy/Download button -->
             <ul class="pros">
-              <p>Why it's cool: Think ahead&mdash;if you give this to your friend or relative, they might use it next year to make YOU a gift.</p>
+              <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>
+<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 thousands 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/best-3d-printers,review-2236.html">earned it "Editor's Choice"</a> in <em>Tom's Guide</em>'s 2017 3D printer comparison.</li>
+              <li>Performance and seamless interface <a href="https://www.tomsguide.com/us/best-3d-printers,review-2236.html">earned it "Editor's Choice"</a> in <em>Tom's Guide</em>'s 2018 3D printer comparison.</li>
               <li>Hardware designs are 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, <a href="https://gnu.org/proprietary">restricting freedom and stifling 
+                MakerWare software is proprietary, <a href="https://gnu.org/proprietary">restricting freedom and stifling creativity</a>.
               </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.
+MakerBot was founded with a more freedom-respecting philosophy, but <a href="https://www.cnet.com/news/pulling-back-from-open-source-hardware-makerbot-angers-some-adherents/">has since announced</a> an increasingly proprietary approach and distanced itself from the community that formed around it.   
               </li>
             </ul>
           </div>
       </div>
       <!--End Container-->
 
-      
-      <!--start container-->
-        <!-- Begin Recommended Template -->
+      <!-- cool devices -->
       <div class="container">
         <h2 class="title text-center">Cool Devices</h2>
 <div class="container">
         <div class="row is-table-row">
           <div class="col-md-5 col-sm-6 recommended-img">
-            <img src="https://shop.fsf.org/sites/default/files/styles/product_full/public/randomnumber.jpg" alt="NeuG USB True Random Number Generator and a MicroSD card" class="center-block" />
-           <h5 class="text-center">NeuG USB True Random Number Generator</h5>
+                   <h5 class="text-center">NeuG USB True Random Number Generator</h5>
+            <img src="https://shop.fsf.org/sites/default/files/styles/product_full/public/randomnumber.jpg" alt="NeuG USB True Random Number Generator and a MicroSD card" class="center-block" style="height: 140px; margin-top: 90px; margin-bottom: 90px;"/>
+
 
             <!-- Buy/Download Button   -->
-            <a id="random-number-generator" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-random-number-generator" aria-expanded="false" aria-controls="sellers-random-number-generator" style="display:none; top:205px;">
+            <a id="get-item-random-number-generator" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-random-number-generator" aria-expanded="false" aria-controls="sellers-random-number-generator" style="display:none;">
               BUY
+                <!-- Begin Sale -->
+              <span class="sale" >sale</span>
+              <!-- End Sale -->
             </a>
-            <div class="collapse" id="random-number-generator">
+            <div class="collapse" id="sellers-random-number-generator">
               <div class="center-block seller-group">
-                <a href="https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator">GNU Press Shop</a>
+
+                <a href="https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator" class="seller action-button">GNU Press Shop</a>
                 <p class="sale-info links">
-                  <a href="#thinkpenguin-promotion">Sale details.</a>
+                  <a href="#GNU-promotion">Sale details.</a>             
                 </p>
               </div>
             </div>
 
             <script>
-            document.getElementById('get-item-long-range-adapter').style.display = '';
+            document.getElementById('get-item-random-number-generator').style.display = '';
             </script>
             <noscript>
               <div class="center-block seller-group">
                 <p style="color: #6b6b6b">
                   <strong>Get it from</strong>
                 </p>
-                <a href="https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator" class="seller action-button">GNU Press Shop</a>
+                <a href="https://shop.fsf.org/storage-devices/neug-usb-true-random-number-generator"  class="seller action-button" class="seller action-button">GNU Press Shop</a>
                 <p class="sale-info links">
-                  <a href="#thinkpenguin-promotion">Sale details.</a>
+                  <a href="#GNU-promotion">Sale details.</a>
                 </p>
               </div>
             </noscript>
           </div>
           <div class="col-md-7 col-sm-6">
             </h5>
-            <ul class="pros">
+<ul class="pros">
+  <li>The perfect present for the cryptogeek in your life.</li>
               <li>FST-01 (Flying Stone Tiny ZERO-ONE) is a tiny USB 32-bit computer based on a free (as in freedom) hardware design.</li>
              <li>NeuG is an implementation of a true random number generator (TRNG) for STM32F103 MCU.</li>
             </ul>
        
         <div class="row is-table-row">
           <div class="col-md-5 col-sm-6 recommended-img">
+                       <h5 class="text-center">Mini Wi-Fi Adapter</h5>
             <img src="https://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;">
+            <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;">
               BUY
               <!-- Begin Sale -->
               <span class="sale">sale</span>
   
  <!--start pros-->
             <ul class="pros">
-             <p>Why it's cool: Trying to go 100% free but stuck with a proprietary Wi-Fi card? just plug this into your USB port and you're ready to go.</p>
+             <p>Why it's cool: Trying to go 100% free but stuck with a proprietary Wi-Fi card? Just plug this into your USB port and you're ready to go.</p>
             </ul>
            </div>
 
-           <div class="good col-md-6 col-sm-6">
+           <div class="good col-md-7 col-sm-6">
             <ul class="pros">
               <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>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>
+             <li>If you use a laptop listed in this Guide, an adapter like this won't be necessary.</li>
             </ul>
           </div>
         </div>
  <div class="container">
         <div class="row is-table-row">
           <div class="col-md-5 col-sm-6 recommended-img">
+                   <h5 class="text-center">Long Range Wi-Fi Adapter</h5>
             <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;">
+            <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;">
               BUY
               <!-- Begin Sale -->
               <span class="sale">sale</span>
             <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>
         <div class="container">
           <div class="row is-table-row">
             <div class="col-md-5 col-sm-6 recommended-img">
-              <img src="img/products/thinkpenguin-mini-router.png" alt="VPN Router" class="center-block" />
              <h5 class="text-center">VPN Router</h5>
+              <img src="img/products/thinkpenguin-mini-router.png" alt="VPN Router" class="center-block" />
+
 
               <!-- Buy/Download Button   -->
-              <a id="get-item-vpn-router" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-vpn-router" aria-expanded="false" aria-controls="sellers-vpn-router" style="display:none; top:205px;">
+              <a id="get-item-vpn-router" class="btn get-item" role="button" data-toggle="collapse" href="#sellers-vpn-router" aria-expanded="false" aria-controls="sellers-vpn-router" style="display:none;">
                 BUY
                 <!-- Begin Sale -->
                 <span class="sale">sale</span>
             <div class="col-md-7 col-sm-6">
               <ul class="pros">
                 <li>Designed to complement your existing router by providing a VPN that enhances privacy and security and circumvents network controls.</li>
-                <li>Designed for easy set-up.</li>
-                <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> LibreCMC operating system on hardware that is certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
+                <li>Designed for easy setup.</li>
+                <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> LibreCMC operating system on a product that is certified to <a href="https://www.fsf.org/ryf">Respect Your Freedom</a>.</li>
               </ul>
             </div>
           </div>
             <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> specializes 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>
+             <p>There are <a href="https://www.defectivebydesign.org/guide/ebooks">plenty of places</a> to get your literature fix without any pesky DRM. We're highlighting some publishers and shops you should patronize below!</p>
+             <li><a href="https://leanpub.com/">Leanpub</a> is an author-driven ebook Web site encouraging people to "publish early, publish often."</li>
+             <li><a href="https://lektu.com/">Lektu</a> provides you with media in Spanish.</li>
+             <li><a href="https://www.manning.com/ebooks">Manning Publications</a> has audio and video in addition to ebooks.</li>
+             <li><a href="https://nostarch.com/">No Starch Press</a> offers "the finest in geek entertainment."</li>
+             <li><a href="https://www.packtpub.com/">Packt Publishing</a> has ebooks and videos covering a range of technical topics.</li>
+             <li><a href="https://www.smashwords.com/books/category/1/bestsellers/0/any/any">Smashwords</a> is the world's largest distributor of indie ebooks.</li>
            <li>Looking to buy paper books? Check out the <a href="https://shop.fsf.org/collection/books-docs">GNU Press Shop</a> for your technical manuals and documentation needs.</li>
            </ul>
 
              <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>Amazon is one of the <a href="https://www.defectivebydesign.org/amazon">most notorious DRM offenders</a>. Whether it's their Kindle ebook 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><a href="https://www.defectivebydesign.org/">Read more about DRM, the risks it poses, and the damage it causes</a>.
             </ul>
           </div>
          <!--start bad-->
           <div class="good col-md-6 col-sm-6">
             <ul class="cons">
-             <h5 class="text-center">Stay away from: Spotify</h5>
-           <p>Spotify isn't the only offender when it comes to putting DRM in music&mdash;all major streaming services do this with the support of big record labels.</p>
-          <p>In addition to streaming music encumbered by DRM, people who want to use Spotify are required to install additional proprietary software. Even <a href="https://www.spotify.com/us/download/linux/">Spotify's client for GNU/Linux</a> relies on proprietary software.</p>
+             <h5 class="text-center">Stay away from: Spotify, iTunes, (and all other major streaming services)</h5>
+             <ul>
+          <li>Spotify is only one of many offenders when it comes to putting DRM in music: all major streaming services do this, with the support of big record labels.</li>
+          <li>In addition to streaming music encumbered by DRM, people who want to use Spotify are required to install additional proprietary software. Even <a href="https://www.spotify.com/us/download/linux/">Spotify's client for GNU/Linux</a> relies on proprietary software.</li>
+          <li>Apple Music and iTunes streaming also use DRM on its files.</li>
             </ul>
           </div>
           <!--End Bad-->
         <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>
+            <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>
 
         <h2 class="title text-center"></h2>
         <div class="row is-table-row">
           <div class="good col-md-6 col-sm-6" style="position:relative">
-             <p>Sadly, there is not always the opportunity to choose freedom. You have to decide what is the right thing for you to do. We've highlighted some of the types of devices where there isn't a good choice. We hope you'll take this list as inspiration for the free software projects you contribue to and support.</p>
+             <p>Sadly, there is not always the opportunity to choose freedom. You have to decide what is the right thing for you to do. In this section of our guide, we've highlighted some of the types of devices where there isn't a good choice. We hope you'll take this list as inspiration for the free software projects you contribute to and support.</p>
           </div>
           <!--End Good-->
 
          <!-- start bad -->
 
-         <div class="bad col-md-6 col-sm-6">
+         <div class="good col-md-6 col-sm-6">
            <h5 class="text-center">In need of development</h5>
-           <ul class="cons">
+           <ul class="pros">
              <li>Cameras</li>
-             <li>E-readers</li>
+             <li>Ebook readers</li>
              <li>Fitness trackers</li>
              <li>Smart watches</li>
              <li>Video gaming systems</liz.
   </ul>
            <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.</li>
-             <li>Self-driving cars are full of proprietary software, posing a risk to cyclists, pedestrians, and riders. <a href="https://www.theguardian.com/technology/2017/jul/31/tesla-model-3-electric-car-doesnt-have-key-things-we-learned-speedometer-battery-sleep">Read more about</a> the Tesla Model 3's anti-features and autopilot system.</li>
+             <li>Internet of Things connected home appliances, smart speakers, and virtual assistants are little more than spying devices brought into your home. These include Amazon Alexa, Amazon Echo, Google Home, Nest, Philips Hue lighting, Ring doorbell, Sonos One, and Wembo.</li>
+             <li>Self-driving cars are full of proprietary software, and they also pose a terrible risk to cyclists, pedestrians, and riders. <a href="https://www.theguardian.com/technology/2017/jul/31/tesla-model-3-electric-car-doesnt-have-key-things-we-learned-speedometer-battery-sleep">Read more about</a> the Tesla Model 3's anti-features and autopilot system.</li>
             </ul>
           </div>
           <!--End Bad-->
         <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">
+           <div class="col-md-4 col-md-offset-4 col-sm-4 col-sm-offset-4 col-xs-6 col-xs-offset-3">
+              <a href="https://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
+             <p>The Giving Guide is brought to you by the <a href="https://fsf.org">Free Software Foundation</a>. We are powered by our Associate Members. Will you help us propel free software to new frontiers by <a href="https://my.fsf.org/join?pk_campaign=fall18&pk_kwd=ggjoin">joining today</a>?</p>
+            </div>
+          </div>
+          <div style="height: 30px"></div>
+          <div class="row">
+           <div class="col-md-3 col-sm-4 col-xs-6">
               <a href="https://april.org/"><img src="img/charities/april.png" alt="april" class="center-block img-responsive" /></a>
             </div>
             <div class="col-md-3 col-sm-4 col-xs-6">
             <div class="col-md-3 col-sm-4 col-xs-6">
               <a href="https://www.wikimedia.org/"><img src="img/charities/wikimedia.png" alt="wikimedia" class="center-block img-responsive" /></a>
             </div>
-           <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>
                   <h1 class="fix-margin">Promotion details</h1>
                 </div>
                 <div class="panel-body" id="promotion-details">
-<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>
+<h2>Companies, distributors, and makers of freedom-friendly gadgets want to make it easier for you to give gifts that you feel good about. Check out these discounts and promotions.</h2>
             <ul style="list-style: none inside none;">
-               <!--     <li id="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><a href="https://www.lulzbot.com/lulzbot-sales-clearance-items">features sales and clearance items on their Web site.</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>, and a special 7% discount for the Giving Guide, using the code <span class="label label-default"> FSFMEMBER</span>.</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 for each product purchased using this code. Use the coupon code  <span class="label label-default">fsfftw</span>.</li>
+             <li id="GNU-promotion"><strong>GNU Press Shop: </strong>5% discount on all items using the coupon code <span class="label label-default">GIVEFREELY</span>. Code expires on December 31st. As always, FSF members get a 20% discount.</li>
+              <li id="libiquity-promotion"><strong>Libiquity: </strong>10% rebate off your subtotal price for any items you buy from the Web site. Libiquity will donate 5% of each purchase's subtotal price to the FSF. Ends at 00:00 EST on February 1st, 2019. Claim the rebate by sending the code <span class="label label-default">FSFGIVING</span> and your order number to <a href="mailto:sales@libiquity.com">sales@libiquity.com</a>. Libiquity will then credit the rebate amount to your payment method.</li>
+              <li id="lulzbot-promotion"><strong>LulzBot: </strong><a href="https://www.lulzbot.com/lulzbot-sales-clearance-items">Features sales and clearance items on their Web site</a>.</li>
+             <li id="minifree-promotion"><strong>Minifrree: </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> 5% discount on <b>all</b> purchases using the coupon code <span class="label label-default">FSFHOLIDAYS</span>. FSF members get an additional 10% off, using the code <span class="label label-default">FSREWARDS</span>.</li>
+                     <li id="thinkpenguin-promotion"><strong>ThinkPenguin:</strong> 5% discount on <b>all</b> products is available to <a href="https://fsf.org/join">FSF members</a>.</li>
+                      <li id="vikings-promotion"><strong>Vikings:</strong> 5% discount on <b>all</b> products and services between now and February 1, 2019. <b>Help the FSF:</b> Vikings will also make a donation to the FSF for each product purchased using the coupon code  <span class="label label-default">fsfftw</span>.</li>
 
 </ul>
                   </div>
 
                   </div>
                   <div class="panel-body" id="licenses">
-                    <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
+                    <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a>.
                     </p>
                     <p>The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms: </p>
                     <ul style="list-style: none inside none;">
                       <li>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="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 <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike Unported 4.0</a>.</li>
-                     <li>Photo of bookshelf by <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a> licensed under a <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 Unported</a>
+                      <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</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</a>.</li>
+                      <li>Technoethical Replicant S3, Wi-Fi Dongle, and X200T by Technoethical 2016-2017 licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a>.</li>
+                     <li>Photo of bookshelf by <a href="https://www.flickr.com/photos/seeminglee/4556156477/">See-ming Lee</a> licensed under a <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.</li>
                   </div>
                 </div>
               </div>
               </div>
               <div class="col-md-8 col-sm-8">
                 <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —
-                  <a href="https://fsf.org/about">learn about our history and work.</a>
+                  <a href="https://fsf.org/about">learn about our history and work</a>.
                 </p>
-                <p>Version 8.0. Copyright © 2004-2017
+                <p>Version 9.0. Copyright © 2004-2018
                   <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
                     Free Software Foundation
                   </a>, Inc.
-                  <a href="https://my.fsf.org/donate/privacypolicy.html"> Privacy Policy</a>.
+                  <a href="https://www.fsf.org/about/free-software-foundation-privacy-policy"> Privacy Policy</a>.
+                 <a href="js/weblabels.html" rel="jslicense">Javascript License Information</a>.
                 </p>
               </div>
             </div>
         // @license-end
         </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
         <!-- End Piwik Tracking Code -->
-        <a href="js/weblabels.html" rel="jslicense"></a>
       </body>
 
       </html>