Fixing weird issue with hero image by changing it from a PNG to an SVG.
[fsf-giving-guide.git] / 2015 / givingguide.html
old mode 100755 (executable)
new mode 100644 (file)
index 61c714a..9f878fd
@@ -3,7 +3,7 @@
 
 <head>
 
 
 <head>
 
-    <title> Holiday Giving Guide | Free Software Foundation | Working together for free software </title>
+    <title> Ethical Tech Giving Guide | Free Software Foundation | Working together for free software </title>
 
     <meta charset="UTF-8">
 
 
     <meta charset="UTF-8">
 
@@ -12,8 +12,8 @@
     <link rel="author" title="Author information" href="http://www.fsf.org/about/staff">
 
     <!--Stylesheets-->
     <link rel="author" title="Author information" href="http://www.fsf.org/about/staff">
 
     <!--Stylesheets-->
-    <link rel="stylesheet" type="text/css" href="../reset.css">
-    <link rel="stylesheet" type="text/css" href="../stylesheet.css">
+    <link rel="stylesheet" type="text/css" href="./reset.css">
+    <link rel="stylesheet" type="text/css" href="./stylesheet.css">
 
 </head>
 
 
 </head>
 
@@ -46,9 +46,8 @@
             </div>
 
             <div class="intro">
             </div>
 
             <div class="intro">
-
                 <div class="intro_img">
                 <div class="intro_img">
-                    <img src="//static.fsf.org/nosvn/images/givingguide/images/banner.png" alt="Giving Guide" />
+                    <img src="//static.fsf.org/nosvn/images/givingguide/images/hero.svg" style="width:500px;" alt="Giving Guide" />
                 </div>
 
                 <div class="intro_wrapper">
                 </div>
 
                 <div class="intro_wrapper">
@@ -57,7 +56,7 @@
                         than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive
                         counterparts.
                     </p>
                         than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive
                         counterparts.
                     </p>
-                    <p>Like this guide? Download the <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">printable version</a> (translations welcome!) and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
+                    <p>Like this guide? Download the <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">printable version</a> and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving
                         Guide Giveaway</a> to share it with your community. And remember: donating to a <a href="#charities">nonprofit</a> in someone's name is at least as meaningful as buying them an electronic device.</p>
                     </div>
                 </div>
                         Guide Giveaway</a> to share it with your community. And remember: donating to a <a href="#charities">nonprofit</a> in someone's name is at least as meaningful as buying them an electronic device.</p>
                     </div>
                 </div>
         <!-- Sharing -->
         <div class="share">
             <span class="share_wrapper">
         <!-- Sharing -->
         <div class="share">
             <span class="share_wrapper">
-                <a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/2014/&t=Check%20out%20the%20Free%20Software%20Foundation%20Holiday%20Giving%20Guide">Share (#givefreely)</a>
+                <a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&t=Check out the Free Software Foundation Ethical Tech Giving Guide">Share (#givefreely)</a>
             </span>
         </div>
         <!-- end sharing-->
 
         <!--We compare different products from here-->
             </span>
         </div>
         <!-- end sharing-->
 
         <!--We compare different products from here-->
-
         <div class="comparisons">
         <div class="comparisons">
-
             <div class="section_wrapper">
             <div class="section_wrapper">
-                <h3 class="main_title">3D Printers</h3>
+                <h3 class="main_title">Full-Sized Laptops</h3>
 
                 <div class="free">
                     <div class="product">
                         <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
 
                 <div class="free">
                     <div class="product">
                         <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                        <img class="product_img" src="//static.fsf.org/nosvn/images/taz4.png" alt="TAZ 4.0" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/minifree-t400.png" alt="Minifree T400 Notebook with Libreboot" />
                     </div>
 
                     </div>
 
-                    <h4 class="title">Lulzbot TAZ 4.0 FIXME: replace with the copy Harris gives you, or update to this year</h4>
+                    <h4 class="title">Minifree T400 with GNU/Linux</h4>
+
+                    <ul>
+                        <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware on hardware that is <a href="https://www.fsf.org/ryf">certified to Respect Your Freedom</a>.</li>
+                        <li>Durable hardware is meant to last and easy to repair.</li>
+                        <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>                            <li><span style="font-weight:bold">SAVE!</span> &euro;100 (approx. $106) off each item, and Minifree will donate to the FSF with each purchase. Expires Jan 31, 2016. <a href="#minifree-discount">Details.</a></li>
+                    </ul>
+                </div>
+
+                <div class="proprietary">
+                    <div class="product">
+                        <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
+                    </div>
+
+                    <h4 class="title">Apple Macbook Pro with OSX</h4>
                     <ul>
                         <li>
                     <ul>
                         <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.
