--- a/macros.xml	Fri Jan 29 13:27:30 2016 -0500
+++ b/macros.xml	Sat Jun 25 15:06:43 2016 -0400
@@ -48,6 +48,15 @@
     </conditional>
   </xml>
 
+  <xml name="track_display">
+    <param type="select" label="Track Visibility" name="track_visibility">
+      <option value="default_off">Off for new users</option>
+      <option value="default_on">On for new users</option>
+      <option value="force">Force On</option>
+      <option value="always">Always On (ignores URL parameters)</option>
+    </param>
+  </xml>
+
   <xml name="jb_color"
       token_label="JBrowse style.color"
       token_name="style_color"
@@ -97,6 +106,22 @@
         <option value="Spectral">Spectral</option>
     </param>
   </xml>
+  <xml name="general_options">
+    <section name="jbgen" title="General JBrowse Options [Advanced]" expanded="false">
+      <param label="Default Location" type="text" name="defaultLocation" value="" help="Initial location to be shown for users who have never visited the browser before. Example: 'ctgA:1234..5678'"/>
+      <param label="Track Padding" type="integer" value="20" name="trackPadding" help="Spacing between tracks in the genome view, in pixels." />
+
+      <param label="Enable Share Link" name="shareLink" type="boolean" checked="true" truevalue="true" falsevalue="false" />
+      <param label="About the Browser" type="text" name="aboutDescription" value="" help="Description of the browser to be used in the 'About' popup" />
+
+      <param label="Show Track List" name="show_tracklist" type="boolean" checked="true" truevalue="true" falsevalue="false" help="Optionally hide the track list"/>
+      <param label="Show Navigation" name="show_nav"       type="boolean" checked="true" truevalue="true" falsevalue="false" help="Optionally hide the navigation menu"/>
+      <param label="Show Overview"   name="show_overview"  type="boolean" checked="true" truevalue="true" falsevalue="false" help="Optionally hide the overview bar"/>
+      <param label="Show Menu"       name="show_menu"      type="boolean" checked="true" truevalue="true" falsevalue="false" help="Optionally hide the menu bar"/>
+
+      <param label="Hide Genome Options" name="hideGenomeOptions" type="boolean" truevalue="true" falsevalue="false" help="Hide options for opening a sequence file"/>
+    </section>
+  </xml>
   <xml name="color_selection_minmax">
     <section name="jbcolor" title="JBrowse Color Options [Advanced]" expanded="false">
       <!-- Abuse auto/manual for bicolor pivot. Means we'll have to handle the