diff --git a/includes/page.php b/includes/page.php
index 202a2e79..2d233f86 100644
--- a/includes/page.php
+++ b/includes/page.php
@@ -50,7 +50,7 @@ function gin_preprocess_page(&$variables) {
   $variables['classes'][] = 'gin--horizontal-toolbar';
 
   // Node add or edit.
-  if (theme_get_setting('edit_form_sidebar', 'gin') || (arg(0) == 'node' && (arg(1) == 'add' || arg(2) == 'edit'))) {
+  if (gin_content_form_paths()) {
     $variables['classes'][] = 'gin--edit-form';
   }
 
diff --git a/template.php b/template.php
index 16cb57eb..90176f52 100644
--- a/template.php
+++ b/template.php
@@ -342,7 +342,7 @@ function gin_form_user_register_form_alter(&$form, &$form_state, $form_id) {
  * Helper function to convert an edit form to use the sidebar edit.
  */
 function _gin_convert_to_sidebar_edit_form(&$form) {
-  if (theme_get_setting('edit_form_sidebar', 'gin')) {
+  if (gin_content_form_paths()) {
     $first_key = '';
     $first_weight = 999;
     foreach (element_children($form) as $key) {
diff --git a/theme-settings.php b/theme-settings.php
index fa7f800c..aee1e19e 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -11,7 +11,7 @@
 $beta_label = ' <span class="gin-beta-flag">Beta</span>';
 $new_label = ' <span class="gin-new-flag">New</span>';
 
-if (module_exists('tonic')) {
+if (FALSE && module_exists('tonic')) {
   $form['tonic'] = [
     '#type' => 'container',
     '#attributes' => [