+                            Runs on proprietary software that restricts the user's freedoms.
                         </li>
                         </li>
-
                         <li>
                         <li>
-                            Supports tetherless printing, optional Dual Extruder upgrade, and exotic filaments including wood-, rubber- and stone-like materials.
+                            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>
                         </li>
-                        <li>Hardware designs available to make modification and improvement easy.</li>
-                        <!--<li>
-                        <span style="font-weight:bold">SAVE!</span> When you buy a TAZ, contact <a href="https://www.lulzbot.com/company/contact-us">Lulzbot sales</a> and mention this guide to receive an extra roll of filament and gratis shipping to the US, Canada or the EU (expires at the end of 2014).
-                    </li>-->
-                </ul>
+                        <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
+                    </ul>
+                </div>
+
+                <!-- 'buy/download' and 'avoid' buttons -->
+                <div class="buy_avoid">
+                    <div class="buy_avoid_wrapper">
+                        <div class="buy">
+                            <a href="http://minifree.org/product/libreboot-t400/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
+                        </div>
 
 
+                        <div class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                        </div>
+                    </div>
+                </div>
+                <!-- end buy-avoid -->
             </div>
             </div>
+            <!-- end section_wrapper -->
 
 
-            <div class="proprietary">
-                <div class="product">
-                    <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                    <img class="product_img" src="//static.fsf.org/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2" />
+            <div class="section_wrapper">
+                <h3 class="main_title">Smartphones</h3>
+                <div class="free">
+                    <div class="product">
+                        <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/tehnoetic-s2.png" alt="Tehnoetic S2 with Replicant" />
+                    </div>
+
+                    <h4 class="title">Tehnoetic S2 with Replicant</h4>
+                    <ul>
+                        <li>
+                            The device 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.
+                        </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>
+                    </ul>
                 </div>
 
                 </div>
 
-                <h4 class="title">Makerbot Replicator 2</h4>
-                <ul>
-                    <li>
-                        MakerWare software is proprietary, restricting freedom and stifling innovation.
-                    </li>
+                <div class="proprietary">
+                    <div class="product">
+                        <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/iphone.png" alt="Apple iPhone" />
+                    </div>
 
 
-                    <li>
-                        Recently announced an increasingly proprietary approach, further distancing itself from the free software community.
-                    </li>
-                </ul>
+                    <h4 class="title">Apple iPhone</h4>
+                    <ul>
+                        <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
+                        <li>
+                            Its proprietary operating system gives 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.
+                        </li>
+                        <li>
+                            Planned obsolescence: business model forces you to buy new devices frequently.
+                        </li>
+                    </ul>
+                </div>
+
+                <!-- 'buy/download' and 'avoid' buttons -->
+                <div class="buy_avoid">
+                    <div class="buy_avoid_wrapper">
+                        <div class="buy">
+                            <a href="https://tehnoetic.com/tehnoetic-s2-phone-replicant"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
+                        </div>
 
 
+                        <div class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                        </div>
+                    </div>
+                </div>
+                <!-- end buy-avoid -->
             </div>
             </div>
+            <!-- end section_wrapper-->
+
+        <div class="section_wrapper">
+                <h3 class="main_title">Compact Laptops</h3>
+
+                <div class="free">
+                    <div class="product">
+                        <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/libiquity-x200.png" alt="Libiquity X200 with Libreboot" />
+                    </div>
+
+                    <h4 class="title">Libiquity Taurinus X200 with GNU/Linux</h4>
+
+                    <ul>
+                        <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware on hardware that is certified to Respect Your Freedom.</li>
+                        <li>Durable hardware is meant to last and easy to repair.</li>
+                        <li>Created by a small business that replaces all restrictive components from a stock laptop.</li>
+                        <li><span style="font-weight:bold">SAVE!</span> 10% off your subtotal price, and Libiquity will donate to the FSF with each purchase. Expires Jan 31, 2016. <a href="#libiquity-discount">Details.</a></li>
+                        <li><em>Libiquity only ships in the USA. For non-US orders, buy an <a href="http://minifree.org/product/libreboot-x200/">X200 from Minifree</a> with <a href="#minifree-discount">this discount.</a></em></li>
+                    </ul>
+                </div>
+
+                <div class="proprietary">
+                    <div class="product">
+                        <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/lenovo-u31.png" alt="Lenovo U31" />
+                    </div>
+
+                    <h4 class="title">Lenovo U31 with Windows</h4>
+                    <ul>
+                        <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>
+                        <!-- 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>
 
 
-            <!-- 'buy/download' and 'avoid' buttons -->
-            <div class="buy_avoid">
-                <div class="buy_avoid_wrapper">
-                    <div class="buy">
-                        <a href="https://www.lulzbot.com/products/lulzbot-taz-4-3d-printer/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                        </a>
+                <!-- 'buy/download' and 'avoid' buttons -->
+                <div class="buy_avoid">
+                    <div class="buy_avoid_wrapper">
+                        <div class="buy">
+                            <a href="https://shop.libiquity.com/product/taurinus-x200"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
+                        </div>
+
+                        <div class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                        </div>
                     </div>
                     </div>
