diff --git a/panopoly_wysiwyg.features.defaultconfig.inc b/panopoly_wysiwyg.features.defaultconfig.inc
index 6696f7d..6b5b87c 100644
--- a/panopoly_wysiwyg.features.defaultconfig.inc
+++ b/panopoly_wysiwyg.features.defaultconfig.inc
@@ -21,7 +21,7 @@ function panopoly_wysiwyg_defaultconfig_features() {
 function panopoly_wysiwyg_defaultconfig_user_default_permissions() {
   $permissions = array();
 
-  // Exported permission: use text format panopoly_html_text.
+  // Exported permission: 'use text format panopoly_html_text'.
   $permissions['use text format panopoly_html_text'] = array(
     'name' => 'use text format panopoly_html_text',
     'roles' => array(
@@ -31,7 +31,7 @@ function panopoly_wysiwyg_defaultconfig_user_default_permissions() {
     'module' => 'filter',
   );
 
-  // Exported permission: use text format panopoly_wysiwyg_text.
+  // Exported permission: 'use text format panopoly_wysiwyg_text'.
   $permissions['use text format panopoly_wysiwyg_text'] = array(
     'name' => 'use text format panopoly_wysiwyg_text',
     'roles' => array(
diff --git a/panopoly_wysiwyg.features.inc b/panopoly_wysiwyg.features.inc
index 5c74da6..c0aa04d 100644
--- a/panopoly_wysiwyg.features.inc
+++ b/panopoly_wysiwyg.features.inc
@@ -7,12 +7,10 @@
 /**
  * Implements hook_ctools_plugin_api().
  */
-function panopoly_wysiwyg_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
+function panopoly_wysiwyg_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "linkit" && $api == "linkit_profiles") {
     return array("version" => "1");
   }
-  list($module, $api) = func_get_args();
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
diff --git a/panopoly_wysiwyg.features.wysiwyg.inc b/panopoly_wysiwyg.features.wysiwyg.inc
index b3af3c6..a191275 100644
--- a/panopoly_wysiwyg.features.wysiwyg.inc
+++ b/panopoly_wysiwyg.features.wysiwyg.inc
@@ -48,74 +48,60 @@ function panopoly_wysiwyg_wysiwyg_default_profiles() {
   // Exported profile: panopoly_wysiwyg_text
   $profiles['panopoly_wysiwyg_text'] = array(
     'format' => 'panopoly_wysiwyg_text',
-    'editor' => 'tinymce',
+    'editor' => 'ckeditor',
     'settings' => array(
       'default' => 1,
       'user_choose' => 0,
       'show_toggle' => 0,
-      'theme' => 'advanced',
+      'theme' => '',
       'language' => 'en',
       'buttons' => array(
         'default' => array(
-          'bold' => 1,
-          'italic' => 1,
-          'underline' => 1,
-          'strikethrough' => 1,
-          'justifyleft' => 1,
-          'justifycenter' => 1,
-          'justifyright' => 1,
-          'justifyfull' => 1,
-          'bullist' => 1,
-          'numlist' => 1,
-          'outdent' => 1,
-          'indent' => 1,
-          'undo' => 1,
-          'redo' => 1,
-          'unlink' => 1,
-          'formatselect' => 1,
-          'forecolor' => 1,
-          'blockquote' => 1,
-          'removeformat' => 1,
-          'charmap' => 1,
-        ),
-        'fullscreen' => array(
-          'fullscreen' => 1,
-        ),
-        'paste' => array(
-          'pastetext' => 1,
-          'pasteword' => 1,
+          'Bold' => 1,
+          'Italic' => 1,
+          'Underline' => 1,
+          'Strike' => 1,
+          'JustifyLeft' => 1,
+          'JustifyCenter' => 1,
+          'JustifyRight' => 1,
+          'JustifyBlock' => 1,
+          'BulletedList' => 1,
+          'NumberedList' => 1,
+          'Outdent' => 1,
+          'Indent' => 1,
+          'Undo' => 1,
+          'Redo' => 1,
+          'Unlink' => 1,
+          'TextColor' => 1,
+          'Blockquote' => 1,
+          'PasteText' => 1,
+          'PasteFromWord' => 1,
+          'RemoveFormat' => 1,
+          'SpecialChar' => 1,
+          'Format' => 1,
+          'SpellChecker' => 1,
+          'Scayt' => 1,
         ),
         'linkit' => array(
           'linkit' => 1,
         ),
-        'pdw' => array(
-          'pdw_toggle' => 1,
-        ),
-        'spellchecker' => array(
-          'spellchecker' => 1,
-        ),
-        'captionfilter' => array(
-          'captionfilter' => 1,
-        ),
         'drupal' => array(
           'media' => 1,
           'break' => 1,
         ),
       ),
-      'toolbar_loc' => 'top',
-      'toolbar_align' => 'left',
-      'path_loc' => 'bottom',
-      'resizing' => 1,
-      'verify_html' => 1,
-      'preformatted' => 0,
-      'convert_fonts_to_spans' => 1,
-      'remove_linebreaks' => 1,
-      'apply_source_formatting' => 0,
-      'paste_auto_cleanup_on_paste' => 1,
-      'block_formats' => 'h1,h2,h3,h4,h5,h6',
+      'toolbarLocation' => 'top',
+      'resize_enabled' => 1,
+      'default_toolbar_grouping' => 1,
+      'simple_source_formatting' => 0,
+      'acf_mode' => 0,
+      'acf_allowed_content' => '',
       'css_setting' => 'theme',
       'css_path' => '',
-      'css_classes' => '',
+      'stylesSet' => '',
+      'block_formats' => 'h1,h2,h3,h4,h5,h6',
+      'advanced__active_tab' => 'edit-paste',
+      'forcePasteAsPlainText' => 0,
     ),
   );
 
diff --git a/panopoly_wysiwyg.info b/panopoly_wysiwyg.info
index 14f395e..280a82c 100644
--- a/panopoly_wysiwyg.info
+++ b/panopoly_wysiwyg.info
@@ -2,12 +2,12 @@ name = Panopoly WYSIWYG
 description = Integrates a WYSIWYG into Drupal.
 core = 7.x
 package = Panopoly
-php = 5.2.4
 project = panopoly_wysiwyg
 dependencies[] = caption_filter
 dependencies[] = ctools
 dependencies[] = defaultconfig
 dependencies[] = features
+dependencies[] = filter
 dependencies[] = image_resize_filter
 dependencies[] = linkit
 dependencies[] = media
diff --git a/panopoly_wysiwyg.make b/panopoly_wysiwyg.make
index b843f38..2805924 100644
--- a/panopoly_wysiwyg.make
+++ b/panopoly_wysiwyg.make
@@ -5,11 +5,15 @@ core = 7.x
 
 ; The WYSIWYG Module Family
 
+projects[wysiwyg][version] = 2.x-dev
 projects[wysiwyg][subdir] = contrib
-projects[wysiwyg][version] = 2.2
-projects[wysiwyg][patch][1489096] = http://drupal.org/files/wysiwyg-table-format.patch
+projects[wysiwyg][download][type] = git
+projects[wysiwyg][download][revision] = e4a4d9d
+projects[wysiwyg][download][branch] = 7.x-2.x
+projects[wysiwyg][patch][1489096] = http://drupal.org/files/wysiwyg-table-format-1489096-7.patch
 projects[wysiwyg][patch][1786732] = http://drupal.org/files/wysiwyg-arbitrary_image_paths_markitup-1786732-3.patch
-projects[wysiwyg][patch][1802394] = http://drupal.org/files/wysiwyg-1802394-4.patch
+projects[wysiwyg][patch][1338956] = http://drupal.org/files/wysiwyg-html5-required-1338956-11.patch
+projects[wysiwyg][patch][1757684] = http://drupal.org/files/wysiwyg-ajax-error-1757684-13.patch
 
 projects[wysiwyg_filter][version] = 1.6-rc2
 projects[wysiwyg_filter][subdir] = contrib
@@ -34,6 +38,9 @@ libraries[tinymce][download][type] = get
 libraries[tinymce][download][url] = https://github.com/downloads/tinymce/tinymce/tinymce_3.5.8.zip
 libraries[tinymce][patch][1561882] = http://drupal.org/files/1561882-cirkuit-theme-tinymce-3.5.8.patch
 
+libraries[ckeditor][download][type] = get
+libraries[ckeditor][download][url] = http://download.cksource.com/CKEditor%20for%20Drupal/edit/ckeditor_4.3.2_edit.zip
+ 
 libraries[markitup][download][type] = get
 libraries[markitup][download][url] = https://github.com/markitup/1.x/tarball/master
 libraries[markitup][patch][1715642] = http://drupal.org/files/1715642-adding-html-set-markitup-editor.patch