diff --git a/tools/droiddoc/templates-sdk-dev/footer.cs b/tools/droiddoc/templates-sdk-dev/footer.cs
index 2309306..b609d3b 100644
--- a/tools/droiddoc/templates-sdk-dev/footer.cs
+++ b/tools/droiddoc/templates-sdk-dev/footer.cs
@@ -1,152 +1,20 @@
-<div class="dac-modal">
-  <div class="dac-modal-dimmer" data-modal-toogle></div>
-
-  <div class="dac-modal-container">
-    <div class="dac-modal-window">
-      <header class="dac-modal-header">
-        <button class="dac-modal-header-close" data-modal-toogle><i class="dac-sprite dac-close"></i></button>
-        <h2 class="dac-modal-header-title">Sign-up for the newsletter to get the latest Android developer news and tips that will help you find success on Google Play.</h2>
-        <p class="dac-modal-header-subtitle">&#42; Required Fields</p>
-      </header>
-      <iframe src="" class="dac-modal-iframe" name="dac-modal-iframe"></iframe>
-      <form action="https://docs.google.com/forms/d/1QgnkzbEJIDu9lMEea0mxqWrXUJu0oBCLD7ar23V0Yys/formResponse" class="dac-form" method="post" target="dac-modal-iframe" data-newsletter-form>
-        <section class="dac-modal-content">
-          <fieldset class="dac-form-fieldset">
-            <div class="cols">
-              <div class="col-4of8">
-                <div class="dac-form-input-group">
-                  <label for="newsletter-full-name" class="dac-form-floatlabel">Full name</label>
-                  <input type="text" class="dac-form-input" name="entry.1357890476" id="newsletter-full-name" required>
-                  <span class="dac-form-required">*</span>
-                </div>
-                <div class="dac-form-input-group">
-                  <label for="newsletter-email" class="dac-form-floatlabel">Email address</label>
-                  <input type="email" class="dac-form-input" name="entry.472100832" id="newsletter-email" required>
-                  <span class="dac-form-required">*</span>
-                </div>
-              </div>
-              <div class="col-4of8">
-                <div class="dac-form-input-group">
-                  <label for="newsletter-company" class="dac-form-floatlabel">Company / developer name</label>
-                  <input type="text" class="dac-form-input" name="entry.1664780309" id="newsletter-company">
-                </div>
-                <div class="dac-form-input-group">
-                  <label for="newsletter-play-store" class="dac-form-floatlabel">One of your Play Store app URLs</label>
-                  <input type="url" class="dac-form-input" name="entry.47013838" id="newsletter-play-store" required>
-                  <span class="dac-form-required">*</span>
-                </div>
-              </div>
-            </div>
-          </fieldset>
-          <fieldset class="dac-form-fieldset">
-            <div class="cols">
-              <div class="col-4of8">
-                <legend class="dac-form-legend">Which best describes your business:<span class="dac-form-required">*</span>
-                </legend>
-                <div class="dac-form-radio-group">
-                  <input type="radio" value="Apps" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-app" required>
-                  <label for="newsletter-business-type-app" class="dac-form-radio-button"></label>
-                  <label for="newsletter-business-type-app" class="dac-form-label">Apps</label>
-                </div>
-                <div class="dac-form-radio-group">
-                  <input type="radio" value="Games" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-games" required>
-                  <label for="newsletter-business-type-games" class="dac-form-radio-button"></label>
-                  <label for="newsletter-business-type-games" class="dac-form-label">Games</label>
-                </div>
-                <div class="dac-form-radio-group">
-                  <input type="radio" value="Apps and Games" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-appsgames" required>
-                  <label for="newsletter-business-type-appsgames" class="dac-form-radio-button"></label>
-                  <label for="newsletter-business-type-appsgames" class="dac-form-label">Apps &amp; Games</label>
-                </div>
-              </div>
-              <div class="col-4of8 newsletter-checkboxes">
-                <div class="dac-form-radio-group">
-                  <div class="dac-media">
-                    <div class="dac-media-figure">
-                      <input type="checkbox" class="dac-form-checkbox" name="entry.732309842" id="newsletter-add" required value="Add me to the mailing list for the monthly newsletter and occasional emails about development and Google Play opportunities.">
-                      <label for="newsletter-add" class="dac-form-checkbox-button"></label>
-                    </div>
-                    <div class="dac-media-body">
-                      <label for="newsletter-add" class="dac-form-label dac-form-aside">Add me to the mailing list for the monthly newsletter and occasional emails about development and Google Play opportunities.<span class="dac-form-required">*</span></label>
-                    </div>
-                  </div>
-                </div>
-                <div class="dac-form-radio-group">
-                  <div class="dac-media">
-                    <div class="dac-media-figure">
-                      <input type="checkbox" class="dac-form-checkbox" name="entry.2045036090" id="newsletter-terms" required value="I acknowledge that the information provided in this form will be subject to Google's privacy policy (https://www.google.com/policies/privacy/).">
-                      <label for="newsletter-terms" class="dac-form-checkbox-button"></label>
-                    </div>
-                    <div class="dac-media-body">
-                      <label for="newsletter-terms" class="dac-form-label dac-form-aside">I acknowledge that the information provided in this form will be subject to <a href="https://www.google.com/policies/privacy/">Google's privacy policy</a>.<span class="dac-form-required">*</span></label>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </fieldset>
-        </section>
-        <footer class="dac-modal-footer">
-          <div class="cols">
-            <div class="col-2of5">
-            </div>
-          </div>
-          <button type="submit" value="Submit" class="dac-fab dac-primary dac-large dac-modal-action"><i class="dac-sprite dac-arrow-right"></i></button>
-        </footer>
-      </form>
-    </div>
+<div id="footer" class="wrap" <?cs if:fullpage ?>style="width:940px"<?cs /if ?>>
+        
+<?cs if:reference ?>
+  <div id="copyright">
+    <?cs call:custom_copyright() ?>
   </div>