+                </div>
+                <!-- end buy-avoid -->
+            </div> <!-- end section_wrapper -->
 
 
-                    <div class="avoid">
-                        <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+            <div class="section_wrapper">
+                <h3 class="main_title">3D Printers</h3>
+
+                <div class="free">
+                    <div class="product">
+                        <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/lulzbot-mini.png" alt="Lulzbot Mini" />
                     </div>
                     </div>
+
+                    <h4 class="title">Lulzbot Mini</h4>
+                    <ul>
+                        <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>Ease of use features like self-leveling and self-cleaning.</li>
+                        <li>Hardware designs available to make modification and improvement easy. Standardized material format allows 3D printing with plastics, wood-, stone-, bamboo-, rubber-, and metal-like materials.</li>
+                        <li><span style="font-weight:bold">BONUS!</span> Receive a gratis reel of filament when you buy from this guide. Expires Jan 31st, 2015. <a href="#lulzbot-discount">Details.</a></li>
+                    </ul>
                 </div>
                 </div>
-            </div>
-            <!-- end buy-avoid -->
 
 
-        </div>
+                <div class="proprietary">
+                    <div class="product">
+                        <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/makerbot-mini.png" alt="Makerbot Replicator Mini" />
+                    </div>
 
 
-        <div class="section_wrapper">
-            <h3 class="main_title">Routers</h3>
+                    <h4 class="title">Makerbot Replicator Mini</h4>
+                    <ul>
+                        <li>
+                            MakerWare software is proprietary, restricting freedom and stifling innovation.
+                        </li>
+
+                        <li>
+                            MakerBot was founded with a more freedom-respecting philosophy, but has since announced an increasingly proprietary approach and distanced itself from the community that formed around it.
+                        </li>
+                    </ul>
+
+                </div>
 
 
-            <div class="free">
-                <div class="product">
-                    <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                    <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/librecmc-router.jpg" alt="TAZ 4.0" />
+                <!-- 'buy/download' and 'avoid' buttons -->
+                <div class="buy_avoid">
+                    <div class="buy_avoid_wrapper">
+                        <div class="buy">
+                            <a href="https://www.lulzbot.com/store/printers/lulzbot-mini"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
+                        </div>
+
+                        <div class="avoid">
+                            <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
+                        </div>
+                    </div>
                 </div>
                 </div>
+                <!-- end buy-avoid -->
+            </div>
+            <!-- end section_wrapper -->
+
+            <div class="section_wrapper">
+                <h3 class="main_title">Wi-Fi Routers</h3>
+
+                <div class="free">
+                    <div class="product">
+                        <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/librecmc-router.jpg" alt="ThinkPenguin Router" />
+                    </div>
 
 
-                <h4 class="title">ThinkPenguin Router</h4>
-                <ul>
+                    <h4 class="title">ThinkPenguin Router</h4>
+                    <ul>
                         <li>
                         <li>
-                        Your network traffic is safe with this device because the software it runs is audited by independent experts. FIXME: verify
+                            Easily separate privacy-sensitive network traffic from Internet traffic to improve security.
                         </li>
                         </li>
-                <li>
-                        The included LibreCMC operating system is highly configurable and extensible. FIXME: examples of extensions?
-                </li>
-                    <li>
-                        As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.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>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 Respect Your Freedom.</li>
+                        <li><span style="font-weight:bold">SAVE!</span> 5% off any purchase. Expires Jan 29, 2016. <a href="#thinkpenguin-discount">Details.</a> <a href="https://my.fsf.org/join">FSF members</a> receive 7% off with this code and 5% year-round.</li>
                     </ul>
                 </div>
 
                 <div class="proprietary">
                     <div class="product">
                         <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
                     </ul>
                 </div>
 
                 <div class="proprietary">
                     <div class="product">
                         <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                        <img class="product_img" src="http://www.techspot.com/images/products/routers/org/1691824022_1532911738_o.jpg" alt="Linksys WRT1900AC Wireless AC Router" />
