diff --git a/drupal-org-core.make b/drupal-org-core.make
index 081e6353ca438d2ec55c529667b6cd4669711f20..295b07c15d22f76293601e436f7ffc11c5ddf2e7 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -26,3 +26,14 @@ projects[drupal][patch][1137920] = http://drupal.org/files/1137920_responsive-to
 
 ; (Edit) Allow more Field API public API functions to act on a single field within an entity.
 projects[drupal][patch][1821906] = http://drupal.org/files/field_api_single_field-1821906-5.patch
+
+; Layout module bugfix
+projects[drupal][patch][1822998] = http://drupal.org/files/set-theme-for-layout.patch
+; Regions module
+projects[drupal][patch][1813910] = http://drupal.org/files/region-module-7.patch
+; Page library
+projects[drupal][patch][1787942] = http://drupal.org/files/pages-28.patch
+; Grid support
+projects[drupal][patch][1816650] = http://drupal.org/files/grids-in-core-18.patch
+; Responsive layout module
+projects[drupal][patch][1822950] = http://drupal.org/files/rlayout-1.patch
diff --git a/drupal-org.make b/drupal-org.make
index d467024a3bfa43583b2a16d20427a7e55ed090ea..f9d9d2cacb5e1d3a0cd022b5a891aae5808f5ab5 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -39,18 +39,6 @@ projects[aloha][version] = 2.0-alpha2
 ;projects[aloha][download][branch] = 8.x-2.x
 projects[aloha][subdir] = contrib
 
-projects[bunnypoint][type] = module
-projects[bunnypoint][version] = 1.0-alpha1
-;projects[bunnypoint][download][type] = git
-;projects[bunnypoint][download][branch] = 8.x-1.x
-projects[bunnypoint][subdir] = contrib
-
-projects[region][type] = module
-projects[region][version] = 1.0-alpha1
-;projects[region][download][type] = git
-;projects[region][download][branch] = 8.x-1.x
-projects[region][subdir] = contrib
-
 projects[admin_icons][type] = module
 projects[admin_icons][version] = 1.x-dev
 ;projects[admin_icons][download][type] = git
@@ -68,18 +56,6 @@ projects[edit][subdir] = contrib
 ;projects[ember][download][branch] = 8.x-1.x
 ;projects[ember][subdir] = contrib
 
-projects[gridbuilder][type] = module
-projects[gridbuilder][version] = 1.0-alpha1
-;projects[gridbuilder][download][type] = git
-;projects[gridbuilder][download][branch] = 8.x-1.x
-projects[gridbuilder][subdir] = contrib
-
-projects[layout][type] = module
-projects[layout][version] = 1.0-alpha1
-;projects[layout][download][type] = git
-;projects[layout][download][branch] = 8.x-1.x
-projects[layout][subdir] = contrib
-
 ;projects[every_field][type] = module
 ;projects[every_field][version] = 1.x-dev
 ;projects[every_field][subdir] = contrib
diff --git a/spark.info b/spark.info
index 62877541518327421a0c9476215e7ed408884323..fe0af4223da7d6ace281cdbdbc4d72dc80127a8a 100644
--- a/spark.info
+++ b/spark.info
@@ -46,8 +46,9 @@ dependencies[] = caption
 ;dependencies[] = edit
 ;dependencies[] = edit_aloha
 dependencies[] = layout
-dependencies[] = gridbuilder
+dependencies[] = rlayout
+dependencies[] = grid
 dependencies[] = region
-dependencies[] = bunnypoint
+dependencies[] = breakpoint
 ;dependencies[] = navbar
 ;dependencies[] = spark_demo