Tireg

diff --git a/src/core/meta-workspace-manager.c b/src/core/meta-workspace-manager.c
index af73447..c45b927 100644
--- a/src/core/meta-workspace-manager.c
+++ b/src/core/meta-workspace-manager.c
@@ -41,6 +41,7 @@ enum
   WORKSPACE_ADDED,
   WORKSPACE_REMOVED,
   WORKSPACE_SWITCHED,
+  WORKSPACES_REORDERED,
   ACTIVE_WORKSPACE_CHANGED,

Tireg

diff --git a/data/20_elementary.pantheon.wm.gschema.override b/data/20_elementary.pantheon.wm.gschema.override
new file mode 100644
index 0000000..ef292ee
--- /dev/null
+++ b/data/20_elementary.pantheon.wm.gschema.override
@@ -0,0 +1,6 @@
+[org.gnome.mutter:Pantheon]
+dynamic-workspaces = true
+attach-modal-dialogs = false
+button-layout = 'close:maximize'

Tireg

diff --git a/src/Background/SystemBackground.vala b/src/Background/SystemBackground.vala
index 4ca70ab..18210be 100644
--- a/src/Background/SystemBackground.vala
+++ b/src/Background/SystemBackground.vala
@@ -17,7 +17,7 @@
 
 namespace Gala
 {
-#if HAS_MUTTER334
+#if HAS_MUTTER332

Tireg

diff --git a/src/compositor/meta-background-group.c b/src/compositor/meta-background-group.c
index f3c125ab0390e8fb046a4ae917fd330cdfc20912..e30b8af4c8c1e97a4d7b640a93bcb0c8dd70ea47 100644
--- a/src/compositor/meta-background-group.c
+++ b/src/compositor/meta-background-group.c
@@ -19,11 +19,6 @@
 #include "compositor/meta-cullable.h"
 #include "meta/meta-background-group.h"
 
-struct _MetaBackgroundGroup
-{

Tireg

diff --git a/wingpanel-interface/BackgroundManager.vala b/wingpanel-interface/BackgroundManager.vala
index 2850cbf..65887b8 100644
--- a/wingpanel-interface/BackgroundManager.vala
+++ b/wingpanel-interface/BackgroundManager.vala
@@ -60,7 +60,7 @@ public class WingpanelInterface.BackgroundManager : Object {
     }
 
     private void connect_signals () {
-        Main.screen.workspace_switched.connect (() => {
+        Main.display.get_workspace_manager ().workspace_switched.connect (() => {

Tireg

diff --git a/compositor/DBusAccelerator.vala b/compositor/DBusAccelerator.vala
index c799870..be31a59 100644
--- a/compositor/DBusAccelerator.vala
+++ b/compositor/DBusAccelerator.vala
@@ -74,7 +74,7 @@ namespace GreeterCompositor {
             wm = _wm;
             grabbed_accelerators = new GLib.List<GrabbedAccelerator> ();
 
-            wm.get_screen ().get_display ().accelerator_activated.connect (on_accelerator_activated);
+            wm.get_display ().accelerator_activated.connect (on_accelerator_activated);

Tireg

// This file should be in ${METADATA_DIR} and be named Meta-3.metadata

// Valid header for namespaces
Backend                           cheader_filename="meta/main.h"
Background                        cheader_filename="meta/meta-background.h"
BackgroundActor                   cheader_filename="meta/meta-background-actor.h"
BackgroundGroup                   cheader_filename="meta/meta-background-group.h"
BackgroundImage                   cheader_filename="meta/meta-background-image.h"
BackgroundImageCache              cheader_filename="meta/meta-background-image.h"

Tireg

diff --git a/data/20_elementary.pantheon.wm.gschema.override b/data/20_elementary.pantheon.wm.gschema.override
new file mode 100644
index 0000000..ef292ee
--- /dev/null
+++ b/data/20_elementary.pantheon.wm.gschema.override
@@ -0,0 +1,6 @@
+[org.gnome.mutter:Pantheon]
+dynamic-workspaces = true
+attach-modal-dialogs = false
+button-layout = 'close:maximize'

Tireg

diff --git a/lib/meson.build b/lib/meson.build
index 3c2a0c4..d100a50 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -25,7 +25,6 @@ gala_lib = shared_library(
 	version : '0.0.0',
 	vala_args: [
 		'--pkg', 'config',
-		'--pkg', 'compat',
 	],

Tireg

diff --git a/lib/Utils.vala b/lib/Utils.vala
index 5832118..408f816 100644
--- a/lib/Utils.vala
+++ b/lib/Utils.vala
@@ -187,8 +187,7 @@ namespace Gala
 		 */
 		public static Meta.Window get_next_window (Meta.Workspace workspace, bool backward = false)
 		{
-			var screen = workspace.get_screen ();
-			var display = screen.get_display ();