+                        <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/isp-router.png" alt="Generic ISP-provided router" />
                     </div>
 
                     <h4 class="title">ISP-provided Routers</h4>
                     <ul>
                         <li>
                     </div>
 
                     <h4 class="title">ISP-provided Routers</h4>
                     <ul>
                         <li>
-                        Proprietary firmware means that there's no way for you to know whether it's spying on you -- and it gets to handle all your Internet traffic as well as local print jobs, file transfers, and communications.
+                            Proprietary firmware means that there's no way for you to know whether it's spying on you -- and it handles all your Internet traffic as well as local print jobs and file transfers.
                         </li>
                         <li>
                         </li>
                         <li>
-                        Subject to surprise firmware updates from your cable provider, likely one of the same companies trying to lock down the Internet and break net neutrality. FIXME: verify
+                            Many models are subject to remote firmware updates from your Internet Service Provider, which probably does not have your best interests in mind -- these same companies fight net neutrality.
                         </li>
                     </ul>
 
                         </li>
                     </ul>
 
                 <div class="buy_avoid">
                     <div class="buy_avoid_wrapper">
                         <div class="buy">
                 <div class="buy_avoid">
                     <div class="buy_avoid_wrapper">
                         <div class="buy">
-                            <a href="https://www.lulzbot.com/products/lulzbot-taz-4-3d-printer/"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-broadband-router-gnu-linux-tpe-nwifirouter2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                             </a>
                         </div>
 
                             </a>
                         </div>
 
                     </div>
                 </div>
                 <!-- end buy-avoid -->
                     </div>
                 </div>
                 <!-- end buy-avoid -->
-
             </div>
             </div>
+            <!-- end section_wrapper -->
 
             <div class="section_wrapper">
                 <h3 class="main_title">Ebooks</h3>
 
             <div class="section_wrapper">
                 <h3 class="main_title">Ebooks</h3>
                             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>
                             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 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">
                             <li>
                                 Amazon openly claims
                                 <a href="http://www.defectivebydesign.org/amazon-kindle-swindle">
                                     ebooks.
                                 </a>
                             </li>
                                     ebooks.
                                 </a>
                             </li>
+<li>If you insist on
+purchasing from Amazon, at least designate a charity like the Free
+Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> to receive some of the money.</li>
                         </ul>
 
                     </div>
                         </ul>
 
                     </div>
                         </div>
                     </div>
                     <!-- end buy-avoid -->
                         </div>
                     </div>
                     <!-- end buy-avoid -->
-
-                </div>
-
-                <div class="comparisons">
-                    <div class="section_wrapper">
-                        <h3 class="main_title">Larger Laptops</h3>
-
-                        <div class="free">
-                            <div class="product">
-                                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/minifree-t400.png" alt="Minifree T400 Notebook with Libreboot" />
-                            </div>
-
-                            <h4 class="title">Minifree T400 GNU/Linux laptop</h4>
-
-                            <ul>
-                                <li>
-                                    Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="https://www.gnu.org/distros/free-distros.html">fully free GNU/Linux distribution</a>.
-                                </li>
-
-                                <li>
-                                        Based on a Lenovo T400, with FIXME tech stats.
-                                </li>
-
-                                <li>                            <a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, right down to its libreboot firmware.</li>
-                                <!--<li><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</li>-->
-                            </ul>
-
-                        </div>
-
-                        <div class="proprietary">
-                            <div class="product">
-                                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
-
-                            </div>
-
-                            <h4 class="title">Apple Macbook Pro</h4>
-                            <ul>
-                                <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>
-                                <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
-                                <li>
-                                    Planned obsolescence: business model forces you to buy new devices frequently.
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-
-                    <!-- 'buy/download' and 'avoid' buttons -->
-                    <div class="buy_avoid">
-                        <div class="buy_avoid_wrapper">
-                            <div class="buy">
-                                <a href="https://www.thinkpenguin.com/catalog/notebook-computers-gnu-linux-2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                                </a>
-                            </div>
-
-                            <div class="avoid">
-                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                            </div>
-                        </div>
-                    </div>
-                    <!-- end buy-avoid -->
-
-                </div>
-
-                <div class="comparisons">
-                    <div class="section_wrapper">
-                        <h3 class="main_title">Smaller Laptops</h3>
-
-                        <div class="free">
-                            <div class="product">
-                                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/libiquity-x200.png" alt="Libiquity X200 Notebook with Libreboot" />
-                            </div>
-
-                            <h4 class="title">Libiquity Taurinus X200 GNU/Linux laptop</h4>
-
-                            <ul>
-
-                                <li>
-                                    Comes installed with a free OS, and its Wi-Fi and 3D-accelerated graphics work with any other <a href="https://www.gnu.org/distros/free-distros.html">fully free GNU/Linux distribution</a>.
-                                </li>
-
-                                <li>
-                                        Based on a Lenovo X200, with FIXME tech stats.
-                                </li>
-
-                                <li>                            <a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, right down to its libreboot firmware.</li>
-                                <!--<li><span style="font-weight:bold">SAVE!</span> $5 off any purchase of $50 or more with coupon code FSFGIVING. ThinkPenguin will also donate $5 to the FSF (expires at the end of 2014).</li>-->
-                            </ul>
-                        </div>
-
-                        <div class="proprietary">
-                            <div class="product">
-                                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                                <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/Macbook_Pro.png" alt="Apple Macbook Pro" />
-
-                            </div>
-
-                            <h4 class="title">FIXME A laptop that has AMT or an Apple Macbook Air or other</h4>
-                            <ul>
-                                <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>
-                                <li>Comes crawling with <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInMacOS">spyware</a>.</li>
-                                <li>
-                                    Planned obsolescence: business model forces you to buy new devices frequently.
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-
-                    <!-- 'buy/download' and 'avoid' buttons -->
-                    <div class="buy_avoid">
-                        <div class="buy_avoid_wrapper">
-                            <div class="buy">
-                                <a href="https://www.thinkpenguin.com/catalog/notebook-computers-gnu-linux-2"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
-                                </a>
-                            </div>
-
-                            <div class="avoid">
-                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                            </div>
-                        </div>
-                    </div>
-                    <!-- end buy-avoid -->
-
                 </div>
                 </div>
