diff --git a/features/ns_form/ns_form.features.field.inc b/features/ns_form/ns_form.features.field.inc
index 80c024b..c6bf505 100644
--- a/features/ns_form/ns_form.features.field.inc
+++ b/features/ns_form/ns_form.features.field.inc
@@ -5,77 +5,154 @@
  */
 
 /**
- * Implements hook_defaultconfig_field_default_fields().
+ * Implements hook_field_default_fields().
  */
-function ns_form_defaultconfig_field_default_fields() {
+function ns_form_field_default_fields() {
   $fields = array();
 
-  // Exported field: 'node-ns_article-field_ns_form_ns_article_form'
-  $fields['node-ns_article-field_ns_form_ns_article_form'] = array(
+  // Exported field: 'node-ns_article-field_ns_article_ns_form'
+  $fields['node-ns_article-field_ns_article_ns_form'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_ns_form_ns_article_form',
-      'foreign keys' => array(
-        'nid' => array(
-          'columns' => array(
-            'nid' => 'nid',
+      'field_name' => 'field_ns_article_ns_form',
+      'foreign keys' => array(),
+      'indexes' => array(
+        'target_entity' => array(
+          0 => 'target_type',
+          1 => 'target_id',
+        ),
+      ),
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'base',
+        'handler_settings' => array(
+          'target_bundles' => array(
+            'ns_form' => 'ns_form',
           ),
-          'table' => 'node',
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
-      'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+      'translatable' => '0',
+      'type' => 'entityreference',
+    ),
+    'field_instance' => array(
+      'bundle' => 'ns_article',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 22,
+        ),
+        'search_index' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'search_result' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
         ),
       ),
-      'module' => 'node_reference',
+      'entity_type' => 'node',
+      'field_name' => 'field_ns_article_ns_form',
+      'label' => 'Forms',
+      'required' => 0,
       'settings' => array(
-        'referenceable_types' => array(
-          'ns_article' => 0,
-          'ns_ch_web_promo' => 0,
-          'ns_contributor' => 0,
-          'ns_fact' => 0,
-          'ns_form' => 'ns_form',
-          'poll' => 0,
-          'webform' => 0,
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'entityreference',
+        'settings' => array(
+          'match_operator' => 'CONTAINS',
+          'path' => '',
+          'references_dialog_add' => 1,
+          'references_dialog_edit' => 1,
+          'references_dialog_search' => 1,
+          'references_dialog_search_view' => '',
+          'size' => '60',
+        ),
+        'type' => 'entityreference_autocomplete',
+        'weight' => '13',
+      ),
+    ),
+  );
+
+  // Exported field: 'node-ns_page-field_ns_page_ns_form'
+  $fields['node-ns_page-field_ns_page_ns_form'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '-1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_ns_page_ns_form',
+      'foreign keys' => array(),
+      'indexes' => array(
+        'target_entity' => array(
+          0 => 'target_type',
+          1 => 'target_id',
         ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
+      ),
+      'module' => 'entityreference',
+      'settings' => array(
+        'handler' => 'base',
+        'handler_settings' => array(
+          'target_bundles' => array(
+            'ns_form' => 'ns_form',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
-      'translatable' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
-      'bundle' => 'ns_article',
+      'bundle' => 'ns_page',
       'default_value' => NULL,
       'deleted' => '0',
       'description' => '',
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '11',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 12,
         ),
         'search_index' => array(
-          'label' => 'hidden',
-          'module' => 'node_reference',
+          'label' => 'above',
           'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '8',
+          'type' => 'hidden',
+          'weight' => 0,
         ),
         'search_result' => array(
           'label' => 'above',
           'settings' => array(),
           'type' => 'hidden',
-          'weight' => '4',
+          'weight' => 0,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -85,31 +162,26 @@ function ns_form_defaultconfig_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_ns_form_ns_article_form',
+      'field_name' => 'field_ns_page_ns_form',
       'label' => 'Forms',
       'required' => 0,
       'settings' => array(
-        'crossclone' => array(
-          'couple_setting' => 0,
-          'coupling' => 0,
-          'delete_setting' => 0,
-        ),
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'node_reference',
+        'module' => 'entityreference',
         'settings' => array(
-          'autocomplete_match' => 'contains',
-          'autocomplete_path' => 'node_reference/autocomplete',
+          'match_operator' => 'CONTAINS',
+          'path' => '',
           'references_dialog_add' => 1,
           'references_dialog_edit' => 1,
           'references_dialog_search' => 1,
           'references_dialog_search_view' => '',
           'size' => '60',
         ),
-        'type' => 'node_reference_autocomplete',
-        'weight' => '10',
+        'type' => 'entityreference_autocomplete',
+        'weight' => '12',
       ),
     ),
   );
diff --git a/features/ns_form/ns_form.features.inc b/features/ns_form/ns_form.features.inc
index da2c345..ec1aac2 100644
--- a/features/ns_form/ns_form.features.inc
+++ b/features/ns_form/ns_form.features.inc
@@ -24,11 +24,11 @@ function ns_form_ctools_plugin_api() {
 function ns_form_node_info() {
   $items = array(
     'ns_form' => array(
-      'name' => t('Form'),
+      'name' => t('Formulär'),
       'base' => 'node_content',
       'description' => t('A form that can be attached to an article'),
       'has_title' => '1',
-      'title_label' => t('Title'),
+      'title_label' => t('Titel'),
       'help' => '',
     ),
   );
diff --git a/features/ns_form/ns_form.field_group.inc b/features/ns_form/ns_form.field_group.inc
index 777c511..dbe1fbc 100644
--- a/features/ns_form/ns_form.field_group.inc
+++ b/features/ns_form/ns_form.field_group.inc
@@ -22,19 +22,44 @@ function ns_form_field_group_info() {
   $field_group->data = array(
     'label' => 'Forms',
     'weight' => '9',
+    'children' => array(),
+    'format_type' => 'tab',
+    'format_settings' => array(
+      'formatter' => 'closed',
+      'instance_settings' => array(
+        'classes' => '',
+        'required_fields' => 1,
+      ),
+    ),
+  );
+  $export['group_ns_form|node|ns_article|form'] = $field_group;
+
+  $field_group = new stdClass;
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_ns_form|node|ns_page|form';
+  $field_group->group_name = 'group_ns_form';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'ns_page';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Forms',
+    'weight' => '14',
     'children' => array(
-      0 => 'field_ns_form_ns_article_form',
+      0 => 'field_ns_page_ns_form',
     ),
     'format_type' => 'tab',
     'format_settings' => array(
       'formatter' => 'closed',
       'instance_settings' => array(
+        'description' => '',
         'classes' => '',
         'required_fields' => 1,
       ),
     ),
   );
-  $export['group_ns_form|node|ns_article|form'] = $field_group;
+  $export['group_ns_form|node|ns_page|form'] = $field_group;
 
   return $export;
 }
diff --git a/features/ns_form/ns_form.info b/features/ns_form/ns_form.info
index 9d8d85d..05ea6ff 100644
--- a/features/ns_form/ns_form.info
+++ b/features/ns_form/ns_form.info
@@ -1,17 +1,19 @@
 core = "7.x"
+dependencies[] = "defaultconfig"
+dependencies[] = "entityreference"
 dependencies[] = "features"
 dependencies[] = "field_group"
-dependencies[] = "node_reference"
-dependencies[] = "ns_article"
 dependencies[] = "strongarm"
 dependencies[] = "webform"
-dependencies[] = "defaultconfig"
 description = "Adds the option to attach forms to articles"
 features[ctools][] = "field_group:field_group:1"
 features[ctools][] = "strongarm:strongarm:1"
+features[field][] = "node-ns_article-field_ns_article_ns_form"
+features[field][] = "node-ns_page-field_ns_page_ns_form"
 features[field_group][] = "group_ns_form|node|ns_article|form"
+features[field_group][] = "group_ns_form|node|ns_page|form"
 features[node][] = "ns_form"
-name = "Article Forms"
-nodestream_type = "extension"
-package = "Extensions"
+name = "Forms"
+nodestream_type = "content"
+package = "Content providers"
 php = "5.2.4"
diff --git a/features/ns_form/ns_form.module b/features/ns_form/ns_form.module
index d48329f..bf1e546 100644
--- a/features/ns_form/ns_form.module
+++ b/features/ns_form/ns_form.module
@@ -5,3 +5,25 @@
  */
 
 include_once('ns_form.features.inc');
+
+/**
+* Implements hook_defaultconfig_optionals().
+*/
+function ns_form_defaultconfig_optionals() {
+  $optionals = array();
+  if (module_exists('ns_article')) {
+    $optionals['field_default_fields']['node-ns_article-field_ns_article_ns_form'] = array(
+      'title' => t('Article forms'),
+      'description' => t('Attach form to articles.'),
+      'default' => FALSE,
+    );
+  }
+  if (module_exists('ns_page')) {
+    $optionals['field_default_fields']['node-ns_page-field_ns_page_ns_form'] = array(
+      'title' => t('Page forms'),
+      'description' => t('Attach form to pages.'),
+      'default' => FALSE,
+    );
+  }
+  return $optionals;
+}
\ No newline at end of file