diff --git a/config/reports.ini.sample b/config/reports.ini.sample
index 60371e7272a1..1b9a28a150b1 100644
--- a/config/reports.ini.sample
+++ b/config/reports.ini.sample
@@ -20,7 +20,7 @@ threadpool_workers = 10
 use = egg:PasteDeploy#prefix
 prefix = /reports
 
-# ---- Galaxy Webapps Report Interface -------------------------------------------------
+# ---- Galaxy Reports  ------------------------------------------------------
 
 [app:main]
 
@@ -37,8 +37,6 @@ prefix = /reports
 # cookie so the cookies from each instance will not clobber each other.
 #cookie_path = None
 
-# -- Report 
-
 # Specifies the factory for the universe WSGI application
 paste.app_factory = galaxy.webapps.reports.buildapp:app_factory
 log_level = DEBUG
@@ -46,7 +44,7 @@ log_level = DEBUG
 # Database connection
 # Galaxy reports are intended for production Galaxy instances, so sqlite is not supported.
 # You may use a SQLAlchemy connection string to specify an external database.
-# database_connection = postgres:///galaxy_test?user=postgres&password=postgres 
+#database_connection = postgres:///galaxy_test?user=postgres&password=postgres
 
 # Where dataset files are saved
 #file_path = database/files
@@ -65,27 +63,23 @@ session_key = galaxysessions
 session_secret = changethisinproduction
 
 # Configuration for debugging middleware
-# debug = true
-use_lint = false
+#debug = False
 
-# NEVER enable this on a public site (even test or QA)
-# use_interactive = true
+# Check for WSGI compliance.
+#use_lint = False
 
-# Address to join mailing list
-mailing_join_addr = galaxy-user-join@bx.psu.edu
+# NEVER enable this on a public site (even test or QA)
+#use_interactive = true
 
 # Write thread status periodically to 'heartbeat.log' (careful, uses disk space rapidly!)
-## use_heartbeat = True
+#use_heartbeat = True
 
 # Profiling middleware (cProfile based)
-## use_profile = True
+#use_profile = True
 
 # Mail
-# smtp_server = yourserver@yourfacility.edu
-# error_email_to = your_bugs@bx.psu.edu
-
-# Use the new iframe / javascript based layout
-use_new_layout = true
+#smtp_server = yourserver@yourfacility.edu
+#error_email_to = your_bugs@bx.psu.edu
 
 # Serving static files (needed if running standalone)
 # static_enabled = True
@@ -95,3 +89,6 @@ use_new_layout = true
 # static_favicon_dir = %(here)s/static/favicon.ico
 # static_scripts_dir = %(here)s/static/scripts/
 # static_style_dir = %(here)s/static/june_2007_style/blue
+
+# Sentry (getsentry.com) DSN for catching bugs.
+#sentry_dsn = None
diff --git a/config/tool_shed.ini.sample b/config/tool_shed.ini.sample
index c3531bd85ab0..6aa106955379 100644
--- a/config/tool_shed.ini.sample
+++ b/config/tool_shed.ini.sample
@@ -54,7 +54,7 @@ new_file_path = database/tmp
 # - $locale (complete format string for the server locale),
 # - $iso8601 (complete format string as specified by ISO 8601 international
 #   standard).
-# pretty_datetime_format = $locale (UTC)
+#pretty_datetime_format = $locale (UTC)
 
 # Session support (beaker)
 use_beaker_session = True
@@ -118,17 +118,22 @@ id_secret = changethisinproductiontoo
 #remote_user_secret = changethisinproductiontoo
 
 # Configuration for debugging middleware
-debug = true
-use_lint = false
+#debug = False
+
+# Check for WSGI compliance.
+#use_lint = False
+
+# Intercept print statements and show them on the returned page.
+#use_printdebug = True
 
 # NEVER enable this on a public site (even test or QA)
-# use_interactive = true
+#use_interactive = true
 
 # this should be a comma-separated list of valid Galaxy users
 #admin_users = user1@example.org,user2@example.org
 
 # Force everyone to log in (disable anonymous access)
-require_login = False
+#require_login = False
 
 # For use by email messages sent from the tool shed
 #smtp_server = smtp.your_tool_shed_server
@@ -141,12 +146,14 @@ require_login = False
 #smtp_password = None
 
 # If your SMTP server requires SSL from the beginning of the connection
-# smtp_ssl = False
-
+#smtp_ssl = False
 
 # The URL linked by the "Support" link in the "Help" menu.
 #support_url = https://wiki.galaxyproject.org/Support
 
+# Address to join mailing list
+#mailing_join_addr = galaxy-announce-join@bx.psu.edu
+
 # Write thread status periodically to 'heartbeat.log' (careful, uses disk
 #  space rapidly!)
 #use_heartbeat = True
@@ -157,9 +164,6 @@ require_login = False
 # Enable creation of Galaxy flavor Docker Image
 #enable_galaxy_flavor_docker_image = False
 
-# Use the new iframe / javascript based layout
-use_new_layout = true
-
 # Show a message box under the masthead.
 #message_box_visible = False
 #message_box_content = None