+                <!-- end section_wrapper -->
 
 
-                <div class="comparisons">
-                    <div class="section_wrapper">
-                        <h3 class="main_title">Graphic Design</h3>
-
-                        <div class="free">
-                            <div class="product">
-                                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                                <img class="product_img" src="//static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inkscape" />
-                            </div>
-
-                            <h4 class="title">GIMP and Inkscape</h4>
-
-                            <ul>
-                                <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>
-
-                        <div class="proprietary">
-                            <div class="product">
-                                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                                <img class="product_img" src="//static.fsf.org/nosvn/images/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
-                            </div>
-
-                            <h4 class="title">Photoshop and Illustrator</h4>
-                            <ul>
-                                <li>Proprietary software controlled by Adobe.</li>
-                                <li>Prefers locked-down proprietary formats.</li>
-                                <li>Requires costly upgrades to stay up to date.</li>
-                            </ul>
-
-                        </div>
-                    </div>
-
-                    <!-- 'buy/download' and 'avoid' buttons -->
-                    <div class="buy_avoid">
-                        <div class="buy_avoid_wrapper">
-                            <div class="buy">
-                                <a href="https://www.inkscape.org/en/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-                                </a>
-                            </div>
-
-                            <div class="avoid">
-                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                            </div>
-                        </div>
-                    </div>
-                    <!-- end buy-avoid -->
-
-                </div>
                 <div class="section_wrapper">
                 <div class="section_wrapper">
-                    <h3 class="main_title">Operating Systems</h3>
+                    <h3 class="main_title">Graphic Design</h3>
 
                     <div class="free">
                         <div class="product">
                             <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
 
                     <div class="free">
                         <div class="product">
                             <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                            <img class="product_img" src="//www.gnu.org/graphics/trisquel/trisquel.svg" alt="Trisquel GNU/Linux" />
+                            <img class="product_img" src="//static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inkscape" />
                         </div>
 
                         </div>
 
-                        <h4 class="title">Trisquel GNU/Linux</h4>
-                        <ul>
-                            <li>
-                                <a href="http://www.gnu.org/distros/free-distros.html">FSF-endorsed</a> completely free operating system: transparent and modifiable.
-                            </li>
-
-                            <li>
-                                Break the cycle of forced upgrades and planned obsolescence.
-                            </li>
+                        <h4 class="title">GIMP and Inkscape</h4>
 
 
-                            <li>
-                                Comes with all the software you need and an easy software manager to find more.
-                            </li>
-                            <li>Works great with the Wi-Fi adapters in this guide.</li>
+                        <ul>
+                            <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>
 
                         </ul>
 
-
-
                     </div>
 
                     <div class="proprietary">
                         <div class="product">
                             <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
                     </div>
 
                     <div class="proprietary">
                         <div class="product">
                             <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                            <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/windows.png" alt="Windows" />
+                            <img class="product_img" src="//static.fsf.org/nosvn/images/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
                         </div>
 
                         </div>
 
-                        <h4 class="title">Windows</h4>
+                        <h4 class="title">Photoshop and Illustrator</h4>
                         <ul>
                         <ul>
