diff --git a/README.md b/README.md
index 9e595f2..25b8e9d 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Features
 - Contact form
 - Custom Robots.txt (changes values based on environment)
 - Internal templates for meta data and google analytics
+- RSS Discovery
 
 Also includes examples of Hugo Features or Functions:
 
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 337ac7b..15dbd9b 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -19,6 +19,11 @@
 
      <link href='{{ "dist/main.css" | absURL }}' rel='stylesheet' type="text/css" />
 
+     {{ if .RSSLink }}
+      <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+      <link href="{{ .RSSLink }}" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" />
+      {{ end }}
+
       {{/* NOTE: These Hugo Internal Templates can be found starting at https://github.com/spf13/hugo/blob/master/tpl/tplimpl/template_embedded.go#L158 */}}
       {{- template "_internal/opengraph.html" . -}}
       {{- template "_internal/google_news.html" . -}}
diff --git a/layouts/shortcodes/form-contact.html b/layouts/shortcodes/form-contact.html
index 3067166..dc30d59 100644
--- a/layouts/shortcodes/form-contact.html
+++ b/layouts/shortcodes/form-contact.html
@@ -3,17 +3,17 @@
 
 <form class="black-80 sans-serif" accept-charset="UTF-8" action="{{ .Get "action" }}" method="POST">
 
-    <label class="{{ $.Scratch.Get "labelClasses" }}"  for="first_name">Your Name</label>
-    <input type="text" id="first_name" name="first_name" class="{{ $.Scratch.Get "inputClasses" }}"  required placeholder=" " />
+    <label class="{{ $.Scratch.Get "labelClasses" }}"  for="name">Your Name</label>
+    <input type="text" id="name" name="name" class="{{ $.Scratch.Get "inputClasses" }}"  required placeholder=" "  aria-labelledby="name"/>
 
     <label class="{{ $.Scratch.Get "labelClasses" }}" for="email">Email Address</label>
-    <input type="email" id="email" name="email" class="{{ $.Scratch.Get "inputClasses" }}"  required placeholder=" " />
-    <div class="requirements f6 gray glow i ph3 overflow-hidden TK">
+    <input type="email" id="email" name="email" class="{{ $.Scratch.Get "inputClasses" }}"  required placeholder=" "  aria-labelledby="email"/>
+    <div class="requirements f6 gray glow i ph3 overflow-hidden">
       Must be a valid email address.
     </div>
 
     <label class="{{ $.Scratch.Get "labelClasses" }}" for="message">Message</label>
-    <textarea id="message" name="message" class="{{ $.Scratch.Get "inputClasses" }} h4" aria-describedby="comment-desc"></textarea>
+    <textarea id="message" name="message" class="{{ $.Scratch.Get "inputClasses" }} h4" aria-labelledby="message"></textarea>
 
     <input class="db w-100 mv2 white pa3 bn hover-shadow hover-bg-blck bg-animate bg-black" type="submit" value="Send" />