diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index fa323fd..0dd25d2 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -35,8 +35,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         launcher:defaultScreen="2"
-        launcher:canonicalDeviceWidth="8"
-        launcher:canonicalDeviceHeight="4">
+        launcher:cellCountX="8"
+        launcher:cellCountY="4">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
diff --git a/res/layout-xlarge/workspace_screen.xml b/res/layout-xlarge/workspace_screen.xml
index aa892b9..6a34975 100644
--- a/res/layout-xlarge/workspace_screen.xml
+++ b/res/layout-xlarge/workspace_screen.xml
@@ -24,9 +24,7 @@
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:longAxisStartPadding="8dip"
-    launcher:longAxisEndPadding="8dip"
-    launcher:shortAxisStartPadding="8dip"
-    launcher:shortAxisEndPadding="8dip"
-    launcher:shortAxisCells="4"
-    launcher:longAxisCells="8" />
+    launcher:yAxisStartPadding="8dip"
+    launcher:yAxisEndPadding="8dip"
+    launcher:xAxisStartPadding="8dip"
+    launcher:xAxisEndPadding="8dip"/>