-                            <li>
-                                Proprietary software that profits from controlling how you use your computer.
-                            </li>
-
-                            <li>
-                                Invades privacy and exposes personal data to <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareInWindows">Microsoft</a>, the NSA, and other malicious attackers.
-                            </li>
-
-                            <li>
-                                Dependent on mandatory upgrades and devices that don't support older versions of Windows.
-                            </li>
+                            <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>
                         </ul>
-                    </div>
-
-                    <!-- 'buy/download' and 'avoid' buttons -->
-                    <div class="buy_avoid">
-                        <div class="buy_avoid_wrapper">
-                            <div class="buy">
-                                <a href="http://trisquel.info/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
-                                </a>
-                            </div>
-
-                            <div class="avoid">
-                                <img src="//static.fsf.org/nosvn/images/givingguide/images/avoid.png" alt="avoid" />
-                            </div>
-                        </div>
-                    </div>
-                    <!-- end buy-avoid -->
-
-                </div>
-                <div class="comparisons">
-                    <div class="section_wrapper">
-                        <h3 class="main_title">Gift Cards</h3>
-
-                        <div class="free">
-                            <div class="product">
-                                <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                                <img class="product_img" src="//static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="FSF Membership Card" />
-                            </div>
-
-                            <h4 class="title">FSF Membership Card</h4>
-                            <ul>
-                                <li>Join over 3,000 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="http://libreplanet.org/wiki/LibrePlanet: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>
-
-                        </div>
-
-                        <div class="proprietary">
-                            <div class="product">
-                                <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                                <img class="product_img" src="//static.fsf.org/fsforg/img/iTunesCardPrepped.png" alt="iTunes Card" />
-                            </div>
-
-                            <h4 class="title">iTunes Card</h4>
-                            <ul>
-                                <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> 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>
                     </div>
 
                     <!-- 'buy/download' and 'avoid' buttons -->
                     <div class="buy_avoid">
                         <div class="buy_avoid_wrapper">
                             <div class="buy">
                     </div>
 
                     <!-- 'buy/download' and 'avoid' buttons -->
                     <div class="buy_avoid">
                         <div class="buy_avoid_wrapper">
                             <div class="buy">
-                                <a href="https://my.fsf.org/associate/support_freedom/join_fsf?"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                                <a href="https://www.inkscape.org/en/"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
                                 </a>
                             </div>
 
                                 </a>
                             </div>
 
                         </div>
                     </div>
                     <!-- end buy-avoid -->
                         </div>
                     </div>
                     <!-- end buy-avoid -->
-
-                </div>
+                </div> <!-- end section_wrapper -->
 
                 <div class="section_wrapper">
 
                 <div class="section_wrapper">
-                    <h3 class="main_title">Smartphone</h3>
+                    <h3 class="main_title">Gift Cards</h3>
 
                     <div class="free">
                         <div class="product">
                             <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
 
                     <div class="free">
                         <div class="product">
                             <img class="good" src="//static.fsf.org/nosvn/images/givingguide/images/good.png" alt="good" />
-                            <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/tehnoetic-s2.png" alt="Replicant" />
+                            <img class="product_img" src="//static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="FSF Membership Card" />
                         </div>
 
                         </div>
 
-                        <h4 class="title">Tehnoetic S2 FIXME: check that Tiberiu's ok with this being here</h4>
+                        <h4 class="title">FSF Membership Card</h4>
                         <ul>
                         <ul>
-                            <li>
-                                Runs the Replicant fully free operating system, based on Android. FIXME: why isn't Replicant endorsed?
-                            </li>
-                            <li>
-                                FIXME: something about F-droid
-                            </li>
+                            <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>
 
                         </ul>
 
-
                     </div>
 
                     <div class="proprietary">
                         <div class="product">
                             <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
                     </div>
 
                     <div class="proprietary">
                         <div class="product">
                             <img class="bad" src="//static.fsf.org/nosvn/images/givingguide/images/bad.png" alt="bad" />
-                            <img class="product_img" src="//static.fsf.org/nosvn/images/givingguide/images/iphone.png" alt="Apple iPhone" />
+                            <img class="product_img" src="//static.fsf.org/fsforg/img/iTunesCardPrepped.png" alt="iTunes Card" />
                         </div>
 
                         </div>
 
-                        <h4 class="title">Apple iPhone</h4>
+                        <h4 class="title">iTunes Card</h4>
                         <ul>
                         <ul>
-                            <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.
+                            <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>
 
+                            <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>
                         </ul>
+
                     </div>
 
                     <!-- 'buy/download' and 'avoid' buttons -->
                     <div class="buy_avoid">
                         <div class="buy_avoid_wrapper">
                             <div class="buy">
                     </div>
 
                     <!-- 'buy/download' and 'avoid' buttons -->
                     <div class="buy_avoid">
                         <div class="buy_avoid_wrapper">
                             <div class="buy">
