diff --git a/controllers/front/BestSalesController.php b/controllers/front/BestSalesController.php
index e3d28d729..a894bf249 100644
--- a/controllers/front/BestSalesController.php
+++ b/controllers/front/BestSalesController.php
@@ -41,7 +41,7 @@ class BestSalesControllerCore extends FrontController
'products' => ProductSale::getBestSales($this->context->language->id, $this->p - 1, $this->n, $this->orderBy, $this->orderWay),
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
'nbProducts' => $nbProducts,
- 'homeSize' => Image::getSize('home')
+ 'homeSize' => Image::getSize('home_default')
));
$this->setTemplate(_PS_THEME_DIR_.'best-sales.tpl');
diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php
index cb3156a50..ab8a7021b 100644
--- a/controllers/front/CategoryController.php
+++ b/controllers/front/CategoryController.php
@@ -100,10 +100,10 @@ class CategoryControllerCore extends FrontController
'return_category_name' => Tools::safeOutput($this->category->name),
'path' => Tools::getPath($this->category->id),
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
- 'categorySize' => Image::getSize('category'),
- 'mediumSize' => Image::getSize('medium'),
- 'thumbSceneSize' => Image::getSize('thumb_scene'),
- 'homeSize' => Image::getSize('home'),
+ 'categorySize' => Image::getSize('category_default'),
+ 'mediumSize' => Image::getSize('medium_default'),
+ 'thumbSceneSize' => Image::getSize('m_scene_default'),
+ 'homeSize' => Image::getSize('home_default'),
'allow_oosp' => (int)Configuration::get('PS_ORDER_OUT_OF_STOCK'),
'comparator_max_item' => (int)Configuration::get('PS_COMPARATOR_MAX_ITEM'),
'suppliers' => Supplier::getSuppliers()
@@ -127,9 +127,9 @@ class CategoryControllerCore extends FrontController
{
foreach ($sceneImageTypes as $sceneImageType)
{
- if ($sceneImageType['name'] == 'thumb_scene')
+ if ($sceneImageType['name'] == 'm_scene_default')
$thumbSceneImageType = $sceneImageType;
- elseif ($sceneImageType['name'] == 'large_scene')
+ elseif ($sceneImageType['name'] == 'scene_default')
$largeSceneImageType = $sceneImageType;
}
diff --git a/controllers/front/CompareController.php b/controllers/front/CompareController.php
index 23973cd70..86e09c748 100644
--- a/controllers/front/CompareController.php
+++ b/controllers/front/CompareController.php
@@ -146,7 +146,7 @@ class CompareControllerCore extends FrontController
'product_features' => $listFeatures,
'products' => $listProducts,
'width' => $width,
- 'homeSize' => Image::getSize('home')
+ 'homeSize' => Image::getSize('home_default')
));
$this->context->smarty->assign('HOOK_EXTRA_PRODUCT_COMPARISON', Hook::exec('displayProductComparison', array('list_ids_product' => $ids)));
}
diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php
index 5925d834f..10e20f92e 100644
--- a/controllers/front/ManufacturerController.php
+++ b/controllers/front/ManufacturerController.php
@@ -117,7 +117,7 @@ class ManufacturerControllerCore extends FrontController
$this->context->smarty->assign(array(
'pages_nb' => ceil($nbProducts / (int)($this->n)),
'nbManufacturers' => $nbProducts,
- 'mediumSize' => Image::getSize('medium'),
+ 'mediumSize' => Image::getSize('medium_default'),
'manufacturers' => $data,
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
));
diff --git a/controllers/front/NewProductsController.php b/controllers/front/NewProductsController.php
index bfcafb89f..507ed0bef 100644
--- a/controllers/front/NewProductsController.php
+++ b/controllers/front/NewProductsController.php
@@ -58,7 +58,7 @@ class NewProductsControllerCore extends FrontController
'products' => Product::getNewProducts($this->context->language->id, (int)($this->p) - 1, (int)($this->n), false, $this->orderBy, $this->orderWay),
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
'nbProducts' => (int)($nbProducts),
- 'homeSize' => Image::getSize('home')
+ 'homeSize' => Image::getSize('home_default')
));
$this->setTemplate(_PS_THEME_DIR_.'new-products.tpl');
diff --git a/controllers/front/PricesDropController.php b/controllers/front/PricesDropController.php
index 6307255ce..40cedf41e 100644
--- a/controllers/front/PricesDropController.php
+++ b/controllers/front/PricesDropController.php
@@ -51,7 +51,7 @@ class PricesDropControllerCore extends FrontController
'products' => Product::getPricesDrop($this->context->language->id, (int)$this->p - 1, (int)$this->n, false, $this->orderBy, $this->orderWay),
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
'nbProducts' => $nbProducts,
- 'homeSize' => Image::getSize('home')
+ 'homeSize' => Image::getSize('home_default')
));
$this->setTemplate(_PS_THEME_DIR_.'prices-drop.tpl');
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 28508eeee..8afa06354 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -322,14 +322,14 @@ class ProductControllerCore extends FrontController
}
if (!isset($cover))
$cover = array('id_image' => $this->context->language->iso_code.'-default', 'legend' => 'No picture', 'title' => 'No picture');
- $size = Image::getSize('large');
+ $size = Image::getSize('large_default');
$this->context->smarty->assign(array(
'have_image' => Product::getCover((int)Tools::getValue('id_product')),
'cover' => $cover,
'imgWidth' => (int)$size['width'],
- 'mediumSize' => Image::getSize('medium'),
- 'largeSize' => Image::getSize('large'),
- 'homeSize' => Image::getSize('home'),
+ 'mediumSize' => Image::getSize('medium_default'),
+ 'largeSize' => Image::getSize('large_default'),
+ 'homeSize' => Image::getSize('home_default'),
'col_img_dir' => _PS_COL_IMG_DIR_));
if (count($product_images))
$this->context->smarty->assign('images', $product_images);
diff --git a/controllers/front/SearchController.php b/controllers/front/SearchController.php
index 665388b74..610653b0e 100644
--- a/controllers/front/SearchController.php
+++ b/controllers/front/SearchController.php
@@ -82,7 +82,7 @@ class SearchControllerCore extends FrontController
'nbProducts' => $search['total'],
'search_query' => $query,
'instant_search' => $this->instant_search,
- 'homeSize' => Image::getSize('home')));
+ 'homeSize' => Image::getSize('home_default')));
}
else if (($query = Tools::getValue('search_query', Tools::getValue('ref'))) && !is_array($query))
{
@@ -98,7 +98,7 @@ class SearchControllerCore extends FrontController
'search_products' => $search['result'],
'nbProducts' => $search['total'],
'search_query' => $query,
- 'homeSize' => Image::getSize('home')));
+ 'homeSize' => Image::getSize('home_default')));
}
else if (($tag = urldecode(Tools::getValue('tag'))) && !is_array($tag))
{
@@ -111,7 +111,7 @@ class SearchControllerCore extends FrontController
'products' => $result, // DEPRECATED (since to 1.4), not use this: conflict with block_cart module
'search_products' => $result,
'nbProducts' => $nbProducts,
- 'homeSize' => Image::getSize('home')));
+ 'homeSize' => Image::getSize('home_default')));
}
else
{
diff --git a/controllers/front/StoresController.php b/controllers/front/StoresController.php
index 436d0609b..70a69e277 100644
--- a/controllers/front/StoresController.php
+++ b/controllers/front/StoresController.php
@@ -263,7 +263,7 @@ class StoresControllerCore extends FrontController
$this->assignStores();
$this->context->smarty->assign(array(
- 'mediumSize' => Image::getSize('medium'),
+ 'mediumSize' => Image::getSize('medium_default'),
'defaultLat' => (float)Configuration::get('PS_STORES_CENTER_LAT'),
'defaultLong' => (float)Configuration::get('PS_STORES_CENTER_LONG'),
'searchUrl' => $this->context->link->getPageLink('stores'),
diff --git a/controllers/front/SupplierController.php b/controllers/front/SupplierController.php
index 6833d8bec..7de05be11 100644
--- a/controllers/front/SupplierController.php
+++ b/controllers/front/SupplierController.php
@@ -120,7 +120,7 @@ class SupplierControllerCore extends FrontController
$this->context->smarty->assign(array(
'pages_nb' => ceil($nbProducts / (int)$this->n),
'nbSuppliers' => $nbProducts,
- 'mediumSize' => Image::getSize('medium'),
+ 'mediumSize' => Image::getSize('medium_default'),
'suppliers_list' => $suppliers,
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
));
diff --git a/install-dev/classes/xmlLoader.php b/install-dev/classes/xmlLoader.php
index a45472d0c..039f943b2 100644
--- a/install-dev/classes/xmlLoader.php
+++ b/install-dev/classes/xmlLoader.php
@@ -674,7 +674,7 @@ class InstallXmlLoader
@chmod($target_file, 0644);
}
// Resize the image if no cache was prepared in fixtures
- else if (!ImageManager::resize($path.$id.'.jpg', $target_file, $type['width'], $type['height']))
+ else if (!ImageManager::resize($path.$identifier.'.jpg', $target_file, $type['width'], $type['height']))
$this->setError($this->language->l('Cannot create image "%1$s" for entity "%2$s"', $identifier.'-'.$type['name'], 'product'));
}
}
diff --git a/install-dev/data/xml/image_type.xml b/install-dev/data/xml/image_type.xml
index 4f9999a16..7480ae8e3 100644
--- a/install-dev/data/xml/image_type.xml
+++ b/install-dev/data/xml/image_type.xml
@@ -12,13 +12,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/install-dev/fixtures/apple/img/c/3-category_default.jpg b/install-dev/fixtures/apple/img/c/3-category_default.jpg
new file mode 100644
index 000000000..e099639f1
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/3-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/3-large_default.jpg b/install-dev/fixtures/apple/img/c/3-large_default.jpg
new file mode 100644
index 000000000..0a60fced6
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/3-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/3-medium_default.jpg b/install-dev/fixtures/apple/img/c/3-medium_default.jpg
new file mode 100644
index 000000000..aa922e46a
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/3-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/3-small_default.jpg b/install-dev/fixtures/apple/img/c/3-small_default.jpg
new file mode 100644
index 000000000..87f7209c6
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/3-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/iPods.jpg b/install-dev/fixtures/apple/img/c/3.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/c/iPods.jpg
rename to install-dev/fixtures/apple/img/c/3.jpg
diff --git a/install-dev/fixtures/apple/img/c/4-category_default.jpg b/install-dev/fixtures/apple/img/c/4-category_default.jpg
new file mode 100644
index 000000000..11049b395
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/4-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/4-large_default.jpg b/install-dev/fixtures/apple/img/c/4-large_default.jpg
new file mode 100644
index 000000000..38052b404
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/4-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/Accessories-medium.jpg b/install-dev/fixtures/apple/img/c/4-medium_default.jpg
similarity index 53%
rename from install-dev/fixtures/apple/img/c/Accessories-medium.jpg
rename to install-dev/fixtures/apple/img/c/4-medium_default.jpg
index 3204ac026..c614d8a54 100644
Binary files a/install-dev/fixtures/apple/img/c/Accessories-medium.jpg and b/install-dev/fixtures/apple/img/c/4-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/Accessories-small.jpg b/install-dev/fixtures/apple/img/c/4-small_default.jpg
similarity index 64%
rename from install-dev/fixtures/apple/img/c/Accessories-small.jpg
rename to install-dev/fixtures/apple/img/c/4-small_default.jpg
index bb90783da..f47879f40 100644
Binary files a/install-dev/fixtures/apple/img/c/Accessories-small.jpg and b/install-dev/fixtures/apple/img/c/4-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/Accessories.jpg b/install-dev/fixtures/apple/img/c/4.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/c/Accessories.jpg
rename to install-dev/fixtures/apple/img/c/4.jpg
diff --git a/install-dev/fixtures/apple/img/c/5-category_default.jpg b/install-dev/fixtures/apple/img/c/5-category_default.jpg
new file mode 100644
index 000000000..27eca376e
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/5-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/5-large_default.jpg b/install-dev/fixtures/apple/img/c/5-large_default.jpg
new file mode 100644
index 000000000..43938b9b7
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/5-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/5-medium_default.jpg b/install-dev/fixtures/apple/img/c/5-medium_default.jpg
new file mode 100644
index 000000000..594d4aba5
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/5-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/Laptops-small.jpg b/install-dev/fixtures/apple/img/c/5-small_default.jpg
similarity index 57%
rename from install-dev/fixtures/apple/img/c/Laptops-small.jpg
rename to install-dev/fixtures/apple/img/c/5-small_default.jpg
index 6f80d4f6b..61de518d0 100644
Binary files a/install-dev/fixtures/apple/img/c/Laptops-small.jpg and b/install-dev/fixtures/apple/img/c/5-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/Laptops.jpg b/install-dev/fixtures/apple/img/c/5.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/c/Laptops.jpg
rename to install-dev/fixtures/apple/img/c/5.jpg
diff --git a/install-dev/fixtures/apple/img/c/6-category_default.jpg b/install-dev/fixtures/apple/img/c/6-category_default.jpg
new file mode 100644
index 000000000..e099639f1
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/6-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/6-large_default.jpg b/install-dev/fixtures/apple/img/c/6-large_default.jpg
new file mode 100644
index 000000000..0a60fced6
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/6-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/6-medium_default.jpg b/install-dev/fixtures/apple/img/c/6-medium_default.jpg
new file mode 100644
index 000000000..aa922e46a
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/6-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/6-small_default.jpg b/install-dev/fixtures/apple/img/c/6-small_default.jpg
new file mode 100644
index 000000000..87f7209c6
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/6-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/6.jpg b/install-dev/fixtures/apple/img/c/6.jpg
new file mode 100644
index 000000000..2701f071b
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/6.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/7-category_default.jpg b/install-dev/fixtures/apple/img/c/7-category_default.jpg
new file mode 100644
index 000000000..11049b395
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/7-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/7-large_default.jpg b/install-dev/fixtures/apple/img/c/7-large_default.jpg
new file mode 100644
index 000000000..38052b404
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/7-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/7-medium_default.jpg b/install-dev/fixtures/apple/img/c/7-medium_default.jpg
new file mode 100644
index 000000000..c614d8a54
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/7-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/7-small_default.jpg b/install-dev/fixtures/apple/img/c/7-small_default.jpg
new file mode 100644
index 000000000..f47879f40
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/7-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/7.jpg b/install-dev/fixtures/apple/img/c/7.jpg
new file mode 100644
index 000000000..1628a6b4f
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/7.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/8-category_default.jpg b/install-dev/fixtures/apple/img/c/8-category_default.jpg
new file mode 100644
index 000000000..27eca376e
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/8-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/8-large_default.jpg b/install-dev/fixtures/apple/img/c/8-large_default.jpg
new file mode 100644
index 000000000..43938b9b7
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/8-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/8-medium_default.jpg b/install-dev/fixtures/apple/img/c/8-medium_default.jpg
new file mode 100644
index 000000000..594d4aba5
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/8-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/8-small_default.jpg b/install-dev/fixtures/apple/img/c/8-small_default.jpg
new file mode 100644
index 000000000..61de518d0
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/8-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/8.jpg b/install-dev/fixtures/apple/img/c/8.jpg
new file mode 100644
index 000000000..54a32b006
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/8.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/Accessories-category.jpg b/install-dev/fixtures/apple/img/c/Accessories-category.jpg
deleted file mode 100644
index 657ad415b..000000000
Binary files a/install-dev/fixtures/apple/img/c/Accessories-category.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/c/Accessories-large.jpg b/install-dev/fixtures/apple/img/c/Accessories-large.jpg
deleted file mode 100644
index ef2986ede..000000000
Binary files a/install-dev/fixtures/apple/img/c/Accessories-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/c/Laptops-category.jpg b/install-dev/fixtures/apple/img/c/Laptops-category.jpg
deleted file mode 100644
index a7ce75b7a..000000000
Binary files a/install-dev/fixtures/apple/img/c/Laptops-category.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/c/Laptops-large.jpg b/install-dev/fixtures/apple/img/c/Laptops-large.jpg
deleted file mode 100644
index 265e92d45..000000000
Binary files a/install-dev/fixtures/apple/img/c/Laptops-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/c/Laptops-medium.jpg b/install-dev/fixtures/apple/img/c/Laptops-medium.jpg
deleted file mode 100644
index a14f9a3c6..000000000
Binary files a/install-dev/fixtures/apple/img/c/Laptops-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/c/de-default-category_default.jpg b/install-dev/fixtures/apple/img/c/de-default-category_default.jpg
new file mode 100644
index 000000000..f55d359e3
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/de-default-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/de-default-home_default.jpg b/install-dev/fixtures/apple/img/c/de-default-home_default.jpg
new file mode 100644
index 000000000..d97df3a04
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/de-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/de-default-large_default.jpg b/install-dev/fixtures/apple/img/c/de-default-large_default.jpg
new file mode 100644
index 000000000..4d22e5311
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/de-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/de-default-large_scene_defa.jpg b/install-dev/fixtures/apple/img/c/de-default-large_scene_defa.jpg
new file mode 100644
index 000000000..10468c5c2
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/de-default-large_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/de-default-medium_default.jpg b/install-dev/fixtures/apple/img/c/de-default-medium_default.jpg
new file mode 100644
index 000000000..6fa9785c6
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/de-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/de-default-small_default.jpg b/install-dev/fixtures/apple/img/c/de-default-small_default.jpg
new file mode 100644
index 000000000..b11c97f96
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/de-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/de-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/c/de-default-thickbox_default.jpg
new file mode 100644
index 000000000..c37db2680
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/de-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/de-default-thumb_scene_defa.jpg b/install-dev/fixtures/apple/img/c/de-default-thumb_scene_defa.jpg
new file mode 100644
index 000000000..29d95cc74
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/de-default-thumb_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/de.jpg b/install-dev/fixtures/apple/img/c/de.jpg
new file mode 100644
index 000000000..43716f653
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/de.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/en-default-category_default.jpg b/install-dev/fixtures/apple/img/c/en-default-category_default.jpg
new file mode 100644
index 000000000..9bf2b0118
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/en-default-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/en-default-home_default.jpg b/install-dev/fixtures/apple/img/c/en-default-home_default.jpg
new file mode 100644
index 000000000..f72a53f52
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/en-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/en-default-large_default.jpg b/install-dev/fixtures/apple/img/c/en-default-large_default.jpg
new file mode 100644
index 000000000..97001230c
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/en-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/en-default-large_scene_defa.jpg b/install-dev/fixtures/apple/img/c/en-default-large_scene_defa.jpg
new file mode 100644
index 000000000..12125b651
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/en-default-large_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/en-default-medium_default.jpg b/install-dev/fixtures/apple/img/c/en-default-medium_default.jpg
new file mode 100644
index 000000000..67f952184
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/en-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/en-default-small_default.jpg b/install-dev/fixtures/apple/img/c/en-default-small_default.jpg
new file mode 100644
index 000000000..f16e7d7df
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/en-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/en-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/c/en-default-thickbox_default.jpg
new file mode 100644
index 000000000..603c1042a
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/en-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/en-default-thumb_scene_defa.jpg b/install-dev/fixtures/apple/img/c/en-default-thumb_scene_defa.jpg
new file mode 100644
index 000000000..f82f855ab
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/en-default-thumb_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/en.jpg b/install-dev/fixtures/apple/img/c/en.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/en.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/es-default-category_default.jpg b/install-dev/fixtures/apple/img/c/es-default-category_default.jpg
new file mode 100644
index 000000000..cef03c10c
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/es-default-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/es-default-home_default.jpg b/install-dev/fixtures/apple/img/c/es-default-home_default.jpg
new file mode 100644
index 000000000..0baa08130
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/es-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/es-default-large_default.jpg b/install-dev/fixtures/apple/img/c/es-default-large_default.jpg
new file mode 100644
index 000000000..4525c3f34
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/es-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/es-default-large_scene_defa.jpg b/install-dev/fixtures/apple/img/c/es-default-large_scene_defa.jpg
new file mode 100644
index 000000000..6deb71142
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/es-default-large_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/es-default-medium_default.jpg b/install-dev/fixtures/apple/img/c/es-default-medium_default.jpg
new file mode 100644
index 000000000..fb56ac222
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/es-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/es-default-small_default.jpg b/install-dev/fixtures/apple/img/c/es-default-small_default.jpg
new file mode 100644
index 000000000..bdff337f1
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/es-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/es-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/c/es-default-thickbox_default.jpg
new file mode 100644
index 000000000..ee70abbd0
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/es-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/es-default-thumb_scene_defa.jpg b/install-dev/fixtures/apple/img/c/es-default-thumb_scene_defa.jpg
new file mode 100644
index 000000000..de2b7865f
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/es-default-thumb_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/es.jpg b/install-dev/fixtures/apple/img/c/es.jpg
new file mode 100644
index 000000000..28d7b8c81
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/es.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/fr-default-category_default.jpg b/install-dev/fixtures/apple/img/c/fr-default-category_default.jpg
new file mode 100644
index 000000000..26054a178
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/fr-default-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/fr-default-home_default.jpg b/install-dev/fixtures/apple/img/c/fr-default-home_default.jpg
new file mode 100644
index 000000000..95e0d4f99
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/fr-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/fr-default-large_default.jpg b/install-dev/fixtures/apple/img/c/fr-default-large_default.jpg
new file mode 100644
index 000000000..9598bd885
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/fr-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/fr-default-large_scene_defa.jpg b/install-dev/fixtures/apple/img/c/fr-default-large_scene_defa.jpg
new file mode 100644
index 000000000..5eab5d09d
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/fr-default-large_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/fr-default-medium_default.jpg b/install-dev/fixtures/apple/img/c/fr-default-medium_default.jpg
new file mode 100644
index 000000000..b8e29adee
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/fr-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/fr-default-small_default.jpg b/install-dev/fixtures/apple/img/c/fr-default-small_default.jpg
new file mode 100644
index 000000000..7ae143a06
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/fr-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/fr-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/c/fr-default-thickbox_default.jpg
new file mode 100644
index 000000000..4d7cef147
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/fr-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/fr-default-thumb_scene_defa.jpg b/install-dev/fixtures/apple/img/c/fr-default-thumb_scene_defa.jpg
new file mode 100644
index 000000000..81b265ae3
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/fr-default-thumb_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/fr.jpg b/install-dev/fixtures/apple/img/c/fr.jpg
new file mode 100644
index 000000000..ed443472f
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/fr.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/iPods-category.jpg b/install-dev/fixtures/apple/img/c/iPods-category.jpg
deleted file mode 100644
index dfda27ce0..000000000
Binary files a/install-dev/fixtures/apple/img/c/iPods-category.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/c/iPods-large.jpg b/install-dev/fixtures/apple/img/c/iPods-large.jpg
deleted file mode 100644
index 19125ba04..000000000
Binary files a/install-dev/fixtures/apple/img/c/iPods-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/c/iPods-medium.jpg b/install-dev/fixtures/apple/img/c/iPods-medium.jpg
deleted file mode 100644
index b75c631c5..000000000
Binary files a/install-dev/fixtures/apple/img/c/iPods-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/c/iPods-small.jpg b/install-dev/fixtures/apple/img/c/iPods-small.jpg
deleted file mode 100644
index e675c90e1..000000000
Binary files a/install-dev/fixtures/apple/img/c/iPods-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/c/it-default-category_default.jpg b/install-dev/fixtures/apple/img/c/it-default-category_default.jpg
new file mode 100644
index 000000000..72574a087
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/it-default-category_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/it-default-home_default.jpg b/install-dev/fixtures/apple/img/c/it-default-home_default.jpg
new file mode 100644
index 000000000..de61850aa
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/it-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/it-default-large_default.jpg b/install-dev/fixtures/apple/img/c/it-default-large_default.jpg
new file mode 100644
index 000000000..283d2bbf1
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/it-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/it-default-large_scene_defa.jpg b/install-dev/fixtures/apple/img/c/it-default-large_scene_defa.jpg
new file mode 100644
index 000000000..43b7deb87
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/it-default-large_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/it-default-medium_default.jpg b/install-dev/fixtures/apple/img/c/it-default-medium_default.jpg
new file mode 100644
index 000000000..4b98f0c64
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/it-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/it-default-small_default.jpg b/install-dev/fixtures/apple/img/c/it-default-small_default.jpg
new file mode 100644
index 000000000..58eb5ab18
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/it-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/it-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/c/it-default-thickbox_default.jpg
new file mode 100644
index 000000000..96fc64a4e
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/it-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/it-default-thumb_scene_defa.jpg b/install-dev/fixtures/apple/img/c/it-default-thumb_scene_defa.jpg
new file mode 100644
index 000000000..03b028c84
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/it-default-thumb_scene_defa.jpg differ
diff --git a/install-dev/fixtures/apple/img/c/it.jpg b/install-dev/fixtures/apple/img/c/it.jpg
new file mode 100644
index 000000000..94802add7
Binary files /dev/null and b/install-dev/fixtures/apple/img/c/it.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/Apple_Computer_Inc-large.jpg b/install-dev/fixtures/apple/img/m/1-large.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/m/Apple_Computer_Inc-large.jpg
rename to install-dev/fixtures/apple/img/m/1-large.jpg
diff --git a/install-dev/fixtures/apple/img/m/1-large_default.jpg b/install-dev/fixtures/apple/img/m/1-large_default.jpg
new file mode 100644
index 000000000..dd6ed6689
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/1-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/1-medium_default.jpg b/install-dev/fixtures/apple/img/m/1-medium_default.jpg
new file mode 100644
index 000000000..9b6fca576
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/1-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/1-small_default.jpg b/install-dev/fixtures/apple/img/m/1-small_default.jpg
new file mode 100644
index 000000000..fcf8ccc76
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/1-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/Apple_Computer_Inc.jpg b/install-dev/fixtures/apple/img/m/1.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/m/Apple_Computer_Inc.jpg
rename to install-dev/fixtures/apple/img/m/1.jpg
diff --git a/install-dev/fixtures/apple/img/m/Shure_Incorporated-large.jpg b/install-dev/fixtures/apple/img/m/2-large_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/m/Shure_Incorporated-large.jpg
rename to install-dev/fixtures/apple/img/m/2-large_default.jpg
diff --git a/install-dev/fixtures/apple/img/m/2-medium_default.jpg b/install-dev/fixtures/apple/img/m/2-medium_default.jpg
new file mode 100644
index 000000000..a3908a1d6
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/2-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/2-small_default.jpg b/install-dev/fixtures/apple/img/m/2-small_default.jpg
new file mode 100644
index 000000000..cdbe607ec
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/2-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/Shure_Incorporated.jpg b/install-dev/fixtures/apple/img/m/2.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/m/Shure_Incorporated.jpg
rename to install-dev/fixtures/apple/img/m/2.jpg
diff --git a/install-dev/fixtures/apple/img/m/3-large_default.jpg b/install-dev/fixtures/apple/img/m/3-large_default.jpg
new file mode 100644
index 000000000..dd6ed6689
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/3-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/3-medium_default.jpg b/install-dev/fixtures/apple/img/m/3-medium_default.jpg
new file mode 100644
index 000000000..9b6fca576
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/3-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/3-small_default.jpg b/install-dev/fixtures/apple/img/m/3-small_default.jpg
new file mode 100644
index 000000000..fcf8ccc76
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/3-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/3.jpg b/install-dev/fixtures/apple/img/m/3.jpg
new file mode 100644
index 000000000..795d132c5
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/3.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/Shure_Online_Store-large.jpg b/install-dev/fixtures/apple/img/m/4-large_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/su/Shure_Online_Store-large.jpg
rename to install-dev/fixtures/apple/img/m/4-large_default.jpg
diff --git a/install-dev/fixtures/apple/img/m/4-medium_default.jpg b/install-dev/fixtures/apple/img/m/4-medium_default.jpg
new file mode 100644
index 000000000..a3908a1d6
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/4-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/4-small_default.jpg b/install-dev/fixtures/apple/img/m/4-small_default.jpg
new file mode 100644
index 000000000..cdbe607ec
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/4-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/Shure_Online_Store.jpg b/install-dev/fixtures/apple/img/m/4.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/su/Shure_Online_Store.jpg
rename to install-dev/fixtures/apple/img/m/4.jpg
diff --git a/install-dev/fixtures/apple/img/m/Apple_Computer_Inc-medium.jpg b/install-dev/fixtures/apple/img/m/Apple_Computer_Inc-medium.jpg
deleted file mode 100644
index 829ea4c94..000000000
Binary files a/install-dev/fixtures/apple/img/m/Apple_Computer_Inc-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/m/Shure_Incorporated-medium.jpg b/install-dev/fixtures/apple/img/m/Shure_Incorporated-medium.jpg
deleted file mode 100644
index 66d982e01..000000000
Binary files a/install-dev/fixtures/apple/img/m/Shure_Incorporated-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/m/de-default-large_default.jpg b/install-dev/fixtures/apple/img/m/de-default-large_default.jpg
new file mode 100644
index 000000000..4d22e5311
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/de-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/de-default-medium_default.jpg b/install-dev/fixtures/apple/img/m/de-default-medium_default.jpg
new file mode 100644
index 000000000..6fa9785c6
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/de-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/de-default-small_default.jpg b/install-dev/fixtures/apple/img/m/de-default-small_default.jpg
new file mode 100644
index 000000000..b11c97f96
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/de-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/de.jpg b/install-dev/fixtures/apple/img/m/de.jpg
new file mode 100644
index 000000000..43716f653
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/de.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/en-default-large_default.jpg b/install-dev/fixtures/apple/img/m/en-default-large_default.jpg
new file mode 100644
index 000000000..97001230c
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/en-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/en-default-medium_default.jpg b/install-dev/fixtures/apple/img/m/en-default-medium_default.jpg
new file mode 100644
index 000000000..67f952184
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/en-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/en-default-small_default.jpg b/install-dev/fixtures/apple/img/m/en-default-small_default.jpg
new file mode 100644
index 000000000..f16e7d7df
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/en-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/en.jpg b/install-dev/fixtures/apple/img/m/en.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/en.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/es-default-large_default.jpg b/install-dev/fixtures/apple/img/m/es-default-large_default.jpg
new file mode 100644
index 000000000..4525c3f34
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/es-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/es-default-medium_default.jpg b/install-dev/fixtures/apple/img/m/es-default-medium_default.jpg
new file mode 100644
index 000000000..fb56ac222
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/es-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/es-default-small_default.jpg b/install-dev/fixtures/apple/img/m/es-default-small_default.jpg
new file mode 100644
index 000000000..bdff337f1
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/es-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/es.jpg b/install-dev/fixtures/apple/img/m/es.jpg
new file mode 100644
index 000000000..28d7b8c81
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/es.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/fr-default-large_default.jpg b/install-dev/fixtures/apple/img/m/fr-default-large_default.jpg
new file mode 100644
index 000000000..9598bd885
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/fr-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/fr-default-medium_default.jpg b/install-dev/fixtures/apple/img/m/fr-default-medium_default.jpg
new file mode 100644
index 000000000..b8e29adee
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/fr-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/fr-default-small_default.jpg b/install-dev/fixtures/apple/img/m/fr-default-small_default.jpg
new file mode 100644
index 000000000..7ae143a06
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/fr-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/fr.jpg b/install-dev/fixtures/apple/img/m/fr.jpg
new file mode 100644
index 000000000..ed443472f
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/fr.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/it-default-large_default.jpg b/install-dev/fixtures/apple/img/m/it-default-large_default.jpg
new file mode 100644
index 000000000..283d2bbf1
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/it-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/it-default-medium_default.jpg b/install-dev/fixtures/apple/img/m/it-default-medium_default.jpg
new file mode 100644
index 000000000..4b98f0c64
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/it-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/it-default-small_default.jpg b/install-dev/fixtures/apple/img/m/it-default-small_default.jpg
new file mode 100644
index 000000000..58eb5ab18
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/it-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/it.jpg b/install-dev/fixtures/apple/img/m/it.jpg
new file mode 100644
index 000000000..94802add7
Binary files /dev/null and b/install-dev/fixtures/apple/img/m/it.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-15-home_default.jpg b/install-dev/fixtures/apple/img/p/1-15-home_default.jpg
new file mode 100644
index 000000000..60eaa8dd4
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-15-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-15-large_default.jpg b/install-dev/fixtures/apple/img/p/1-15-large_default.jpg
new file mode 100644
index 000000000..33e26fa4b
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-15-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-15-medium_default.jpg b/install-dev/fixtures/apple/img/p/1-15-medium_default.jpg
new file mode 100644
index 000000000..138bc20bf
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-15-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-15-small_default.jpg b/install-dev/fixtures/apple/img/p/1-15-small_default.jpg
new file mode 100644
index 000000000..28b6134de
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-15-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano-thickbox.jpg b/install-dev/fixtures/apple/img/p/1-15-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/1-15-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano.jpg b/install-dev/fixtures/apple/img/p/1-15.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano.jpg
rename to install-dev/fixtures/apple/img/p/1-15.jpg
diff --git a/install-dev/fixtures/apple/img/p/1-16-home_default.jpg b/install-dev/fixtures/apple/img/p/1-16-home_default.jpg
new file mode 100644
index 000000000..1339b2d9e
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-16-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-16-large_default.jpg b/install-dev/fixtures/apple/img/p/1-16-large_default.jpg
new file mode 100644
index 000000000..93a933e88
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-16-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-16-medium_default.jpg b/install-dev/fixtures/apple/img/p/1-16-medium_default.jpg
new file mode 100644
index 000000000..2fd0df85a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-16-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_1-small.jpg b/install-dev/fixtures/apple/img/p/1-16-small_default.jpg
similarity index 58%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_1-small.jpg
rename to install-dev/fixtures/apple/img/p/1-16-small_default.jpg
index 3c1f76cb7..94b614124 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_1-small.jpg and b/install-dev/fixtures/apple/img/p/1-16-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_1-thickbox.jpg b/install-dev/fixtures/apple/img/p/1-16-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_1-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/1-16-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_1.jpg b/install-dev/fixtures/apple/img/p/1-16.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_1.jpg
rename to install-dev/fixtures/apple/img/p/1-16.jpg
diff --git a/install-dev/fixtures/apple/img/p/1-17-home_default.jpg b/install-dev/fixtures/apple/img/p/1-17-home_default.jpg
new file mode 100644
index 000000000..b0ce2f6a6
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-17-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-17-large_default.jpg b/install-dev/fixtures/apple/img/p/1-17-large_default.jpg
new file mode 100644
index 000000000..60bf651c7
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-17-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-17-medium_default.jpg b/install-dev/fixtures/apple/img/p/1-17-medium_default.jpg
new file mode 100644
index 000000000..252bca5e0
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-17-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-17-small_default.jpg b/install-dev/fixtures/apple/img/p/1-17-small_default.jpg
new file mode 100644
index 000000000..6d5e4904a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-17-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_2-thickbox.jpg b/install-dev/fixtures/apple/img/p/1-17-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_2-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/1-17-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_2.jpg b/install-dev/fixtures/apple/img/p/1-17.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_2.jpg
rename to install-dev/fixtures/apple/img/p/1-17.jpg
diff --git a/install-dev/fixtures/apple/img/p/1-18-home_default.jpg b/install-dev/fixtures/apple/img/p/1-18-home_default.jpg
new file mode 100644
index 000000000..209dd89cd
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-18-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-18-large_default.jpg b/install-dev/fixtures/apple/img/p/1-18-large_default.jpg
new file mode 100644
index 000000000..dace12bb8
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-18-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-18-medium_default.jpg b/install-dev/fixtures/apple/img/p/1-18-medium_default.jpg
new file mode 100644
index 000000000..2b486dcf1
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-18-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-18-small_default.jpg b/install-dev/fixtures/apple/img/p/1-18-small_default.jpg
new file mode 100644
index 000000000..daab53863
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-18-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_3-thickbox.jpg b/install-dev/fixtures/apple/img/p/1-18-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_3-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/1-18-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_3.jpg b/install-dev/fixtures/apple/img/p/1-18.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_3.jpg
rename to install-dev/fixtures/apple/img/p/1-18.jpg
diff --git a/install-dev/fixtures/apple/img/p/1-19-home_default.jpg b/install-dev/fixtures/apple/img/p/1-19-home_default.jpg
new file mode 100644
index 000000000..fc046d1aa
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-19-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-19-large_default.jpg b/install-dev/fixtures/apple/img/p/1-19-large_default.jpg
new file mode 100644
index 000000000..1472904e7
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-19-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-19-medium_default.jpg b/install-dev/fixtures/apple/img/p/1-19-medium_default.jpg
new file mode 100644
index 000000000..6134ee95c
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-19-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-19-small_default.jpg b/install-dev/fixtures/apple/img/p/1-19-small_default.jpg
new file mode 100644
index 000000000..7af77e2cc
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-19-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_4-thickbox.jpg b/install-dev/fixtures/apple/img/p/1-19-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_4-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/1-19-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_4.jpg b/install-dev/fixtures/apple/img/p/1-19.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_4.jpg
rename to install-dev/fixtures/apple/img/p/1-19.jpg
diff --git a/install-dev/fixtures/apple/img/p/1-20-home_default.jpg b/install-dev/fixtures/apple/img/p/1-20-home_default.jpg
new file mode 100644
index 000000000..f2f3b85f4
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-20-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-20-large_default.jpg b/install-dev/fixtures/apple/img/p/1-20-large_default.jpg
new file mode 100644
index 000000000..106ed858d
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-20-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-20-medium_default.jpg b/install-dev/fixtures/apple/img/p/1-20-medium_default.jpg
new file mode 100644
index 000000000..4ffbf3b44
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-20-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-20-small_default.jpg b/install-dev/fixtures/apple/img/p/1-20-small_default.jpg
new file mode 100644
index 000000000..92e3b4022
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-20-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_5-thickbox.jpg b/install-dev/fixtures/apple/img/p/1-20-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_5-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/1-20-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_5.jpg b/install-dev/fixtures/apple/img/p/1-20.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_5.jpg
rename to install-dev/fixtures/apple/img/p/1-20.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_6-home.jpg b/install-dev/fixtures/apple/img/p/1-21-home_default.jpg
similarity index 67%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_6-home.jpg
rename to install-dev/fixtures/apple/img/p/1-21-home_default.jpg
index f5b46f3cd..a557ba592 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_6-home.jpg and b/install-dev/fixtures/apple/img/p/1-21-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-21-large_default.jpg b/install-dev/fixtures/apple/img/p/1-21-large_default.jpg
new file mode 100644
index 000000000..2bda54908
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-21-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-21-medium_default.jpg b/install-dev/fixtures/apple/img/p/1-21-medium_default.jpg
new file mode 100644
index 000000000..4fd033213
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-21-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_6-small.jpg b/install-dev/fixtures/apple/img/p/1-21-small_default.jpg
similarity index 57%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_6-small.jpg
rename to install-dev/fixtures/apple/img/p/1-21-small_default.jpg
index 4b7ed4428..1cc236a7b 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_6-small.jpg and b/install-dev/fixtures/apple/img/p/1-21-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_6-thickbox.jpg b/install-dev/fixtures/apple/img/p/1-21-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_6-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/1-21-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_6.jpg b/install-dev/fixtures/apple/img/p/1-21.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_6.jpg
rename to install-dev/fixtures/apple/img/p/1-21.jpg
diff --git a/install-dev/fixtures/apple/img/p/1-22-home_default.jpg b/install-dev/fixtures/apple/img/p/1-22-home_default.jpg
new file mode 100644
index 000000000..2235eec08
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-22-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-22-large_default.jpg b/install-dev/fixtures/apple/img/p/1-22-large_default.jpg
new file mode 100644
index 000000000..536c5dd9a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-22-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-22-medium_default.jpg b/install-dev/fixtures/apple/img/p/1-22-medium_default.jpg
new file mode 100644
index 000000000..08aa9036c
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-22-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/1-22-small_default.jpg b/install-dev/fixtures/apple/img/p/1-22-small_default.jpg
new file mode 100644
index 000000000..ec306b757
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/1-22-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_7-thickbox.jpg b/install-dev/fixtures/apple/img/p/1-22-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_7-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/1-22-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_7.jpg b/install-dev/fixtures/apple/img/p/1-22.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_Nano_7.jpg
rename to install-dev/fixtures/apple/img/p/1-22.jpg
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air.jpg b/install-dev/fixtures/apple/img/p/10-27.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/MacBook_Air.jpg
rename to install-dev/fixtures/apple/img/p/10-27.jpg
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_1.jpg b/install-dev/fixtures/apple/img/p/10-28.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_1.jpg
rename to install-dev/fixtures/apple/img/p/10-28.jpg
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_2.jpg b/install-dev/fixtures/apple/img/p/10-29.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_2.jpg
rename to install-dev/fixtures/apple/img/p/10-29.jpg
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_3.jpg b/install-dev/fixtures/apple/img/p/11-30.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_3.jpg
rename to install-dev/fixtures/apple/img/p/11-30.jpg
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_4.jpg b/install-dev/fixtures/apple/img/p/11-31.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_4.jpg
rename to install-dev/fixtures/apple/img/p/11-31.jpg
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive.jpg b/install-dev/fixtures/apple/img/p/11-32.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive.jpg
rename to install-dev/fixtures/apple/img/p/11-32.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch.jpg b/install-dev/fixtures/apple/img/p/12-33.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_touch.jpg
rename to install-dev/fixtures/apple/img/p/12-33.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_1.jpg b/install-dev/fixtures/apple/img/p/12-34.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_touch_1.jpg
rename to install-dev/fixtures/apple/img/p/12-34.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_2.jpg b/install-dev/fixtures/apple/img/p/12-35.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_touch_2.jpg
rename to install-dev/fixtures/apple/img/p/12-35.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_3.jpg b/install-dev/fixtures/apple/img/p/12-36.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_touch_3.jpg
rename to install-dev/fixtures/apple/img/p/12-36.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_4.jpg b/install-dev/fixtures/apple/img/p/12-37.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_touch_4.jpg
rename to install-dev/fixtures/apple/img/p/12-37.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_5.jpg b/install-dev/fixtures/apple/img/p/12-38.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_touch_5.jpg
rename to install-dev/fixtures/apple/img/p/12-38.jpg
diff --git a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir.jpg b/install-dev/fixtures/apple/img/p/13-39.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir.jpg
rename to install-dev/fixtures/apple/img/p/13-39.jpg
diff --git a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone.jpg b/install-dev/fixtures/apple/img/p/14-40.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone.jpg
rename to install-dev/fixtures/apple/img/p/14-40.jpg
diff --git a/install-dev/fixtures/apple/img/p/2-23-home_default.jpg b/install-dev/fixtures/apple/img/p/2-23-home_default.jpg
new file mode 100644
index 000000000..323b3433d
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/2-23-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle-large.jpg b/install-dev/fixtures/apple/img/p/2-23-large_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle-large.jpg
rename to install-dev/fixtures/apple/img/p/2-23-large_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/2-23-medium_default.jpg b/install-dev/fixtures/apple/img/p/2-23-medium_default.jpg
new file mode 100644
index 000000000..e0bdc3e6e
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/2-23-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle-small.jpg b/install-dev/fixtures/apple/img/p/2-23-small_default.jpg
similarity index 93%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle-small.jpg
rename to install-dev/fixtures/apple/img/p/2-23-small_default.jpg
index 4c1ea26d3..d2fe566ca 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle-small.jpg and b/install-dev/fixtures/apple/img/p/2-23-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle-thickbox.jpg b/install-dev/fixtures/apple/img/p/2-23-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/2-23-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle.jpg b/install-dev/fixtures/apple/img/p/2-23.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle.jpg
rename to install-dev/fixtures/apple/img/p/2-23.jpg
diff --git a/install-dev/fixtures/apple/img/p/2-24-home_default.jpg b/install-dev/fixtures/apple/img/p/2-24-home_default.jpg
new file mode 100644
index 000000000..393f6a748
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/2-24-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_1-large.jpg b/install-dev/fixtures/apple/img/p/2-24-large_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_1-large.jpg
rename to install-dev/fixtures/apple/img/p/2-24-large_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_1-medium.jpg b/install-dev/fixtures/apple/img/p/2-24-medium_default.jpg
similarity index 80%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_1-medium.jpg
rename to install-dev/fixtures/apple/img/p/2-24-medium_default.jpg
index 31d359237..2c8681791 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle_1-medium.jpg and b/install-dev/fixtures/apple/img/p/2-24-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_1-small.jpg b/install-dev/fixtures/apple/img/p/2-24-small_default.jpg
similarity index 93%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_1-small.jpg
rename to install-dev/fixtures/apple/img/p/2-24-small_default.jpg
index 432080def..68d0cae46 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle_1-small.jpg and b/install-dev/fixtures/apple/img/p/2-24-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_1-thickbox.jpg b/install-dev/fixtures/apple/img/p/2-24-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_1-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/2-24-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_1.jpg b/install-dev/fixtures/apple/img/p/2-24.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_1.jpg
rename to install-dev/fixtures/apple/img/p/2-24.jpg
diff --git a/install-dev/fixtures/apple/img/p/2-25-home_default.jpg b/install-dev/fixtures/apple/img/p/2-25-home_default.jpg
new file mode 100644
index 000000000..6b924b3e0
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/2-25-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_2-large.jpg b/install-dev/fixtures/apple/img/p/2-25-large_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_2-large.jpg
rename to install-dev/fixtures/apple/img/p/2-25-large_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_2-medium.jpg b/install-dev/fixtures/apple/img/p/2-25-medium_default.jpg
similarity index 91%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_2-medium.jpg
rename to install-dev/fixtures/apple/img/p/2-25-medium_default.jpg
index 2fc2d0b5e..d8a81454e 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle_2-medium.jpg and b/install-dev/fixtures/apple/img/p/2-25-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_2-small.jpg b/install-dev/fixtures/apple/img/p/2-25-small_default.jpg
similarity index 94%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_2-small.jpg
rename to install-dev/fixtures/apple/img/p/2-25-small_default.jpg
index 577312e4d..64426a22c 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle_2-small.jpg and b/install-dev/fixtures/apple/img/p/2-25-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_2-thickbox.jpg b/install-dev/fixtures/apple/img/p/2-25-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_2-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/2-25-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_2.jpg b/install-dev/fixtures/apple/img/p/2-25.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_2.jpg
rename to install-dev/fixtures/apple/img/p/2-25.jpg
diff --git a/install-dev/fixtures/apple/img/p/2-26-home_default.jpg b/install-dev/fixtures/apple/img/p/2-26-home_default.jpg
new file mode 100644
index 000000000..c12143795
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/2-26-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_3-large.jpg b/install-dev/fixtures/apple/img/p/2-26-large_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_3-large.jpg
rename to install-dev/fixtures/apple/img/p/2-26-large_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/2-26-medium_default.jpg b/install-dev/fixtures/apple/img/p/2-26-medium_default.jpg
new file mode 100644
index 000000000..06061126d
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/2-26-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_3-small.jpg b/install-dev/fixtures/apple/img/p/2-26-small_default.jpg
similarity index 88%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_3-small.jpg
rename to install-dev/fixtures/apple/img/p/2-26-small_default.jpg
index 2b39ee19e..54660db06 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle_3-small.jpg and b/install-dev/fixtures/apple/img/p/2-26-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_3-thickbox.jpg b/install-dev/fixtures/apple/img/p/2-26-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_3-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/2-26-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_3.jpg b/install-dev/fixtures/apple/img/p/2-26.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/iPod_shuffle_3.jpg
rename to install-dev/fixtures/apple/img/p/2-26.jpg
diff --git a/install-dev/fixtures/apple/img/p/3-1-home_default.jpg b/install-dev/fixtures/apple/img/p/3-1-home_default.jpg
new file mode 100644
index 000000000..5b075c453
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-1-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-1-large_default.jpg b/install-dev/fixtures/apple/img/p/3-1-large_default.jpg
new file mode 100644
index 000000000..91f444587
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-1-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-1-medium_default.jpg b/install-dev/fixtures/apple/img/p/3-1-medium_default.jpg
new file mode 100644
index 000000000..608580eb8
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-1-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-1-small_default.jpg b/install-dev/fixtures/apple/img/p/3-1-small_default.jpg
new file mode 100644
index 000000000..3ce00b72a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-1-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-1-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/3-1-thickbox_default.jpg
new file mode 100644
index 000000000..2c80527c2
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-1-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-1.jpg b/install-dev/fixtures/apple/img/p/3-1.jpg
new file mode 100644
index 000000000..1960498ee
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-1.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-2-home_default.jpg b/install-dev/fixtures/apple/img/p/3-2-home_default.jpg
new file mode 100644
index 000000000..fdfe1a498
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-2-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-2-large_default.jpg b/install-dev/fixtures/apple/img/p/3-2-large_default.jpg
new file mode 100644
index 000000000..327b348c1
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-2-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_1-medium.jpg b/install-dev/fixtures/apple/img/p/3-2-medium_default.jpg
similarity index 53%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_1-medium.jpg
rename to install-dev/fixtures/apple/img/p/3-2-medium_default.jpg
index dbf0a0ea9..8a4d05934 100644
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_1-medium.jpg and b/install-dev/fixtures/apple/img/p/3-2-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_1-small.jpg b/install-dev/fixtures/apple/img/p/3-2-small_default.jpg
similarity index 63%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_1-small.jpg
rename to install-dev/fixtures/apple/img/p/3-2-small_default.jpg
index 0965a7e05..7d55e0c9f 100644
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_1-small.jpg and b/install-dev/fixtures/apple/img/p/3-2-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-2-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/3-2-thickbox_default.jpg
new file mode 100644
index 000000000..b7dedad18
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-2-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-2.jpg b/install-dev/fixtures/apple/img/p/3-2.jpg
new file mode 100644
index 000000000..4f0877bac
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-2.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-3-home_default.jpg b/install-dev/fixtures/apple/img/p/3-3-home_default.jpg
new file mode 100644
index 000000000..d66febce7
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-3-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-3-large_default.jpg b/install-dev/fixtures/apple/img/p/3-3-large_default.jpg
new file mode 100644
index 000000000..25385a3fd
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-3-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-3-medium_default.jpg b/install-dev/fixtures/apple/img/p/3-3-medium_default.jpg
new file mode 100644
index 000000000..4e27abe75
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-3-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/Shure_Incorporated-small.jpg b/install-dev/fixtures/apple/img/p/3-3-small_default.jpg
similarity index 54%
rename from install-dev/fixtures/apple/img/m/Shure_Incorporated-small.jpg
rename to install-dev/fixtures/apple/img/p/3-3-small_default.jpg
index 0137799f6..6f857e93f 100644
Binary files a/install-dev/fixtures/apple/img/m/Shure_Incorporated-small.jpg and b/install-dev/fixtures/apple/img/p/3-3-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-3-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/3-3-thickbox_default.jpg
new file mode 100644
index 000000000..b4858a633
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-3-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/3-3.jpg b/install-dev/fixtures/apple/img/p/3-3.jpg
new file mode 100644
index 000000000..29d21da77
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/3-3.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-4-home_default.jpg b/install-dev/fixtures/apple/img/p/4-4-home_default.jpg
new file mode 100644
index 000000000..10f5bd345
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-4-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-4-large_default.jpg b/install-dev/fixtures/apple/img/p/4-4-large_default.jpg
new file mode 100644
index 000000000..4f3bc72fa
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-4-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-4-medium_default.jpg b/install-dev/fixtures/apple/img/p/4-4-medium_default.jpg
new file mode 100644
index 000000000..a4b162d8b
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-4-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_3-small.jpg b/install-dev/fixtures/apple/img/p/4-4-small_default.jpg
similarity index 53%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_3-small.jpg
rename to install-dev/fixtures/apple/img/p/4-4-small_default.jpg
index 1c2760be3..2e909b8cf 100644
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_3-small.jpg and b/install-dev/fixtures/apple/img/p/4-4-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-4-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/4-4-thickbox_default.jpg
new file mode 100644
index 000000000..ce14f7a39
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-4-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-4.jpg b/install-dev/fixtures/apple/img/p/4-4.jpg
new file mode 100644
index 000000000..b29f3fe55
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-4.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-5-home_default.jpg b/install-dev/fixtures/apple/img/p/4-5-home_default.jpg
new file mode 100644
index 000000000..9cedd1c68
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-5-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-5-large_default.jpg b/install-dev/fixtures/apple/img/p/4-5-large_default.jpg
new file mode 100644
index 000000000..6b38c6a7c
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-5-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_4-medium.jpg b/install-dev/fixtures/apple/img/p/4-5-medium_default.jpg
similarity index 53%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_4-medium.jpg
rename to install-dev/fixtures/apple/img/p/4-5-medium_default.jpg
index 4d5bb2967..d501142d4 100644
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_4-medium.jpg and b/install-dev/fixtures/apple/img/p/4-5-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_4-small.jpg b/install-dev/fixtures/apple/img/p/4-5-small_default.jpg
similarity index 64%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_4-small.jpg
rename to install-dev/fixtures/apple/img/p/4-5-small_default.jpg
index 583a8efd2..48035d649 100644
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_4-small.jpg and b/install-dev/fixtures/apple/img/p/4-5-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-5-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/4-5-thickbox_default.jpg
new file mode 100644
index 000000000..f72e44aab
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-5-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-5.jpg b/install-dev/fixtures/apple/img/p/4-5.jpg
new file mode 100644
index 000000000..ea5e14a37
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-5.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-6-home_default.jpg b/install-dev/fixtures/apple/img/p/4-6-home_default.jpg
new file mode 100644
index 000000000..21a67e7e6
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-6-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-6-large_default.jpg b/install-dev/fixtures/apple/img/p/4-6-large_default.jpg
new file mode 100644
index 000000000..eeaeebb66
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-6-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-6-medium_default.jpg b/install-dev/fixtures/apple/img/p/4-6-medium_default.jpg
new file mode 100644
index 000000000..807e411fa
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-6-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-6-small_default.jpg b/install-dev/fixtures/apple/img/p/4-6-small_default.jpg
new file mode 100644
index 000000000..4188ff9d8
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-6-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-6-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/4-6-thickbox_default.jpg
new file mode 100644
index 000000000..d0d822461
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-6-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/4-6.jpg b/install-dev/fixtures/apple/img/p/4-6.jpg
new file mode 100644
index 000000000..4a53c6814
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/4-6.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-10-home_default.jpg b/install-dev/fixtures/apple/img/p/5-10-home_default.jpg
new file mode 100644
index 000000000..24440a66a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-10-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-10-large_default.jpg b/install-dev/fixtures/apple/img/p/5-10-large_default.jpg
new file mode 100644
index 000000000..95196c795
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-10-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-10-medium_default.jpg b/install-dev/fixtures/apple/img/p/5-10-medium_default.jpg
new file mode 100644
index 000000000..9f1e33d5c
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-10-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-10-small_default.jpg b/install-dev/fixtures/apple/img/p/5-10-small_default.jpg
new file mode 100644
index 000000000..4b4787062
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-10-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-10-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/5-10-thickbox_default.jpg
new file mode 100644
index 000000000..f25da49e8
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-10-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-10.jpg b/install-dev/fixtures/apple/img/p/5-10.jpg
new file mode 100644
index 000000000..f77be18d1
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-10.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-11-home_default.jpg b/install-dev/fixtures/apple/img/p/5-11-home_default.jpg
new file mode 100644
index 000000000..387aab044
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-11-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-11-large_default.jpg b/install-dev/fixtures/apple/img/p/5-11-large_default.jpg
new file mode 100644
index 000000000..32a087e69
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-11-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-11-medium_default.jpg b/install-dev/fixtures/apple/img/p/5-11-medium_default.jpg
new file mode 100644
index 000000000..4e1df43c8
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-11-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_4-small.jpg b/install-dev/fixtures/apple/img/p/5-11-small_default.jpg
similarity index 63%
rename from install-dev/fixtures/apple/img/p/iPod_touch_4-small.jpg
rename to install-dev/fixtures/apple/img/p/5-11-small_default.jpg
index 9e7e317d0..e1beb29a1 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_4-small.jpg and b/install-dev/fixtures/apple/img/p/5-11-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-11-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/5-11-thickbox_default.jpg
new file mode 100644
index 000000000..e85922e9a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-11-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-11.jpg b/install-dev/fixtures/apple/img/p/5-11.jpg
new file mode 100644
index 000000000..fdd92a611
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-11.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-12-home_default.jpg b/install-dev/fixtures/apple/img/p/5-12-home_default.jpg
new file mode 100644
index 000000000..fa512e151
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-12-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-12-large_default.jpg b/install-dev/fixtures/apple/img/p/5-12-large_default.jpg
new file mode 100644
index 000000000..52921b16b
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-12-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-12-medium_default.jpg b/install-dev/fixtures/apple/img/p/5-12-medium_default.jpg
new file mode 100644
index 000000000..e68ebe68a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-12-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-12-small_default.jpg b/install-dev/fixtures/apple/img/p/5-12-small_default.jpg
new file mode 100644
index 000000000..e00b93d47
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-12-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-12-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/5-12-thickbox_default.jpg
new file mode 100644
index 000000000..c1b862269
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-12-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-12.jpg b/install-dev/fixtures/apple/img/p/5-12.jpg
new file mode 100644
index 000000000..c66c26932
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-12.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-7-home_default.jpg b/install-dev/fixtures/apple/img/p/5-7-home_default.jpg
new file mode 100644
index 000000000..a8af975f4
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-7-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-7-large_default.jpg b/install-dev/fixtures/apple/img/p/5-7-large_default.jpg
new file mode 100644
index 000000000..04a2c49f0
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-7-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-7-medium_default.jpg b/install-dev/fixtures/apple/img/p/5-7-medium_default.jpg
new file mode 100644
index 000000000..bf65ff855
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-7-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-7-small_default.jpg b/install-dev/fixtures/apple/img/p/5-7-small_default.jpg
new file mode 100644
index 000000000..1cf72e1c6
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-7-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-7-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/5-7-thickbox_default.jpg
new file mode 100644
index 000000000..f2eb82b47
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-7-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-7.jpg b/install-dev/fixtures/apple/img/p/5-7.jpg
new file mode 100644
index 000000000..8a3f0cc3c
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-7.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-8-home_default.jpg b/install-dev/fixtures/apple/img/p/5-8-home_default.jpg
new file mode 100644
index 000000000..ce4f67a07
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-8-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-8-large_default.jpg b/install-dev/fixtures/apple/img/p/5-8-large_default.jpg
new file mode 100644
index 000000000..530e38975
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-8-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-8-medium_default.jpg b/install-dev/fixtures/apple/img/p/5-8-medium_default.jpg
new file mode 100644
index 000000000..bec5bddf5
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-8-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/m/Apple_Computer_Inc-small.jpg b/install-dev/fixtures/apple/img/p/5-8-small_default.jpg
similarity index 52%
rename from install-dev/fixtures/apple/img/m/Apple_Computer_Inc-small.jpg
rename to install-dev/fixtures/apple/img/p/5-8-small_default.jpg
index 5b9b06275..bd2fba76b 100644
Binary files a/install-dev/fixtures/apple/img/m/Apple_Computer_Inc-small.jpg and b/install-dev/fixtures/apple/img/p/5-8-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-8-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/5-8-thickbox_default.jpg
new file mode 100644
index 000000000..7bd1c79b0
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-8-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-8.jpg b/install-dev/fixtures/apple/img/p/5-8.jpg
new file mode 100644
index 000000000..cf547f514
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-8.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-9-home_default.jpg b/install-dev/fixtures/apple/img/p/5-9-home_default.jpg
new file mode 100644
index 000000000..9d3a35564
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-9-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-9-large_default.jpg b/install-dev/fixtures/apple/img/p/5-9-large_default.jpg
new file mode 100644
index 000000000..29bcff856
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-9-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_2-medium.jpg b/install-dev/fixtures/apple/img/p/5-9-medium_default.jpg
similarity index 52%
rename from install-dev/fixtures/apple/img/p/iPod_touch_2-medium.jpg
rename to install-dev/fixtures/apple/img/p/5-9-medium_default.jpg
index a09d1dfa3..cdca4c5f9 100644
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_2-medium.jpg and b/install-dev/fixtures/apple/img/p/5-9-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_2-small.jpg b/install-dev/fixtures/apple/img/p/5-9-small_default.jpg
similarity index 53%
rename from install-dev/fixtures/apple/img/p/MacBook_Air_2-small.jpg
rename to install-dev/fixtures/apple/img/p/5-9-small_default.jpg
index 2d2d0a0b8..6882cf445 100644
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_2-small.jpg and b/install-dev/fixtures/apple/img/p/5-9-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-9-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/5-9-thickbox_default.jpg
new file mode 100644
index 000000000..6a7a50728
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-9-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/5-9.jpg b/install-dev/fixtures/apple/img/p/5-9.jpg
new file mode 100644
index 000000000..a09ffb565
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/5-9.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/6-13-home_default.jpg b/install-dev/fixtures/apple/img/p/6-13-home_default.jpg
new file mode 100644
index 000000000..5175685a9
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/6-13-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/6-13-large_default.jpg b/install-dev/fixtures/apple/img/p/6-13-large_default.jpg
new file mode 100644
index 000000000..952a84561
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/6-13-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/6-13-medium_default.jpg b/install-dev/fixtures/apple/img/p/6-13-medium_default.jpg
new file mode 100644
index 000000000..8282b8367
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/6-13-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/6-13-small_default.jpg b/install-dev/fixtures/apple/img/p/6-13-small_default.jpg
new file mode 100644
index 000000000..63d8b31d0
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/6-13-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-thickbox.jpg b/install-dev/fixtures/apple/img/p/6-13-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/6-13-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/6-13.jpg b/install-dev/fixtures/apple/img/p/6-13.jpg
new file mode 100644
index 000000000..936488d1a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/6-13.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/7-14-home_default.jpg b/install-dev/fixtures/apple/img/p/7-14-home_default.jpg
new file mode 100644
index 000000000..83fda19d6
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/7-14-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/7-14-large_default.jpg b/install-dev/fixtures/apple/img/p/7-14-large_default.jpg
new file mode 100644
index 000000000..9134d1024
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/7-14-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/7-14-medium_default.jpg b/install-dev/fixtures/apple/img/p/7-14-medium_default.jpg
new file mode 100644
index 000000000..496834704
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/7-14-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/7-14-small_default.jpg b/install-dev/fixtures/apple/img/p/7-14-small_default.jpg
new file mode 100644
index 000000000..d268bf6d5
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/7-14-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-thickbox.jpg b/install-dev/fixtures/apple/img/p/7-14-thickbox_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-thickbox.jpg
rename to install-dev/fixtures/apple/img/p/7-14-thickbox_default.jpg
diff --git a/install-dev/fixtures/apple/img/p/7-14.jpg b/install-dev/fixtures/apple/img/p/7-14.jpg
new file mode 100644
index 000000000..aaf80c7c1
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/7-14.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/8-41.jpg b/install-dev/fixtures/apple/img/p/8-41.jpg
new file mode 100644
index 000000000..262687ad6
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/8-41.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/8-42.jpg b/install-dev/fixtures/apple/img/p/8-42.jpg
new file mode 100644
index 000000000..6ae301a6c
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/8-42.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/8-43.jpg b/install-dev/fixtures/apple/img/p/8-43.jpg
new file mode 100644
index 000000000..743b8289a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/8-43.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/8-44.jpg b/install-dev/fixtures/apple/img/p/8-44.jpg
new file mode 100644
index 000000000..66f4e1147
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/8-44.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/8-45.jpg b/install-dev/fixtures/apple/img/p/8-45.jpg
new file mode 100644
index 000000000..d1e35ad30
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/8-45.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/8-46.jpg b/install-dev/fixtures/apple/img/p/8-46.jpg
new file mode 100644
index 000000000..331e3b93c
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/8-46.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/8-47.jpg b/install-dev/fixtures/apple/img/p/8-47.jpg
new file mode 100644
index 000000000..81795b2f9
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/8-47.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/8-48.jpg b/install-dev/fixtures/apple/img/p/8-48.jpg
new file mode 100644
index 000000000..96b6abb2c
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/8-48.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/9-49.jpg b/install-dev/fixtures/apple/img/p/9-49.jpg
new file mode 100644
index 000000000..ac4676bdb
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/9-49.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/9-50.jpg b/install-dev/fixtures/apple/img/p/9-50.jpg
new file mode 100644
index 000000000..f684926bb
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/9-50.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/9-51.jpg b/install-dev/fixtures/apple/img/p/9-51.jpg
new file mode 100644
index 000000000..67cf9de33
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/9-51.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/9-52.jpg b/install-dev/fixtures/apple/img/p/9-52.jpg
new file mode 100644
index 000000000..754de0739
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/9-52.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air-home.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air-home.jpg
deleted file mode 100644
index 71ea6089e..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air-large.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air-large.jpg
deleted file mode 100644
index 913d06d07..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air-medium.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air-medium.jpg
deleted file mode 100644
index dbdb13842..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air-small.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air-small.jpg
deleted file mode 100644
index 3eb2b20c1..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air-thickbox.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air-thickbox.jpg
deleted file mode 100644
index 243226f81..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_1-home.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_1-home.jpg
deleted file mode 100644
index 9d3c04328..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_1-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_1-large.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_1-large.jpg
deleted file mode 100644
index 647e4af84..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_1-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_1-thickbox.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_1-thickbox.jpg
deleted file mode 100644
index 62fdaad53..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_1-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_2-home.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_2-home.jpg
deleted file mode 100644
index 78bd08cfb..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_2-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_2-large.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_2-large.jpg
deleted file mode 100644
index bd6d033c6..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_2-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_2-medium.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_2-medium.jpg
deleted file mode 100644
index 175e4bc75..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_2-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_2-thickbox.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_2-thickbox.jpg
deleted file mode 100644
index fec7e0a3f..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_2-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_3-home.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_3-home.jpg
deleted file mode 100644
index 94d6db457..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_3-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_3-large.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_3-large.jpg
deleted file mode 100644
index 7fa022fff..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_3-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_3-medium.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_3-medium.jpg
deleted file mode 100644
index 2f8a9c6f4..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_3-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_3-thickbox.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_3-thickbox.jpg
deleted file mode 100644
index a8adadb7c..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_3-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_4-home.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_4-home.jpg
deleted file mode 100644
index abb75ea7f..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_4-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_4-large.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_4-large.jpg
deleted file mode 100644
index 3fca0eda4..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_4-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_4-thickbox.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_4-thickbox.jpg
deleted file mode 100644
index 40792a10d..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_4-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-home.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-home.jpg
deleted file mode 100644
index 3bca65a4c..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-large.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-large.jpg
deleted file mode 100644
index 2e0dbd4d7..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-medium.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-medium.jpg
deleted file mode 100644
index 59fa5baba..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-small.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-small.jpg
deleted file mode 100644
index 5c93dcb28..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-thickbox.jpg b/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-thickbox.jpg
deleted file mode 100644
index d0b9d51ec..000000000
Binary files a/install-dev/fixtures/apple/img/p/MacBook_Air_SuperDrive-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-home.jpg b/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-home.jpg
deleted file mode 100644
index b425f24e6..000000000
Binary files a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-large.jpg b/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-large.jpg
deleted file mode 100644
index c9b0085a4..000000000
Binary files a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-medium.jpg b/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-medium.jpg
deleted file mode 100644
index 976f94e3d..000000000
Binary files a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-small.jpg b/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-small.jpg
deleted file mode 100644
index b8d3855b5..000000000
Binary files a/install-dev/fixtures/apple/img/p/Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/de-default-home_default.jpg b/install-dev/fixtures/apple/img/p/de-default-home_default.jpg
new file mode 100644
index 000000000..d97df3a04
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/de-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/de-default-large_default.jpg b/install-dev/fixtures/apple/img/p/de-default-large_default.jpg
new file mode 100644
index 000000000..4d22e5311
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/de-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/de-default-medium_default.jpg b/install-dev/fixtures/apple/img/p/de-default-medium_default.jpg
new file mode 100644
index 000000000..6fa9785c6
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/de-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/de-default-small_default.jpg b/install-dev/fixtures/apple/img/p/de-default-small_default.jpg
new file mode 100644
index 000000000..b11c97f96
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/de-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/de-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/de-default-thickbox_default.jpg
new file mode 100644
index 000000000..c37db2680
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/de-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/de.jpg b/install-dev/fixtures/apple/img/p/de.jpg
new file mode 100644
index 000000000..43716f653
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/de.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/en-default-home_default.jpg b/install-dev/fixtures/apple/img/p/en-default-home_default.jpg
new file mode 100644
index 000000000..f72a53f52
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/en-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/en-default-large_default.jpg b/install-dev/fixtures/apple/img/p/en-default-large_default.jpg
new file mode 100644
index 000000000..97001230c
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/en-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/en-default-medium_default.jpg b/install-dev/fixtures/apple/img/p/en-default-medium_default.jpg
new file mode 100644
index 000000000..67f952184
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/en-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/en-default-small_default.jpg b/install-dev/fixtures/apple/img/p/en-default-small_default.jpg
new file mode 100644
index 000000000..f16e7d7df
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/en-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/en-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/en-default-thickbox_default.jpg
new file mode 100644
index 000000000..603c1042a
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/en-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/en.jpg b/install-dev/fixtures/apple/img/p/en.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/en.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/es-default-home_default.jpg b/install-dev/fixtures/apple/img/p/es-default-home_default.jpg
new file mode 100644
index 000000000..0baa08130
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/es-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/es-default-large_default.jpg b/install-dev/fixtures/apple/img/p/es-default-large_default.jpg
new file mode 100644
index 000000000..4525c3f34
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/es-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/es-default-medium_default.jpg b/install-dev/fixtures/apple/img/p/es-default-medium_default.jpg
new file mode 100644
index 000000000..fb56ac222
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/es-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/es-default-small_default.jpg b/install-dev/fixtures/apple/img/p/es-default-small_default.jpg
new file mode 100644
index 000000000..bdff337f1
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/es-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/es-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/es-default-thickbox_default.jpg
new file mode 100644
index 000000000..ee70abbd0
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/es-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/es.jpg b/install-dev/fixtures/apple/img/p/es.jpg
new file mode 100644
index 000000000..28d7b8c81
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/es.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/fr-default-home_default.jpg b/install-dev/fixtures/apple/img/p/fr-default-home_default.jpg
new file mode 100644
index 000000000..95e0d4f99
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/fr-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/fr-default-large_default.jpg b/install-dev/fixtures/apple/img/p/fr-default-large_default.jpg
new file mode 100644
index 000000000..9598bd885
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/fr-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/fr-default-medium_default.jpg b/install-dev/fixtures/apple/img/p/fr-default-medium_default.jpg
new file mode 100644
index 000000000..b8e29adee
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/fr-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/fr-default-small_default.jpg b/install-dev/fixtures/apple/img/p/fr-default-small_default.jpg
new file mode 100644
index 000000000..7ae143a06
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/fr-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/fr-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/fr-default-thickbox_default.jpg
new file mode 100644
index 000000000..4d7cef147
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/fr-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/fr.jpg b/install-dev/fixtures/apple/img/p/fr.jpg
new file mode 100644
index 000000000..ed443472f
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/fr.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-home.jpg b/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-home.jpg
deleted file mode 100644
index be6b9bfb6..000000000
Binary files a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-large.jpg b/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-large.jpg
deleted file mode 100644
index e76add6ff..000000000
Binary files a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-medium.jpg b/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-medium.jpg
deleted file mode 100644
index 589f7b1fc..000000000
Binary files a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-small.jpg b/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-small.jpg
deleted file mode 100644
index d8387d720..000000000
Binary files a/install-dev/fixtures/apple/img/p/housse-portefeuille-en-cuir-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano-home.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano-home.jpg
deleted file mode 100644
index d2524dd50..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano-large.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano-large.jpg
deleted file mode 100644
index 3f0811c48..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano-medium.jpg
deleted file mode 100644
index 40ac7376c..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano-small.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano-small.jpg
deleted file mode 100644
index bdad883b1..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_1-home.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_1-home.jpg
deleted file mode 100644
index 6e7e669dc..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_1-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_1-large.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_1-large.jpg
deleted file mode 100644
index 23c96e7e7..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_1-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_1-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_1-medium.jpg
deleted file mode 100644
index 5738012f2..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_1-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_2-home.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_2-home.jpg
deleted file mode 100644
index 070cb36fd..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_2-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_2-large.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_2-large.jpg
deleted file mode 100644
index 8899a5307..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_2-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_2-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_2-medium.jpg
deleted file mode 100644
index 495139111..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_2-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_2-small.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_2-small.jpg
deleted file mode 100644
index 76ed19637..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_2-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_3-home.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_3-home.jpg
deleted file mode 100644
index f2185344f..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_3-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_3-large.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_3-large.jpg
deleted file mode 100644
index 3c7335636..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_3-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_3-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_3-medium.jpg
deleted file mode 100644
index 4983edd1b..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_3-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_3-small.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_3-small.jpg
deleted file mode 100644
index 9c9fba574..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_3-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_4-home.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_4-home.jpg
deleted file mode 100644
index 4cc4d1459..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_4-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_4-large.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_4-large.jpg
deleted file mode 100644
index 6d49212e5..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_4-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_4-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_4-medium.jpg
deleted file mode 100644
index cd8bf0144..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_4-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_4-small.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_4-small.jpg
deleted file mode 100644
index 10f9b7bf8..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_4-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_5-home.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_5-home.jpg
deleted file mode 100644
index 0d4e00d70..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_5-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_5-large.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_5-large.jpg
deleted file mode 100644
index cea8bfb47..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_5-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_5-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_5-medium.jpg
deleted file mode 100644
index 48896148e..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_5-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_5-small.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_5-small.jpg
deleted file mode 100644
index b13d06620..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_5-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_6-large.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_6-large.jpg
deleted file mode 100644
index 65c655f64..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_6-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_6-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_6-medium.jpg
deleted file mode 100644
index b413227eb..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_6-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_7-home.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_7-home.jpg
deleted file mode 100644
index 252c224b7..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_7-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_7-large.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_7-large.jpg
deleted file mode 100644
index a8b59eb60..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_7-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_7-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_7-medium.jpg
deleted file mode 100644
index e81078029..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_7-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_Nano_7-small.jpg b/install-dev/fixtures/apple/img/p/iPod_Nano_7-small.jpg
deleted file mode 100644
index 0cd7111a5..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_Nano_7-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle-home.jpg b/install-dev/fixtures/apple/img/p/iPod_shuffle-home.jpg
deleted file mode 100644
index 00c69c251..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_shuffle-medium.jpg
deleted file mode 100644
index 459b717bd..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_1-home.jpg b/install-dev/fixtures/apple/img/p/iPod_shuffle_1-home.jpg
deleted file mode 100644
index 9f86fd81e..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle_1-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_2-home.jpg b/install-dev/fixtures/apple/img/p/iPod_shuffle_2-home.jpg
deleted file mode 100644
index f791ddec5..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle_2-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_3-home.jpg b/install-dev/fixtures/apple/img/p/iPod_shuffle_3-home.jpg
deleted file mode 100644
index 409018f98..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle_3-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_shuffle_3-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_shuffle_3-medium.jpg
deleted file mode 100644
index d8a5860ba..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_shuffle_3-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch-home.jpg b/install-dev/fixtures/apple/img/p/iPod_touch-home.jpg
deleted file mode 100644
index 521f53d7a..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch-large.jpg b/install-dev/fixtures/apple/img/p/iPod_touch-large.jpg
deleted file mode 100644
index ebf8e8181..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_touch-medium.jpg
deleted file mode 100644
index 742b7557c..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch-small.jpg b/install-dev/fixtures/apple/img/p/iPod_touch-small.jpg
deleted file mode 100644
index 7a392b266..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch-thickbox.jpg b/install-dev/fixtures/apple/img/p/iPod_touch-thickbox.jpg
deleted file mode 100644
index 04b05f22e..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_1-home.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_1-home.jpg
deleted file mode 100644
index 4beaa3572..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_1-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_1-large.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_1-large.jpg
deleted file mode 100644
index 05cf1ab8c..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_1-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_1-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_1-medium.jpg
deleted file mode 100644
index 936977ea1..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_1-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_1-small.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_1-small.jpg
deleted file mode 100644
index d03c25b34..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_1-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_1-thickbox.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_1-thickbox.jpg
deleted file mode 100644
index ccc449ab3..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_1-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_2-home.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_2-home.jpg
deleted file mode 100644
index 45d5feca4..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_2-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_2-large.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_2-large.jpg
deleted file mode 100644
index 17e8c5ab5..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_2-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_2-small.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_2-small.jpg
deleted file mode 100644
index bcef1823c..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_2-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_2-thickbox.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_2-thickbox.jpg
deleted file mode 100644
index d98a8138e..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_2-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_3-home.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_3-home.jpg
deleted file mode 100644
index 21eef263e..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_3-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_3-large.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_3-large.jpg
deleted file mode 100644
index 47c2f0344..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_3-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_3-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_3-medium.jpg
deleted file mode 100644
index d6137b120..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_3-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_3-small.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_3-small.jpg
deleted file mode 100644
index bd0cfb3d9..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_3-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_3-thickbox.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_3-thickbox.jpg
deleted file mode 100644
index e46520099..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_3-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_4-home.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_4-home.jpg
deleted file mode 100644
index 232525010..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_4-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_4-large.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_4-large.jpg
deleted file mode 100644
index 05d715d7b..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_4-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_4-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_4-medium.jpg
deleted file mode 100644
index 64cd3ed5a..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_4-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_4-thickbox.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_4-thickbox.jpg
deleted file mode 100644
index 084e95a94..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_4-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_5-home.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_5-home.jpg
deleted file mode 100644
index 664760b2b..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_5-home.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_5-large.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_5-large.jpg
deleted file mode 100644
index 0838ba48b..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_5-large.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_5-medium.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_5-medium.jpg
deleted file mode 100644
index bd08ff689..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_5-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_5-small.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_5-small.jpg
deleted file mode 100644
index 9e681aa80..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_5-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/iPod_touch_5-thickbox.jpg b/install-dev/fixtures/apple/img/p/iPod_touch_5-thickbox.jpg
deleted file mode 100644
index 3beb6d91a..000000000
Binary files a/install-dev/fixtures/apple/img/p/iPod_touch_5-thickbox.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/p/it-default-home_default.jpg b/install-dev/fixtures/apple/img/p/it-default-home_default.jpg
new file mode 100644
index 000000000..de61850aa
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/it-default-home_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/it-default-large_default.jpg b/install-dev/fixtures/apple/img/p/it-default-large_default.jpg
new file mode 100644
index 000000000..283d2bbf1
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/it-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/it-default-medium_default.jpg b/install-dev/fixtures/apple/img/p/it-default-medium_default.jpg
new file mode 100644
index 000000000..4b98f0c64
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/it-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/it-default-small_default.jpg b/install-dev/fixtures/apple/img/p/it-default-small_default.jpg
new file mode 100644
index 000000000..58eb5ab18
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/it-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/it-default-thickbox_default.jpg b/install-dev/fixtures/apple/img/p/it-default-thickbox_default.jpg
new file mode 100644
index 000000000..96fc64a4e
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/it-default-thickbox_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/p/it.jpg b/install-dev/fixtures/apple/img/p/it.jpg
new file mode 100644
index 000000000..94802add7
Binary files /dev/null and b/install-dev/fixtures/apple/img/p/it.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/The_iPods_Nano-thumb_scene.jpg b/install-dev/fixtures/apple/img/scenes/1-m_scene_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/scenes/The_iPods_Nano-thumb_scene.jpg
rename to install-dev/fixtures/apple/img/scenes/1-m_scene_default.jpg
diff --git a/install-dev/fixtures/apple/img/scenes/1-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/1-scene_default.jpg
new file mode 100644
index 000000000..a371469b3
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/1-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/The_iPods_Nano.jpg b/install-dev/fixtures/apple/img/scenes/1.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/scenes/The_iPods_Nano.jpg
rename to install-dev/fixtures/apple/img/scenes/1.jpg
diff --git a/install-dev/fixtures/apple/img/scenes/The_iPods-thumb_scene.jpg b/install-dev/fixtures/apple/img/scenes/2-m_scene_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/scenes/The_iPods-thumb_scene.jpg
rename to install-dev/fixtures/apple/img/scenes/2-m_scene_default.jpg
diff --git a/install-dev/fixtures/apple/img/scenes/2-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/2-scene_default.jpg
new file mode 100644
index 000000000..ecc44a200
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/2-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/The_iPods.jpg b/install-dev/fixtures/apple/img/scenes/2.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/scenes/The_iPods.jpg
rename to install-dev/fixtures/apple/img/scenes/2.jpg
diff --git a/install-dev/fixtures/apple/img/scenes/The_MacBooks-thumb_scene.jpg b/install-dev/fixtures/apple/img/scenes/3-m_scene_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/scenes/The_MacBooks-thumb_scene.jpg
rename to install-dev/fixtures/apple/img/scenes/3-m_scene_default.jpg
diff --git a/install-dev/fixtures/apple/img/scenes/3-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/3-scene_default.jpg
new file mode 100644
index 000000000..684897573
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/3-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/The_MacBooks.jpg b/install-dev/fixtures/apple/img/scenes/3.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/scenes/The_MacBooks.jpg
rename to install-dev/fixtures/apple/img/scenes/3.jpg
diff --git a/install-dev/fixtures/apple/img/scenes/4-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/4-m_scene_default.jpg
new file mode 100644
index 000000000..52d91bad8
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/4-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/4-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/4-scene_default.jpg
new file mode 100644
index 000000000..a371469b3
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/4-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/4.jpg b/install-dev/fixtures/apple/img/scenes/4.jpg
new file mode 100644
index 000000000..d5ece377f
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/4.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/5-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/5-m_scene_default.jpg
new file mode 100644
index 000000000..367463150
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/5-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/5-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/5-scene_default.jpg
new file mode 100644
index 000000000..ecc44a200
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/5-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/5.jpg b/install-dev/fixtures/apple/img/scenes/5.jpg
new file mode 100644
index 000000000..19ba0dfc8
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/5.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/6-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/6-m_scene_default.jpg
new file mode 100644
index 000000000..853c91ca7
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/6-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/6-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/6-scene_default.jpg
new file mode 100644
index 000000000..684897573
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/6-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/6.jpg b/install-dev/fixtures/apple/img/scenes/6.jpg
new file mode 100644
index 000000000..16de52e68
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/6.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/The_MacBooks-large_scene.jpg b/install-dev/fixtures/apple/img/scenes/The_MacBooks-large_scene.jpg
deleted file mode 100644
index a3a450f2e..000000000
Binary files a/install-dev/fixtures/apple/img/scenes/The_MacBooks-large_scene.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/scenes/The_iPods-large_scene.jpg b/install-dev/fixtures/apple/img/scenes/The_iPods-large_scene.jpg
deleted file mode 100644
index 6239ff2f2..000000000
Binary files a/install-dev/fixtures/apple/img/scenes/The_iPods-large_scene.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/scenes/The_iPods_Nano-large_scene.jpg b/install-dev/fixtures/apple/img/scenes/The_iPods_Nano-large_scene.jpg
deleted file mode 100644
index 80d75bdf0..000000000
Binary files a/install-dev/fixtures/apple/img/scenes/The_iPods_Nano-large_scene.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/scenes/de-default-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/de-default-m_scene_default.jpg
new file mode 100644
index 000000000..29d95cc74
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/de-default-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/de-default-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/de-default-scene_default.jpg
new file mode 100644
index 000000000..10468c5c2
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/de-default-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/de.jpg b/install-dev/fixtures/apple/img/scenes/de.jpg
new file mode 100644
index 000000000..43716f653
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/de.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/en-default-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/en-default-m_scene_default.jpg
new file mode 100644
index 000000000..f82f855ab
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/en-default-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/en-default-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/en-default-scene_default.jpg
new file mode 100644
index 000000000..12125b651
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/en-default-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/en.jpg b/install-dev/fixtures/apple/img/scenes/en.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/en.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/es-default-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/es-default-m_scene_default.jpg
new file mode 100644
index 000000000..de2b7865f
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/es-default-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/es-default-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/es-default-scene_default.jpg
new file mode 100644
index 000000000..6deb71142
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/es-default-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/es.jpg b/install-dev/fixtures/apple/img/scenes/es.jpg
new file mode 100644
index 000000000..28d7b8c81
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/es.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/fr-default-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/fr-default-m_scene_default.jpg
new file mode 100644
index 000000000..81b265ae3
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/fr-default-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/fr-default-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/fr-default-scene_default.jpg
new file mode 100644
index 000000000..5eab5d09d
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/fr-default-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/fr.jpg b/install-dev/fixtures/apple/img/scenes/fr.jpg
new file mode 100644
index 000000000..ed443472f
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/fr.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/it-default-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/it-default-m_scene_default.jpg
new file mode 100644
index 000000000..03b028c84
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/it-default-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/it-default-scene_default.jpg b/install-dev/fixtures/apple/img/scenes/it-default-scene_default.jpg
new file mode 100644
index 000000000..43b7deb87
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/it-default-scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/it.jpg b/install-dev/fixtures/apple/img/scenes/it.jpg
new file mode 100644
index 000000000..94802add7
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/it.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/thumbs/The_iPods_Nano-thumb_scene.jpg b/install-dev/fixtures/apple/img/scenes/thumbs/1-m_scene_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/scenes/thumbs/The_iPods_Nano-thumb_scene.jpg
rename to install-dev/fixtures/apple/img/scenes/thumbs/1-m_scene_default.jpg
diff --git a/install-dev/fixtures/apple/img/scenes/thumbs/The_iPods-thumb_scene.jpg b/install-dev/fixtures/apple/img/scenes/thumbs/2-m_scene_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/scenes/thumbs/The_iPods-thumb_scene.jpg
rename to install-dev/fixtures/apple/img/scenes/thumbs/2-m_scene_default.jpg
diff --git a/install-dev/fixtures/apple/img/scenes/thumbs/The_MacBooks-thumb_scene.jpg b/install-dev/fixtures/apple/img/scenes/thumbs/3-m_scene_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/scenes/thumbs/The_MacBooks-thumb_scene.jpg
rename to install-dev/fixtures/apple/img/scenes/thumbs/3-m_scene_default.jpg
diff --git a/install-dev/fixtures/apple/img/scenes/thumbs/4-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/thumbs/4-m_scene_default.jpg
new file mode 100644
index 000000000..d39f00884
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/thumbs/4-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/thumbs/5-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/thumbs/5-m_scene_default.jpg
new file mode 100644
index 000000000..c21b53279
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/thumbs/5-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/scenes/thumbs/6-m_scene_default.jpg b/install-dev/fixtures/apple/img/scenes/thumbs/6-m_scene_default.jpg
new file mode 100644
index 000000000..3efcb3b59
Binary files /dev/null and b/install-dev/fixtures/apple/img/scenes/thumbs/6-m_scene_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/Coconut_Grove-medium.jpg b/install-dev/fixtures/apple/img/st/1-medium_default.jpg
similarity index 95%
rename from install-dev/fixtures/apple/img/st/Coconut_Grove-medium.jpg
rename to install-dev/fixtures/apple/img/st/1-medium_default.jpg
index cbdb7a7d8..7858a56be 100644
Binary files a/install-dev/fixtures/apple/img/st/Coconut_Grove-medium.jpg and b/install-dev/fixtures/apple/img/st/1-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/Coconut_Grove.jpg b/install-dev/fixtures/apple/img/st/1.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/st/Coconut_Grove.jpg
rename to install-dev/fixtures/apple/img/st/1.jpg
diff --git a/install-dev/fixtures/apple/img/st/Dade_County-medium.jpg b/install-dev/fixtures/apple/img/st/10-medium_default.jpg
similarity index 95%
rename from install-dev/fixtures/apple/img/st/Dade_County-medium.jpg
rename to install-dev/fixtures/apple/img/st/10-medium_default.jpg
index cbdb7a7d8..7858a56be 100644
Binary files a/install-dev/fixtures/apple/img/st/Dade_County-medium.jpg and b/install-dev/fixtures/apple/img/st/10-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/Dade_County.jpg b/install-dev/fixtures/apple/img/st/10.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/st/Dade_County.jpg
rename to install-dev/fixtures/apple/img/st/10.jpg
diff --git a/install-dev/fixtures/apple/img/st/E_Fort_Lauderdale-medium.jpg b/install-dev/fixtures/apple/img/st/2-medium_default.jpg
similarity index 95%
rename from install-dev/fixtures/apple/img/st/E_Fort_Lauderdale-medium.jpg
rename to install-dev/fixtures/apple/img/st/2-medium_default.jpg
index cbdb7a7d8..7858a56be 100644
Binary files a/install-dev/fixtures/apple/img/st/E_Fort_Lauderdale-medium.jpg and b/install-dev/fixtures/apple/img/st/2-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/E_Fort_Lauderdale.jpg b/install-dev/fixtures/apple/img/st/2.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/st/E_Fort_Lauderdale.jpg
rename to install-dev/fixtures/apple/img/st/2.jpg
diff --git a/install-dev/fixtures/apple/img/st/N_Miami_Biscayne-medium.jpg b/install-dev/fixtures/apple/img/st/3-medium_default.jpg
similarity index 95%
rename from install-dev/fixtures/apple/img/st/N_Miami_Biscayne-medium.jpg
rename to install-dev/fixtures/apple/img/st/3-medium_default.jpg
index cbdb7a7d8..7858a56be 100644
Binary files a/install-dev/fixtures/apple/img/st/N_Miami_Biscayne-medium.jpg and b/install-dev/fixtures/apple/img/st/3-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/N_Miami_Biscayne.jpg b/install-dev/fixtures/apple/img/st/3.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/st/N_Miami_Biscayne.jpg
rename to install-dev/fixtures/apple/img/st/3.jpg
diff --git a/install-dev/fixtures/apple/img/st/4-medium_default.jpg b/install-dev/fixtures/apple/img/st/4-medium_default.jpg
new file mode 100644
index 000000000..7858a56be
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/4-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/Pembroke_Pines.jpg b/install-dev/fixtures/apple/img/st/4.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/st/Pembroke_Pines.jpg
rename to install-dev/fixtures/apple/img/st/4.jpg
diff --git a/install-dev/fixtures/apple/img/st/5-medium_default.jpg b/install-dev/fixtures/apple/img/st/5-medium_default.jpg
new file mode 100644
index 000000000..7858a56be
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/5-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/5.jpg b/install-dev/fixtures/apple/img/st/5.jpg
new file mode 100644
index 000000000..34b45eee6
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/5.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/6-medium_default.jpg b/install-dev/fixtures/apple/img/st/6-medium_default.jpg
new file mode 100644
index 000000000..7858a56be
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/6-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/6.jpg b/install-dev/fixtures/apple/img/st/6.jpg
new file mode 100644
index 000000000..34b45eee6
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/6.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/7-medium_default.jpg b/install-dev/fixtures/apple/img/st/7-medium_default.jpg
new file mode 100644
index 000000000..7858a56be
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/7-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/7.jpg b/install-dev/fixtures/apple/img/st/7.jpg
new file mode 100644
index 000000000..34b45eee6
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/7.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/8-medium_default.jpg b/install-dev/fixtures/apple/img/st/8-medium_default.jpg
new file mode 100644
index 000000000..7858a56be
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/8-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/8.jpg b/install-dev/fixtures/apple/img/st/8.jpg
new file mode 100644
index 000000000..34b45eee6
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/8.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/9-medium_default.jpg b/install-dev/fixtures/apple/img/st/9-medium_default.jpg
new file mode 100644
index 000000000..7858a56be
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/9-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/9.jpg b/install-dev/fixtures/apple/img/st/9.jpg
new file mode 100644
index 000000000..34b45eee6
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/9.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/Pembroke_Pines-medium.jpg b/install-dev/fixtures/apple/img/st/Pembroke_Pines-medium.jpg
deleted file mode 100644
index cbdb7a7d8..000000000
Binary files a/install-dev/fixtures/apple/img/st/Pembroke_Pines-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/st/de-default-medium_default.jpg b/install-dev/fixtures/apple/img/st/de-default-medium_default.jpg
new file mode 100644
index 000000000..6fa9785c6
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/de-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/de.jpg b/install-dev/fixtures/apple/img/st/de.jpg
new file mode 100644
index 000000000..43716f653
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/de.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/en-default-medium_default.jpg b/install-dev/fixtures/apple/img/st/en-default-medium_default.jpg
new file mode 100644
index 000000000..67f952184
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/en-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/en.jpg b/install-dev/fixtures/apple/img/st/en.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/en.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/es-default-medium_default.jpg b/install-dev/fixtures/apple/img/st/es-default-medium_default.jpg
new file mode 100644
index 000000000..fb56ac222
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/es-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/es.jpg b/install-dev/fixtures/apple/img/st/es.jpg
new file mode 100644
index 000000000..28d7b8c81
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/es.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/fr-default-medium_default.jpg b/install-dev/fixtures/apple/img/st/fr-default-medium_default.jpg
new file mode 100644
index 000000000..b8e29adee
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/fr-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/fr.jpg b/install-dev/fixtures/apple/img/st/fr.jpg
new file mode 100644
index 000000000..ed443472f
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/fr.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/it-default-medium_default.jpg b/install-dev/fixtures/apple/img/st/it-default-medium_default.jpg
new file mode 100644
index 000000000..4b98f0c64
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/it-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/st/it.jpg b/install-dev/fixtures/apple/img/st/it.jpg
new file mode 100644
index 000000000..94802add7
Binary files /dev/null and b/install-dev/fixtures/apple/img/st/it.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/AppleStore-large.jpg b/install-dev/fixtures/apple/img/su/1-large_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/su/AppleStore-large.jpg
rename to install-dev/fixtures/apple/img/su/1-large_default.jpg
diff --git a/install-dev/fixtures/apple/img/su/AppleStore-medium.jpg b/install-dev/fixtures/apple/img/su/1-medium_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/su/AppleStore-medium.jpg
rename to install-dev/fixtures/apple/img/su/1-medium_default.jpg
diff --git a/install-dev/fixtures/apple/img/su/AppleStore-small.jpg b/install-dev/fixtures/apple/img/su/1-small_default.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/su/AppleStore-small.jpg
rename to install-dev/fixtures/apple/img/su/1-small_default.jpg
diff --git a/install-dev/fixtures/apple/img/su/AppleStore.jpg b/install-dev/fixtures/apple/img/su/1.jpg
similarity index 100%
rename from install-dev/fixtures/apple/img/su/AppleStore.jpg
rename to install-dev/fixtures/apple/img/su/1.jpg
diff --git a/install-dev/fixtures/apple/img/su/2-large_default.jpg b/install-dev/fixtures/apple/img/su/2-large_default.jpg
new file mode 100644
index 000000000..1b3d0f0ff
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/2-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/2-medium_default.jpg b/install-dev/fixtures/apple/img/su/2-medium_default.jpg
new file mode 100644
index 000000000..a3908a1d6
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/2-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/2-small_default.jpg b/install-dev/fixtures/apple/img/su/2-small_default.jpg
new file mode 100644
index 000000000..cdbe607ec
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/2-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/2.jpg b/install-dev/fixtures/apple/img/su/2.jpg
new file mode 100644
index 000000000..f64258f9a
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/2.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/3-large_default.jpg b/install-dev/fixtures/apple/img/su/3-large_default.jpg
new file mode 100644
index 000000000..37d42738c
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/3-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/3-medium_default.jpg b/install-dev/fixtures/apple/img/su/3-medium_default.jpg
new file mode 100644
index 000000000..b1fb6b9af
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/3-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/3-small_default.jpg b/install-dev/fixtures/apple/img/su/3-small_default.jpg
new file mode 100644
index 000000000..c68cfc942
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/3-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/3.jpg b/install-dev/fixtures/apple/img/su/3.jpg
new file mode 100644
index 000000000..223ea51a9
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/3.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/4-large_default.jpg b/install-dev/fixtures/apple/img/su/4-large_default.jpg
new file mode 100644
index 000000000..1b3d0f0ff
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/4-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/4-medium_default.jpg b/install-dev/fixtures/apple/img/su/4-medium_default.jpg
new file mode 100644
index 000000000..a3908a1d6
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/4-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/4-small_default.jpg b/install-dev/fixtures/apple/img/su/4-small_default.jpg
new file mode 100644
index 000000000..cdbe607ec
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/4-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/4.jpg b/install-dev/fixtures/apple/img/su/4.jpg
new file mode 100644
index 000000000..f64258f9a
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/4.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/Shure_Online_Store-medium.jpg b/install-dev/fixtures/apple/img/su/Shure_Online_Store-medium.jpg
deleted file mode 100644
index 66d982e01..000000000
Binary files a/install-dev/fixtures/apple/img/su/Shure_Online_Store-medium.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/su/Shure_Online_Store-small.jpg b/install-dev/fixtures/apple/img/su/Shure_Online_Store-small.jpg
deleted file mode 100644
index 0137799f6..000000000
Binary files a/install-dev/fixtures/apple/img/su/Shure_Online_Store-small.jpg and /dev/null differ
diff --git a/install-dev/fixtures/apple/img/su/de-default-large_default.jpg b/install-dev/fixtures/apple/img/su/de-default-large_default.jpg
new file mode 100644
index 000000000..4d22e5311
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/de-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/de-default-medium_default.jpg b/install-dev/fixtures/apple/img/su/de-default-medium_default.jpg
new file mode 100644
index 000000000..6fa9785c6
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/de-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/de-default-small_default.jpg b/install-dev/fixtures/apple/img/su/de-default-small_default.jpg
new file mode 100644
index 000000000..b11c97f96
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/de-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/de.jpg b/install-dev/fixtures/apple/img/su/de.jpg
new file mode 100644
index 000000000..43716f653
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/de.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/en-default-large_default.jpg b/install-dev/fixtures/apple/img/su/en-default-large_default.jpg
new file mode 100644
index 000000000..97001230c
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/en-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/en-default-medium_default.jpg b/install-dev/fixtures/apple/img/su/en-default-medium_default.jpg
new file mode 100644
index 000000000..67f952184
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/en-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/en-default-small_default.jpg b/install-dev/fixtures/apple/img/su/en-default-small_default.jpg
new file mode 100644
index 000000000..f16e7d7df
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/en-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/en.jpg b/install-dev/fixtures/apple/img/su/en.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/en.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/es-default-large_default.jpg b/install-dev/fixtures/apple/img/su/es-default-large_default.jpg
new file mode 100644
index 000000000..4525c3f34
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/es-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/es-default-medium_default.jpg b/install-dev/fixtures/apple/img/su/es-default-medium_default.jpg
new file mode 100644
index 000000000..fb56ac222
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/es-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/es-default-small_default.jpg b/install-dev/fixtures/apple/img/su/es-default-small_default.jpg
new file mode 100644
index 000000000..bdff337f1
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/es-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/es.jpg b/install-dev/fixtures/apple/img/su/es.jpg
new file mode 100644
index 000000000..28d7b8c81
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/es.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/fr-default-large_default.jpg b/install-dev/fixtures/apple/img/su/fr-default-large_default.jpg
new file mode 100644
index 000000000..9598bd885
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/fr-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/fr-default-medium_default.jpg b/install-dev/fixtures/apple/img/su/fr-default-medium_default.jpg
new file mode 100644
index 000000000..b8e29adee
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/fr-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/fr-default-small_default.jpg b/install-dev/fixtures/apple/img/su/fr-default-small_default.jpg
new file mode 100644
index 000000000..7ae143a06
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/fr-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/fr.jpg b/install-dev/fixtures/apple/img/su/fr.jpg
new file mode 100644
index 000000000..ed443472f
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/fr.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/it-default-large_default.jpg b/install-dev/fixtures/apple/img/su/it-default-large_default.jpg
new file mode 100644
index 000000000..283d2bbf1
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/it-default-large_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/it-default-medium_default.jpg b/install-dev/fixtures/apple/img/su/it-default-medium_default.jpg
new file mode 100644
index 000000000..4b98f0c64
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/it-default-medium_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/it-default-small_default.jpg b/install-dev/fixtures/apple/img/su/it-default-small_default.jpg
new file mode 100644
index 000000000..58eb5ab18
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/it-default-small_default.jpg differ
diff --git a/install-dev/fixtures/apple/img/su/it.jpg b/install-dev/fixtures/apple/img/su/it.jpg
new file mode 100644
index 000000000..94802add7
Binary files /dev/null and b/install-dev/fixtures/apple/img/su/it.jpg differ
diff --git a/modules/blockbestsellers/blockbestsellers-home.tpl b/modules/blockbestsellers/blockbestsellers-home.tpl
index 481d02569..25ca21cbe 100644
--- a/modules/blockbestsellers/blockbestsellers-home.tpl
+++ b/modules/blockbestsellers/blockbestsellers-home.tpl
@@ -39,7 +39,7 @@
-
+