-</div>
-<div class="dac-footer wrap">
-  <div class="cols dac-footer-main">
-    <div class="col-1of2">
-      <a class="dac-footer-getnews" data-modal-toogle href="javascript:;">Get news &amp; tips <span class="dac-fab dac-primary"><i class="dac-sprite dac-mail"></i></span></a>
-    </div>
-    <div class="col-1of2 dac-footer-reachout">
-      <div class="dac-footer-contact">
-        <a class="dac-footer-contact-link" href="http://android-developers.blogspot.com/">Blog</a>
-        <a class="dac-footer-contact-link" href="/support.html">Support</a>
-      </div>
-      <div class="dac-footer-social">
-        <a class="dac-fab dac-footer-social-link" href="https://www.youtube.com/user/androiddevelopers"><i class="dac-sprite dac-youtube"></i></a>
-        <a class="dac-fab dac-footer-social-link" href="https://plus.google.com/+AndroidDevelopers"><i class="dac-sprite dac-gplus"></i></a>
-        <a class="dac-fab dac-footer-social-link" href="https://twitter.com/AndroidDev"><i class="dac-sprite dac-twitter"></i></a>
-      </div>
-    </div>
+  <div id="build_info">
+    <?cs call:custom_buildinfo() ?>
   </div>
-
-  <hr class="dac-footer-separator"/>
-
-  <?cs if:reference ?>
-    <p class="dac-footer-copyright">
-      <?cs call:custom_copyright() ?>
-    </p>
-    <p class="dac-footer-build">
-      <?cs call:custom_buildinfo() ?>
-    </p>
-  <?cs elif:!hide_license_footer ?>
-    <p class="dac-footer-copyright">
-      <?cs call:custom_cc_copyright() ?>
-    </p>
-  <?cs /if ?>
-
-  <p class="dac-footer-links">
-    <a href="/about/index.html">About Android</a>
-    <a href="/auto/index.html">Auto</a>
-    <a href="/tv/index.html">TV</a>
-    <a href="/wear/index.html">Wear</a>
-    <a href="/legal.html">Legal</a>
-
-    <span id="language" class="locales">
-      <select name="language" onchange="changeLangPref(this.value, true)">
-        <option value="en" selected="selected">English</option>
-        <option value="es">Español</option>
-        <option value="ja">日本語</option>
-        <option value="ko">한국어</option>
-        <option value="ru">Русский</option>
-        <option value="zh-cn">中文（简体)</option>
-        <option value="zh-tw">中文（繁體)</option>
-      </select>
-    </span>
-  </p>
-</div> <!-- end footer -->
+<?cs elif:!hide_license_footer ?>
+  <div id="copyright">
+    <?cs call:custom_cc_copyright() ?>
+  </div>
+<?cs /if ?>
+<?cs if:!no_footer_links ?>
+  <div id="footerlinks">
+    <?cs call:custom_footerlinks() ?>
+  </div>
+<?cs /if ?>
+</div> <!-- end footer -->
\ No newline at end of file