-                                <a href="http://www.replicant.us"><img src="//static.fsf.org/nosvn/images/givingguide/images/download.png" alt="Download" />
+                                <a href="https://my.fsf.org/associate/support_freedom/join_fsf?"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
                                 </a>
                             </div>
 
                                 </a>
                             </div>
 
                         </div>
                     </div>
                     <!-- end buy-avoid -->
                         </div>
                     </div>
                     <!-- end buy-avoid -->
-
                 </div>
                 </div>
-                <!-- Recommended Section -->
-
-                <div class="recommended">
-                    <!--recommended charities-->
-                    <a name="charities"><h1 class="topic_title">Recommended charities for holiday donations</h1></a>
-                    <p><a href="http://www.eff.org">Electronic Frontier Foundation</a>,
-                        <a href="http://www.creativecommons.org">Creative Commons</a>,
-                        <a href="http://wikimedia.org">Wikimedia Foundation</a>,
-                        <a href="http://www.sfconservancy.org">Software Freedom Conservancy</a>,
-                        <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a>,
-                        <a href="http://www.gnome.org">GNOME Foundation</a> and
-                        <a href="http://www.fsf.org">Free Software Foundation</a>.</p>
-
+                <!-- end section_wrapper -->
+            </div>
+            <!-- end comparisons section -->
 
 
+            <!-- Recommended Section -->
+            <div class="recommended">
+                <h1 class="topic_title">More Products Certified to Respect Your Freedom</h1>
+                <div class="recommend_wrapper">
 
 
+                    <div class="recommended_product">
+                        <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="Tehnoetic Mini Wi-Fi adapter" />
+                        <h4 class="title">Tehnoetic Mini Wi-Fi Adapter</h4>
+                        <p>Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.</p>
+                        <div class="buy">
+                            <a href="https://tehnoetic.com/tehnoetic-wireless-adapter-gnu-linux-libre-tet-n150"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
+                        </div>
                     </div>
                     </div>
-                    <!-- end recommended-->
 
 
-                    <!-- h-node block. Using licenses class as a quick and dirty way to match its formatting. Others are welcome to improve this. -->
-                    <div class="licenses">
-                        <h1 class="topic_title">More devices on h-node</h1>
-                        <p>To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/">h-node database</a>.</p>
+                    <div class="recommended_product">
+                        <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-mini-router.png" alt="ThinkPenguin VPN router" />
+                        <h4 class="title">ThinkPenguin VPN Router</h4>
+                        <p>Designed to complement your existing router by providing an easy-to-set up VPN that enhances privacy and security and circumvents network controls. <a href="#thinkpenguin-discount">Discount available.</a></p>
+
+                        <div class="buy">
+                            <a href="https://www.thinkpenguin.com/gnu-linux/free-software-wireless-n-mini-router-tpe-r1100"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
+                        </div>
                     </div>
                     </div>
-                    <!-- end h-node block -->
-
-                    <!-- Licenses Section -->
-
-                    <div class="licenses">
-                        <h1 class="topic_title">Licenses</h1>
-                        <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>
-                        <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><a href="https://www.lulzbot.com/news/press-materials">Lulzbot 3D printer photo</a> 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><a href="//static.fsf.org/nosvn/dontcardomebro.jpg">FSF USB membership card</a> 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><a href="http://www.flickr.com/photos/bmiphone/4640570159/">iTunes gift card</a> 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><a href="https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook">ThinkPenguin with GNU</a> 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><a href="http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png">Macbook Pro</a> 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><a href="http://www.gutenberg.org">Astounding Stories</a> 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 in the public domain but are registered trademarks.</li>
-                            <li><a href="https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg">Replicant</a> by Paul Kocialkowski is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
-                            <li>Tehnoetic Wi-Fi dongle by Tehnoetic 2014 licensed under CC BY-SA 4.0.</li>
-                            <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
-                            <li>The Media Goblin graphic is public domain.</li>
-                        </ul>
 
 
+                    <div class="recommended_product">
+                        <img class="recommended_product_img" src="//static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-long-range-adapter.png" alt="ThinkPenguin long-range adapter" />
+                        <h4 class="title">ThinkPenguin Long-Range Wi-Fi Adapter</h4>
+                        <p>More powerful than its smaller cousin, and can be further upgraded with a larger antenna. <a href="#thinkpenguin-discount">Discount available.</a></p>
+                        <div class="buy">
+                            <a href="https://www.thinkpenguin.com/gnu-linux/penguin-wireless-n-usb-adapter-w-external-antenna-gnu-linux-tpe-n150usbl"><img src="//static.fsf.org/nosvn/images/givingguide/images/buy.png" alt="Buy" />
+                            </a>
+                        </div>
                     </div>
                     </div>
