diff --git a/roles/freemedia/files/FreeMedia-form.html b/roles/freemedia/files/FreeMedia-form.html
index 9afa4ed9ad..13ba6f2b7a 100644
--- a/roles/freemedia/files/FreeMedia-form.html
+++ b/roles/freemedia/files/FreeMedia-form.html
@@ -34,44 +34,44 @@ To request <b>ONE</b> copy of Fedora DVD or Live Media by mail, please fill out
 <tr><td><b><small>Region</small></b></td><td>
 <select name="region">
  
-<option value="APAC">Asia Pacific Region</>
-<option value="Europe">Europe Region</>
-<option value="LatinAmerica">Latin America Region</>
-<option value="NorthAmerica">North America Region</>
-<option value="Africa">Africa Region</>
+<option value="APAC">Asia Pacific Region</option>
+<option value="Europe">Europe Region</option>
+<option value="LatinAmerica">Latin America Region</option>
+<option value="NorthAmerica">North America Region</option>
+<option value="Africa">Africa Region</option>
  
 </select><i><SMALL>(Where your country belongs to)</SMALL>
 </td></tr>
  
-<tr><td><b><small>Full Name<small></b></td><td><input type="text" size="20" name="realname"></td></tr>
-<tr><td><b><small>Email<small></b></td><td><input type="text" size="20" name="email"></td></tr>
-<tr><td><b><small>Release<small></b></td>
+<tr><td><b><small>Full Name</small></b></td><td><input type="text" size="20" name="realname"></td></tr>
+<tr><td><b><small>Email</small></b></td><td><input type="text" size="20" name="email"></td></tr>
+<tr><td><b><small>Release</small></b></td>
 <td>
-<input type="radio" name="release" value="Fedora 20" checked>Fedora 20</>
+<input type="radio" name="release" value="Fedora 21" checked>Fedora 21</>
 </td>
 </tr>
 <tr><td><b><small>Media</small></b></td>
 <td>
 <select name="media">
-<option value="i386 DVD" selected>i386 DVD</>
-<option value="x86_64 DVD">x86_64 DVD</>
-<option value="i386 Live (Gnome)">i386 Live DVD (Gnome)</>
-<option value="x86_64 Live (Gnome)">x86_64 Live DVD (Gnome)</>
-<option value="KDE i386 Live">KDE i386 Live DVD</>
-<option value="KDE x86_64 Live">KDE x86_64 Live DVD</>
-<option value="LXDE i386 Live" >LXDE i386 Live CD</>
-<option value="LXDE x86_64 Live" >LXDE x86_64 Live CD</>
-<option value="MATE-Compiz i386 Live">MATE-Compiz i386 Live CD</>
-<option value="MATE-Compiz x86_64 Live">MATE-Compiz x86_64 Live CD</>
-<option value="Xfce i386 Live">Xfce i386 Live CD</>
-<option value="Xfce x86_64 Live">Xfce x86_64 Live CD</>
+<option value="Workstation Product 64Bit" selected="selected">Workstation 64Bit</option>
+<option value="Workstation Product 32Bit" selected="selected">Workstation 32Bit</option>
+<option value="Fedora Server 64Bit" selected="selected">Server 64Bit</option>
+<option value="Fedora Server 32Bit" selected="selected">Server 32Bit</option>
+<option value="KDE i386 Live">KDE i386 Live DVD</option>
+<option value="KDE x86_64 Live">KDE x86_64 Live DVD</option>
+<option value="LXDE i386 Live" >LXDE i386 Live CD</option>
+<option value="LXDE x86_64 Live" >LXDE x86_64 Live CD</option>
+<option value="MATE-Compiz i386 Live">MATE-Compiz i386 Live CD</option>
+<option value="MATE-Compiz x86_64 Live">MATE-Compiz x86_64 Live CD</option>
+<option value="Xfce i386 Live">Xfce i386 Live CD</option>
+<option value="Xfce x86_64 Live">Xfce x86_64 Live CD</option>
 </select><small><i>(If you are unsure, choose i386)</small></i>
 </td>
 </tr>
  
-<tr><td><b><small>Address Line1<small></b></td><td><input type="text" size="20" name="address1"><i><SMALL>(Door no, Street name)</SMALL></i></td></tr>
-<tr><td><b><small>Address Line2<small></b></td><td><input type="text" size="20" name="address2"><i><SMALL>(Locality, City)</SMALL></i></td></tr>
-<tr><td><b><small>Address Line3<small></b></td><td><input type="text" size="20" name="address3"><i><SMALL>(State, Postal Code/Zipcode)</SMALL></i></td></tr>
+<tr><td><b><small>Address Line1</small></b></td><td><input type="text" size="20" name="address1"><i><SMALL>(Door no, Street name)</SMALL></i></td></tr>
+<tr><td><b><small>Address Line2</small></b></td><td><input type="text" size="20" name="address2"><i><SMALL>(Locality, City)</SMALL></i></td></tr>
+<tr><td><b><small>Address Line3</small></b></td><td><input type="text" size="20" name="address3"><i><SMALL>(State, Postal Code/Zipcode)</SMALL></i></td></tr>
  
  
 <tr><td><b><small>Address Line4</small></b></td><td>