diff --git a/drupal-org.make b/drupal-org.make
index a91c607..f547c3f 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -59,6 +59,14 @@ projects[breakpoints][type] = "module"
 projects[breakpoints][subdir] = "contrib"
 projects[breakpoints][version] = "1.1"
 
+projects[picture][type] = "module"
+projects[picture][subdir] = "contrib"
+projects[picture][version] = "1.2"
+
+projects[smartcrop][type] = "module"
+projects[smartcrop][subdir] = "contrib"
+projects[smartcrop][version] = "1.0-beta2"
+
 projects[connector][type] = "module"
 projects[connector][subdir] = "contrib"
 projects[connector][version] = "1.0-beta2"
diff --git a/modules/commons/commons_images/commons_images.default_breakpoint_group.inc b/modules/commons/commons_images/commons_images.default_breakpoint_group.inc
new file mode 100644
index 0000000..6628397
--- /dev/null
+++ b/modules/commons/commons_images/commons_images.default_breakpoint_group.inc
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @file
+ * commons_images.default_breakpoint_group.inc
+ */
+
+/**
+ * Implements hook_default_breakpoint_group().
+ */
+function commons_images_default_breakpoint_group() {
+  $export = array();
+
+  // Breakpoints.
+  $breakpoints = array();
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons small portrait';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons small landscape';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons medium portrait';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons medium landscape';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons large';
+
+  // Breakpoint group.
+  $breakpoint_group = new stdClass();
+  $breakpoint_group->disabled = FALSE; /* Edit this to true to make a default breakpoint_group disabled initially */
+  $breakpoint_group->api_version = 1;
+  $breakpoint_group->machine_name = 'commons_content';
+  $breakpoint_group->name = 'Commons content';
+  $breakpoint_group->breakpoints = $breakpoints;
+  $breakpoint_group->type = 'custom';
+  $breakpoint_group->overridden = 0;
+  $export['commons_content'] = $breakpoint_group;
+
+  // Breakpoints.
+  $breakpoints = array();
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons small portrait';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons small landscape';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons medium portrait';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons medium landscape';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons large';
+
+  // Breakpoint group.
+  $breakpoint_group = new stdClass();
+  $breakpoint_group->disabled = FALSE; /* Edit this to true to make a default breakpoint_group disabled initially */
+  $breakpoint_group->api_version = 1;
+  $breakpoint_group->machine_name = 'commons_full_width';
+  $breakpoint_group->name = 'Commons full width';
+  $breakpoint_group->breakpoints = $breakpoints;
+  $breakpoint_group->type = 'custom';
+  $breakpoint_group->overridden = 0;
+  $export['commons_full_width'] = $breakpoint_group;
+
+  // Breakpoints.
+  $breakpoints = array();
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons small portrait';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons small landscape';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons medium portrait';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons medium landscape';
+  $breakpoints[] = 'breakpoints.theme.commons_origins.commons large';
+
+  // Breakpoint group.
+  $breakpoint_group = new stdClass();
+  $breakpoint_group->disabled = FALSE; /* Edit this to true to make a default breakpoint_group disabled initially */
+  $breakpoint_group->api_version = 1;
+  $breakpoint_group->machine_name = 'commons_thumbnail_preview';
+  $breakpoint_group->name = 'Commons thumbnail preview';
+  $breakpoint_group->breakpoints = $breakpoints;
+  $breakpoint_group->type = 'custom';
+  $breakpoint_group->overridden = 0;
+  $export['commons_thumbnail_preview'] = $breakpoint_group;
+
+  return $export;
+}
diff --git a/modules/commons/commons_images/commons_images.default_picture_mapping.inc b/modules/commons/commons_images/commons_images.default_picture_mapping.inc
new file mode 100644
index 0000000..5c8b59c
--- /dev/null
+++ b/modules/commons/commons_images/commons_images.default_picture_mapping.inc
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @file
+ * commons_images.default_picture_mapping.inc
+ */
+
+/**
+ * Implements hook_default_picture_mapping().
+ */
+function commons_images_default_picture_mapping() {
+  $export = array();
+
+  $picture_mapping = new stdClass();
+  $picture_mapping->disabled = FALSE; /* Edit this to true to make a default picture_mapping disabled initially */
+  $picture_mapping->api_version = 1;
+  $picture_mapping->machine_name = 'commons_content';
+  $picture_mapping->breakpoint_group = 'commons_content';
+  $picture_mapping->mapping = array(
+    'breakpoints.theme.commons_origins.commons small portrait' => array(
+      '1x' => 'commons-preview',
+      '1.5x' => 'commons-preview-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons small landscape' => array(
+      '1x' => 'commons-preview',
+      '1.5x' => 'commons-preview-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons medium portrait' => array(
+      '1x' => 'commons-preview-medium',
+      '1.5x' => 'commons-preview-medium-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons medium landscape' => array(
+      '1x' => 'commons-preview-medium',
+      '1.5x' => 'commons-preview-medium-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons large' => array(
+      '1x' => 'commons-preview-medium',
+      '1.5x' => 'commons-preview-medium-1_5x',
+    ),
+  );
+  $export['commons_content'] = $picture_mapping;
+
+  $picture_mapping = new stdClass();
+  $picture_mapping->disabled = FALSE; /* Edit this to true to make a default picture_mapping disabled initially */
+  $picture_mapping->api_version = 1;
+  $picture_mapping->machine_name = 'commons_full_width';
+  $picture_mapping->breakpoint_group = 'commons_full_width';
+  $picture_mapping->mapping = array(
+    'breakpoints.theme.commons_origins.commons small portrait' => array(
+      '1x' => 'commons-preview',
+      '1.5x' => 'commons-preview-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons small landscape' => array(
+      '1x' => 'commons-preview',
+      '1.5x' => 'commons-preview-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons medium portrait' => array(
+      '1x' => 'commons-medium',
+      '1.5x' => 'commons-medium-1_5',
+    ),
+    'breakpoints.theme.commons_origins.commons medium landscape' => array(
+      '1x' => 'commons-medium',
+      '1.5x' => 'commons-medium-1_5',
+    ),
+    'breakpoints.theme.commons_origins.commons large' => array(
+      '1x' => 'commons-large',
+      '1.5x' => 'commons-large-1_5x',
+    ),
+  );
+  $export['commons_full_width'] = $picture_mapping;
+
+  $picture_mapping = new stdClass();
+  $picture_mapping->disabled = FALSE; /* Edit this to true to make a default picture_mapping disabled initially */
+  $picture_mapping->api_version = 1;
+  $picture_mapping->machine_name = 'commons_thumbnail_preview';
+  $picture_mapping->breakpoint_group = 'commons_thumbnail_preview';
+  $picture_mapping->mapping = array(
+    'breakpoints.theme.commons_origins.commons small portrait' => array(
+      '1x' => 'commons-thumbnail',
+      '1.5x' => 'commons-thumbnail-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons small landscape' => array(
+      '1x' => 'commons-thumbnail',
+      '1.5x' => 'commons-thumbnail-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons medium portrait' => array(
+      '1x' => 'commons-thumbnail-medium',
+      '1.5x' => 'commons-thumbnail-medium-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons medium landscape' => array(
+      '1x' => 'commons-thumbnail-medium',
+      '1.5x' => 'commons-thumbnail-medium-1_5x',
+    ),
+    'breakpoints.theme.commons_origins.commons large' => array(
+      '1x' => 'commons-thumbnail-large',
+      '1.5x' => 'commons-thumbnail-large-1_5x',
+    ),
+  );
+  $export['commons_thumbnail_preview'] = $picture_mapping;
+
+  return $export;
+}
diff --git a/modules/commons/commons_images/commons_images.features.inc b/modules/commons/commons_images/commons_images.features.inc
new file mode 100644
index 0000000..882849d
--- /dev/null
+++ b/modules/commons/commons_images/commons_images.features.inc
@@ -0,0 +1,356 @@
+<?php
+/**
+ * @file
+ * commons_images.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function commons_images_ctools_plugin_api($module = NULL, $api = NULL) {
+  if ($module == "breakpoints" && $api == "default_breakpoint_group") {
+    return array("version" => "1");
+  }
+  if ($module == "picture" && $api == "default_picture_mapping") {
+    return array("version" => "1");
+  }
+}
+
+/**
+ * Implements hook_image_default_styles().
+ */
+function commons_images_image_default_styles() {
+  $styles = array();
+
+  // Exported image style: commons-large.
+  $styles['commons-large'] = array(
+    'name' => 'commons-large',
+    'label' => 'Commons large',
+    'effects' => array(
+      22 => array(
+        'label' => 'Scale',
+        'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
+        'effect callback' => 'image_scale_effect',
+        'dimensions callback' => 'image_scale_dimensions',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'image',
+        'name' => 'image_scale',
+        'data' => array(
+          'width' => 916,
+          'height' => '',
+          'upscale' => 0,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-large-1_5x.
+  $styles['commons-large-1_5x'] = array(
+    'name' => 'commons-large-1_5x',
+    'label' => 'Commons large 1.5x',
+    'effects' => array(
+      23 => array(
+        'label' => 'Scale',
+        'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
+        'effect callback' => 'image_scale_effect',
+        'dimensions callback' => 'image_scale_dimensions',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'image',
+        'name' => 'image_scale',
+        'data' => array(
+          'width' => 1374,
+          'height' => '',
+          'upscale' => 0,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-medium.
+  $styles['commons-medium'] = array(
+    'name' => 'commons-medium',
+    'label' => 'Commons medium',
+    'effects' => array(
+      24 => array(
+        'label' => 'Scale',
+        'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
+        'effect callback' => 'image_scale_effect',
+        'dimensions callback' => 'image_scale_dimensions',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'image',
+        'name' => 'image_scale',
+        'data' => array(
+          'width' => 768,
+          'height' => '',
+          'upscale' => 0,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-medium-1_5.
+  $styles['commons-medium-1_5'] = array(
+    'name' => 'commons-medium-1_5',
+    'label' => 'Commons medium 1.5',
+    'effects' => array(
+      25 => array(
+        'label' => 'Scale',
+        'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
+        'effect callback' => 'image_scale_effect',
+        'dimensions callback' => 'image_scale_dimensions',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'image',
+        'name' => 'image_scale',
+        'data' => array(
+          'width' => 1152,
+          'height' => '',
+          'upscale' => 0,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-preview.
+  $styles['commons-preview'] = array(
+    'name' => 'commons-preview',
+    'label' => 'Commons preview',
+    'effects' => array(
+      20 => array(
+        'label' => 'Scale',
+        'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
+        'effect callback' => 'image_scale_effect',
+        'dimensions callback' => 'image_scale_dimensions',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'image',
+        'name' => 'image_scale',
+        'data' => array(
+          'width' => 456,
+          'height' => 500,
+          'upscale' => 0,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-preview-1_5x.
+  $styles['commons-preview-1_5x'] = array(
+    'name' => 'commons-preview-1_5x',
+    'label' => 'Commons preview 1.5x',
+    'effects' => array(
+      21 => array(
+        'label' => 'Scale',
+        'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
+        'effect callback' => 'image_scale_effect',
+        'dimensions callback' => 'image_scale_dimensions',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'image',
+        'name' => 'image_scale',
+        'data' => array(
+          'width' => 684,
+          'height' => 750,
+          'upscale' => 0,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-preview-medium.
+  $styles['commons-preview-medium'] = array(
+    'name' => 'commons-preview-medium',
+    'label' => 'Commons preview medium',
+    'effects' => array(
+      18 => array(
+        'label' => 'Scale',
+        'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
+        'effect callback' => 'image_scale_effect',
+        'dimensions callback' => 'image_scale_dimensions',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'image',
+        'name' => 'image_scale',
+        'data' => array(
+          'width' => 536,
+          'height' => 600,
+          'upscale' => 0,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-preview-medium-1_5x.
+  $styles['commons-preview-medium-1_5x'] = array(
+    'name' => 'commons-preview-medium-1_5x',
+    'label' => 'Commons preview medium 1.5x',
+    'effects' => array(
+      19 => array(
+        'label' => 'Scale',
+        'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
+        'effect callback' => 'image_scale_effect',
+        'dimensions callback' => 'image_scale_dimensions',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'image',
+        'name' => 'image_scale',
+        'data' => array(
+          'width' => 804,
+          'height' => 900,
+          'upscale' => 0,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-thumbnail.
+  $styles['commons-thumbnail'] = array(
+    'name' => 'commons-thumbnail',
+    'label' => 'Commons thumbnail',
+    'effects' => array(
+      12 => array(
+        'label' => 'Scale and Smart Crop',
+        'help' => 'Similar to "Scale And Crop", but preserves the portion of the image with the most entropy.',
+        'effect callback' => 'smartcrop_scale_effect',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'smartcrop',
+        'name' => 'smartcrop_scale_and_crop',
+        'data' => array(
+          'width' => 54,
+          'height' => 54,
+          'upscale' => 1,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-thumbnail-1_5x.
+  $styles['commons-thumbnail-1_5x'] = array(
+    'name' => 'commons-thumbnail-1_5x',
+    'label' => 'Commons thumbnail 1.5x',
+    'effects' => array(
+      13 => array(
+        'label' => 'Scale and Smart Crop',
+        'help' => 'Similar to "Scale And Crop", but preserves the portion of the image with the most entropy.',
+        'effect callback' => 'smartcrop_scale_effect',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'smartcrop',
+        'name' => 'smartcrop_scale_and_crop',
+        'data' => array(
+          'width' => 81,
+          'height' => 81,
+          'upscale' => 1,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-thumbnail-large.
+  $styles['commons-thumbnail-large'] = array(
+    'name' => 'commons-thumbnail-large',
+    'label' => 'Commons thumbnail large',
+    'effects' => array(
+      16 => array(
+        'label' => 'Scale and Smart Crop',
+        'help' => 'Similar to "Scale And Crop", but preserves the portion of the image with the most entropy.',
+        'effect callback' => 'smartcrop_scale_effect',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'smartcrop',
+        'name' => 'smartcrop_scale_and_crop',
+        'data' => array(
+          'width' => 124,
+          'height' => 124,
+          'upscale' => 1,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-thumbnail-large-1_5x.
+  $styles['commons-thumbnail-large-1_5x'] = array(
+    'name' => 'commons-thumbnail-large-1_5x',
+    'label' => 'Commons thumbnail large 1.5x',
+    'effects' => array(
+      17 => array(
+        'label' => 'Scale and Smart Crop',
+        'help' => 'Similar to "Scale And Crop", but preserves the portion of the image with the most entropy.',
+        'effect callback' => 'smartcrop_scale_effect',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'smartcrop',
+        'name' => 'smartcrop_scale_and_crop',
+        'data' => array(
+          'width' => 186,
+          'height' => 186,
+          'upscale' => 1,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-thumbnail-medium.
+  $styles['commons-thumbnail-medium'] = array(
+    'name' => 'commons-thumbnail-medium',
+    'label' => 'Commons thumbnail medium',
+    'effects' => array(
+      14 => array(
+        'label' => 'Scale and Smart Crop',
+        'help' => 'Similar to "Scale And Crop", but preserves the portion of the image with the most entropy.',
+        'effect callback' => 'smartcrop_scale_effect',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'smartcrop',
+        'name' => 'smartcrop_scale_and_crop',
+        'data' => array(
+          'width' => 72,
+          'height' => 72,
+          'upscale' => 1,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  // Exported image style: commons-thumbnail-medium-1_5x.
+  $styles['commons-thumbnail-medium-1_5x'] = array(
+    'name' => 'commons-thumbnail-medium-1_5x',
+    'label' => 'Commons thumbnail medium 1.5x',
+    'effects' => array(
+      15 => array(
+        'label' => 'Scale and Smart Crop',
+        'help' => 'Similar to "Scale And Crop", but preserves the portion of the image with the most entropy.',
+        'effect callback' => 'smartcrop_scale_effect',
+        'form callback' => 'image_scale_form',
+        'summary theme' => 'image_scale_summary',
+        'module' => 'smartcrop',
+        'name' => 'smartcrop_scale_and_crop',
+        'data' => array(
+          'width' => 108,
+          'height' => 108,
+          'upscale' => 1,
+        ),
+        'weight' => 1,
+      ),
+    ),
+  );
+
+  return $styles;
+}
diff --git a/modules/commons/commons_images/commons_images.info b/modules/commons/commons_images/commons_images.info
new file mode 100644
index 0000000..82ff443
--- /dev/null
+++ b/modules/commons/commons_images/commons_images.info
@@ -0,0 +1,33 @@
+name = Commons Images
+description = Image styles used in the Commons distribution
+core = 7.x
+package = Commons - Building blocks
+project = commons_images
+dependencies[] = breakpoints
+dependencies[] = ctools
+dependencies[] = image
+dependencies[] = picture
+dependencies[] = smartcrop
+features[breakpoint_group][] = commons_content
+features[breakpoint_group][] = commons_full_width
+features[breakpoint_group][] = commons_thumbnail_preview
+features[ctools][] = breakpoints:default_breakpoint_group:1
+features[ctools][] = picture:default_picture_mapping:1
+features[features_api][] = api:2
+features[image][] = commons-large
+features[image][] = commons-large-1_5x
+features[image][] = commons-medium
+features[image][] = commons-medium-1_5
+features[image][] = commons-preview
+features[image][] = commons-preview-1_5x
+features[image][] = commons-preview-medium
+features[image][] = commons-preview-medium-1_5x
+features[image][] = commons-thumbnail
+features[image][] = commons-thumbnail-1_5x
+features[image][] = commons-thumbnail-large
+features[image][] = commons-thumbnail-large-1_5x
+features[image][] = commons-thumbnail-medium
+features[image][] = commons-thumbnail-medium-1_5x
+features[picture_mapping][] = commons_content
+features[picture_mapping][] = commons_full_width
+features[picture_mapping][] = commons_thumbnail_preview
diff --git a/modules/commons/commons_images/commons_images.module b/modules/commons/commons_images/commons_images.module
new file mode 100644
index 0000000..bde9ea6
--- /dev/null
+++ b/modules/commons/commons_images/commons_images.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the Commons Images feature.
+ */
+
+include_once 'commons_images.features.inc';
diff --git a/modules/commons/commons_media/commons_media.features.inc b/modules/commons/commons_media/commons_media.features.inc
index b77b46f..5cf4b48 100644
--- a/modules/commons/commons_media/commons_media.features.inc
+++ b/modules/commons/commons_media/commons_media.features.inc
@@ -8,6 +8,9 @@
  * Implements hook_ctools_plugin_api().
  */
 function commons_media_ctools_plugin_api($module = NULL, $api = NULL) {
+  if ($module == "file_entity" && $api == "file_default_displays") {
+    return array("version" => "1");
+  }
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
diff --git a/modules/commons/commons_media/commons_media.file_default_displays.inc b/modules/commons/commons_media/commons_media.file_default_displays.inc
new file mode 100644
index 0000000..55c9c05
--- /dev/null
+++ b/modules/commons/commons_media/commons_media.file_default_displays.inc
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @file
+ * commons_media.file_default_displays.inc
+ */
+
+/**
+ * Implements hook_file_default_displays().
+ */
+function commons_media_file_default_displays() {
+  $export = array();
+
+  $file_display = new stdClass();
+  $file_display->api_version = 1;
+  $file_display->name = 'image__default__file_field_picture';
+  $file_display->weight = -46;
+  $file_display->status = TRUE;
+  $file_display->settings = array(
+    'picture_group' => 'commons_full_width',
+    'fallback_image_style' => 'commons-preview',
+    'image_link' => 'file',
+    'colorbox' => 'commons_full_width',
+  );
+  $export['image__default__file_field_picture'] = $file_display;
+
+  $file_display = new stdClass();
+  $file_display->api_version = 1;
+  $file_display->name = 'image__preview__file_field_picture';
+  $file_display->weight = -49;
+  $file_display->status = TRUE;
+  $file_display->settings = array(
+    'picture_group' => 'commons_content',
+    'fallback_image_style' => 'commons-preview',
+    'image_link' => 'content',
+    'colorbox' => 'commons_content',
+  );
+  $export['image__preview__file_field_picture'] = $file_display;
+
+  $file_display = new stdClass();
+  $file_display->api_version = 1;
+  $file_display->name = 'image__preview__oembed';
+  $file_display->weight = -50;
+  $file_display->status = TRUE;
+  $file_display->settings = array(
+    'width' => '',
+    'height' => '',
+    'wmode' => '',
+  );
+  $export['image__preview__oembed'] = $file_display;
+
+  $file_display = new stdClass();
+  $file_display->api_version = 1;
+  $file_display->name = 'image__teaser__file_field_picture';
+  $file_display->weight = -49;
+  $file_display->status = TRUE;
+  $file_display->settings = array(
+    'picture_group' => 'commons_thumbnail_preview',
+    'fallback_image_style' => 'commons-thumbnail',
+    'image_link' => '',
+    'colorbox' => 'commons_thumbnail_preview',
+  );
+  $export['image__teaser__file_field_picture'] = $file_display;
+
+  $file_display = new stdClass();
+  $file_display->api_version = 1;
+  $file_display->name = 'image__teaser__oembed_thumbnail';
+  $file_display->weight = -50;
+  $file_display->status = TRUE;
+  $file_display->settings = array(
+    'width' => '',
+    'height' => '',
+  );
+  $export['image__teaser__oembed_thumbnail'] = $file_display;
+
+  return $export;
+}
diff --git a/modules/commons/commons_media/commons_media.info b/modules/commons/commons_media/commons_media.info
index e5999ca..1f0c606 100644
--- a/modules/commons/commons_media/commons_media.info
+++ b/modules/commons/commons_media/commons_media.info
@@ -2,6 +2,7 @@ name = Commons Media
 description = Provides media handling capabilities.
 core = 7.x
 package = Commons - Building blocks
+dependencies[] = commons_images
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = file
@@ -10,9 +11,15 @@ dependencies[] = media
 dependencies[] = media_internet
 dependencies[] = oembed
 dependencies[] = strongarm
+features[ctools][] = file_entity:file_default_displays:1
 features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
 features[field_base][] = field_media
+features[file_display][] = image__default__file_field_picture
+features[file_display][] = image__preview__file_field_picture
+features[file_display][] = image__preview__oembed
+features[file_display][] = image__teaser__file_field_picture
+features[file_display][] = image__teaser__oembed_thumbnail
 features[user_permission][] = add media from remote sources
 features[user_permission][] = create files
 features[variable][] = media__dialog_theme
diff --git a/themes/commons/commons_origins/.gitignore b/themes/commons/commons_origins/.gitignore
index 6173eab..8b86ab2 100644
--- a/themes/commons/commons_origins/.gitignore
+++ b/themes/commons/commons_origins/.gitignore
@@ -1,2 +1,3 @@
 /.sass-cache/
+.bundle
 .DS_Store
diff --git a/themes/commons/commons_origins/Gemfile b/themes/commons/commons_origins/Gemfile
new file mode 100644
index 0000000..996b525
--- /dev/null
+++ b/themes/commons/commons_origins/Gemfile
@@ -0,0 +1,7 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+# gem "rails"
+gem 'sass'
+gem 'compass'
+gem 'oily_png'
diff --git a/themes/commons/commons_origins/Gemfile.lock b/themes/commons/commons_origins/Gemfile.lock
new file mode 100644
index 0000000..2f03b5a
--- /dev/null
+++ b/themes/commons/commons_origins/Gemfile.lock
@@ -0,0 +1,20 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    chunky_png (1.2.9)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    fssm (0.2.10)
+    oily_png (1.1.0)
+      chunky_png (~> 1.2.7)
+    sass (3.2.13)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  compass
+  oily_png
+  sass
diff --git a/themes/commons/commons_origins/commons_origins.info b/themes/commons/commons_origins/commons_origins.info
index 4532f7e..60b5fcd 100644
--- a/themes/commons/commons_origins/commons_origins.info
+++ b/themes/commons/commons_origins/commons_origins.info
@@ -56,6 +56,15 @@
   ; unset_css[sites/all/modules/foobar_module/foobar_module.css] = 1
 
 
+;-----------// Breakpoints
+
+  breakpoints[Commons small portrait] = only screen and (max-width:320px)
+  breakpoints[Commons small landscape] = only screen and (min-width:321px) and (max-width:480px)
+  breakpoints[Commons medium portrait] = only screen and (min-width:481px) and (max-width:768px)
+  breakpoints[Commons medium landscape] = only screen and (min-width:769px) and (max-width:934px
+  breakpoints[Commons large] = only screen and (min-width:935px)
+
+
 ;----------// Scripts
 
   scripts[] = scripts/modernizr.js