-                    <!-- end licenses-->
-
-                    <!--footer-->
-                    <footer>
-                        <div class="footer_wrapper">
-                            <div>
-                                <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>
-                                </p>
-                            </div>
+                    <p class="remark"> If you have ideas for more gifts that can be given freely, submit your recommendations to our
+                        <a href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
+                    </p>
+                </div>
+                <!--recommended charities-->
+                <a name="charities"><h1 class="topic_title">Recommended organizations for holiday donations</h1></a>
+                <p><a href="http://www.fsf.org">Free Software Foundation</a>,
+                <a href="http://www.sfconservancy.org">Software Freedom Conservancy</a>,
+<a href="http://www.eff.org">Electronic Frontier Foundation</a>,
+                    <a href="http://www.creativecommons.org">Creative Commons</a>,
+                    <a href="http://wikimedia.org">Wikimedia Foundation</a>, <a href="http://www.softwarefreedom.org">Software Freedom Law Center</a>, and <a href="http://www.gnome.org">GNOME Foundation</a>.</p>
+                </div>
+                <!-- end recommended-->
+
+                <!--promotion details-->
+                <div class="licenses">
+                    <a name="promotion-details"><h1 class="topic_title">Promotion details</h1></a>
+                    <ul style="list-style: none inside none;">
+
+                        <li id="minifree-discount"><span style="font-weight: bold">Minifree:</span> Receive &euro;100 off each and every computer you buy. Enter the discount code FSFGIVINGGUIDE at checkout. Minifree donates &euro;20 (approx. $21) to the FSF for each purchase made with the code.</li>
+                        <li id="lulzbot-discount"><span style="font-weight: bold">Lulzbot:</span>
+                            Purchase a LulzBot Mini desktop 3D printer through this guide and receive a gratis 1kg reel of standard filament. Email <a href="mailto:sales@lulzbot.com">sales@lulzbot.com</a> before or during purchasing and mention the FSF 2015 Giving Guide to receive this promotion. Specify if you'd like HIPS, PLA, or ABS filament. Promotion subject to inventory availability.</li>
+                            <li id="thinkpenguin-discount"><span style="font-weight: bold">ThinkPenguin:</span> Use coupon code FSFGIVING15 at checkout. <a href="https://my.fsf.org/join">FSF members</a> receive 7% off with this code and 5% year-round. Applies to all items.</li>
+                            <li id="libiquity-discount"><span style="font-weight: bold">Libiquity:</span> This is a rebate, not a discount at point of sale. After purchase, email your order number to
+                                <a href="mailto:sales@libiquity.com">sales@libiquity.com</a> and mention the secret password FSFGIVING in your message. You'll receive a refund of 10% of your subtotal price. Libiquity will donate 5% of each purchase's subtotal price to the FS. Applies to all items.</li>
+                            </ul>
+                        </div>
+                        <!-- end promotion details-->
 
 
-                            <div class="copyright">
-                                <p>Copyright © 2004-2015
-                                    <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>.
-                                </p>
-                            </div>
+                        <!-- h-node block. Using licenses class as a quick and dirty way to match its formatting. Others are welcome to improve this. -->
+                        <div class="licenses">
+                            <h1 class="topic_title">More devices on h-node</h1>
+                            <p>To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/">h-node database</a>.</p>
                         </div>
                         </div>
+                        <!-- end h-node block -->
+
+                        <!-- Licenses Section -->
+                        <div class="licenses">
+                            <h1 class="topic_title">Licenses</h1>
+                            <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>
+                            <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>Tehnoetic Replicant s2 and Wi-Fi Dongle by Tehnoetic 2014 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>The MakerBot logo is copyright MakerBot Industries.</li>
+                                <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
+                            </ul>
+                        </div>
+                        <!-- end licenses-->
+
+                        <!--footer-->
+                        <footer>
+                            <div class="footer_wrapper">
+                                <div>
+                                    <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>
+                                    </p>
+                                </div>
+
+                                <div class="copyright">
+                                    <p>Version 6.0. Copyright © 2004-2015
+                                        <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>.
+                                    </p>
+                                </div>
+                            </div>
 
 
-                        <script type="text/javascript" src="js/piwik.js"></script>
-                    </footer>
+                            <script type="text/javascript" src="js/piwik.js"></script>
+                        </footer>
 
 
-                </body>
-                </html>
+                    </body>
+                    </html>