diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-content/plugins/option-tree/includes/ot-functions-compat.php
--- a/wp/wp-content/plugins/option-tree/includes/ot-functions-compat.php	Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-content/plugins/option-tree/includes/ot-functions-compat.php	Tue Jun 09 03:35:32 2015 +0200
@@ -75,20 +75,20 @@
     $has_layout = isset( $layout_file ) ? true : false;
     
     /* auto import XML file */
-    if ( $has_xml == true && ! get_option( 'option_tree_settings' ) && class_exists( 'SimpleXMLElement' ) ) {
+    if ( $has_xml == true && ! get_option( ot_settings_id() ) && class_exists( 'SimpleXMLElement' ) ) {
     
       $settings = ot_import_xml( $xml_file );
       
       if ( isset( $settings ) && ! empty( $settings ) ) {
         
-        update_option( 'option_tree_settings', $settings );
+        update_option( ot_settings_id(), $settings );
         
       }
       
     }
     
     /* auto import Data file */
-    if ( $has_data == true && ! get_option( 'option_tree' ) ) {
+    if ( $has_data == true && ! get_option( ot_options_id() ) ) {
       
       $get_data = wp_remote_get( $data_file );
       
@@ -99,7 +99,7 @@
       $options = unserialize( ot_decode( $rawdata ) );
       
       /* get settings array */
-      $settings = get_option( 'option_tree_settings' );
+      $settings = get_option( ot_settings_id() );
       
       /* has options */
       if ( is_array( $options ) ) {
@@ -122,14 +122,14 @@
         }
         
         /* update the option tree array */
-        update_option( 'option_tree', $options );
+        update_option( ot_options_id(), $options );
         
       }
       
     }
     
     /* auto import Layout file */
-    if ( $has_layout == true && ! get_option( 'option_tree_layouts' ) ) {
+    if ( $has_layout == true && ! get_option( ot_layouts_id() ) ) {
     
       $get_data = wp_remote_get( $layout_file );
       
@@ -140,7 +140,7 @@
       $layouts = unserialize( ot_decode( $rawdata ) );
       
       /* get settings array */
-      $settings = get_option( 'option_tree_settings' );
+      $settings = get_option( ot_settings_id() );
       
       /* has layouts */
       if ( is_array( $layouts ) ) {
@@ -176,12 +176,12 @@
         /* update the option tree array */
         if ( isset( $layouts['active_layout'] ) ) {
         
-          update_option( 'option_tree', unserialize( ot_decode( $layouts[$layouts['active_layout']] ) ) );
+          update_option( ot_options_id(), unserialize( ot_decode( $layouts[$layouts['active_layout']] ) ) );
           
         }
         
         /* update the option tree layouts array */
-        update_option( 'option_tree_layouts', $layouts );
+        update_option( ot_layouts_id(), $layouts );
         
       }