diff --git a/editors/css/tinymce-3.css b/editors/css/tinymce-3.css
index 5d0ebe94..cc006717 100644
--- a/editors/css/tinymce-3.css
+++ b/editors/css/tinymce-3.css
@@ -22,3 +22,5 @@ table.mceLayout {
   float: left;
   margin-bottom: 1px;
 }
+.o2k7Skin .mceToolbar .mceToolbarStart span {float: left;}  
+.o2k7Skin .mceToolbar .mceToolbarEnd span {float: left;}
\ No newline at end of file
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index a7250f35..3be6a459 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -145,7 +145,10 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
     'document_base_url' => base_path(),
     'mode' => 'none',
     'plugins' => array(),
-    'theme' => $theme,
+    #'theme' => $theme,
+	   'theme' => 'advanced',  
+			'skin' => 'o2k7',  
+			'skin_variant' => "silver",
     'width' => '100%',
     // Strict loading mode must be enabled; otherwise TinyMCE would use
     // document.write() in IE and Chrome.
diff --git a/wysiwyg.features.inc b/wysiwyg.features.inc
new file mode 100644
index 00000000..5edd6421
--- /dev/null
+++ b/wysiwyg.features.inc
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * Implements hook_features_export_options().
+ */
+function wysiwyg_features_export_options() {
+  $profiles = array();
+
+  // Get human-readable name from filter module.
+  $formats = filter_formats();
+
+  foreach (array_keys(wysiwyg_profile_load_all()) as $format) {
+    // Text format may vanish without deleting the wysiwyg profile.
+    if (isset($formats[$format])) {
+      $profiles[$format] = $formats[$format]->name;
+    }
+  }
+  return $profiles;
+}
+
+/**
+ * Implements hook_features_export().
+ */
+function wysiwyg_features_export($data, &$export, $module_name = '') {
+  $pipe = array();
+
+  // The wysiwyg_default_formats() hook integration is provided by the
+  // features module so we need to add it as a dependency.
+  $export['dependencies']['features'] = 'features';
+  $export['dependencies']['wysiwyg'] = 'wysiwyg';
+
+  foreach ($data as $name) {
+    if ($profile = wysiwyg_get_profile($name)) {
+      // Add profile to exports.
+      $export['features']['wysiwyg'][$profile->format] = $profile->format;
+
+      // Chain filter format for export.
+      $pipe['filter'][] = $profile->format;
+    }
+  }
+
+  return $pipe;
+}
+
+/**
+ * Implements hook_features_export_render().
+ */
+function wysiwyg_features_export_render($module, $data, $export = NULL) {
+  $code = array();
+  $code[] = '  $profiles = array();';
+  $code[] = '';
+
+  foreach ($data as $name) {
+    if ($profile = wysiwyg_get_profile($name)) {
+      $profile_export = features_var_export($profile, '  ');
+      $profile_identifier = features_var_export($profile->format);
+      $code[] = "  // Exported profile: {$profile->format}";
+      $code[] = "  \$profiles[{$profile_identifier}] = {$profile_export};";
+      $code[] = "";
+    }
+  }
+
+  $code[] = '  return $profiles;';
+  $code = implode("\n", $code);
+  return array('wysiwyg_default_profiles' => $code);
+}
+
+/**
+ * Implements hook_features_revert().
+ */
+function wysiwyg_features_revert($module) {
+  return wysiwyg_features_rebuild($module);
+}
+
+/**
+ * Implements hook_features_rebuild().
+ */
+function wysiwyg_features_rebuild($module) {
+  if ($defaults = features_get_default('wysiwyg', $module)) {
+    foreach ($defaults as $profile) {
+      db_merge('wysiwyg')
+        ->key(array('format' => $profile['format']))
+        ->fields(array(
+          'editor' => $profile['editor'],
+          'settings' => serialize($profile['settings']),
+        ))
+        ->execute();
+    }
+    wysiwyg_profile_cache_clear();
+  }
+}
+