diff --git a/common/background-image.c b/common/background-image.c
index 2988c2e2..1a6c0df0 100644
--- a/common/background-image.c
+++ b/common/background-image.c
@@ -4,6 +4,24 @@
 #include "background-image.h"
 #include "cairo.h"
 
+enum background_mode parse_background_mode(const char *mode) {
+	if (strcmp(mode, "stretch") == 0) {
+		return BACKGROUND_MODE_STRETCH;
+	} else if (strcmp(mode, "fill") == 0) {
+		return BACKGROUND_MODE_FILL;
+	} else if (strcmp(mode, "fit") == 0) {
+		return BACKGROUND_MODE_FIT;
+	} else if (strcmp(mode, "center") == 0) {
+		return BACKGROUND_MODE_CENTER;
+	} else if (strcmp(mode, "tile") == 0) {
+		return BACKGROUND_MODE_TILE;
+	} else if (strcmp(mode, "solid_color") == 0) {
+		return BACKGROUND_MODE_SOLID_COLOR;
+	}
+	wlr_log(L_ERROR, "Unsupported background mode: %s", mode);
+	return BACKGROUND_MODE_INVALID;
+}
+
 cairo_surface_t *load_background_image(const char *path) {
 	cairo_surface_t *image;
 #ifdef HAVE_GDK_PIXBUF
@@ -35,8 +53,7 @@ cairo_surface_t *load_background_image(const char *path) {
 }
 
 void render_background_image(cairo_t *cairo, cairo_surface_t *image,
-		enum background_mode mode, int buffer_width, int buffer_height,
-		int buffer_scale) {
+		enum background_mode mode, int buffer_width, int buffer_height) {
 	double width = cairo_image_surface_get_width(image);
 	double height = cairo_image_surface_get_height(image);
 
@@ -93,6 +110,7 @@ void render_background_image(cairo_t *cairo, cairo_surface_t *image,
 		break;
 	}
 	case BACKGROUND_MODE_SOLID_COLOR:
+	case BACKGROUND_MODE_INVALID:
 		assert(0);
 		break;
 	}
diff --git a/include/background-image.h b/include/background-image.h
index e160e63d..15935ffd 100644
--- a/include/background-image.h
+++ b/include/background-image.h
@@ -9,11 +9,12 @@ enum background_mode {
 	BACKGROUND_MODE_CENTER,
 	BACKGROUND_MODE_TILE,
 	BACKGROUND_MODE_SOLID_COLOR,
+	BACKGROUND_MODE_INVALID,
 };
 
+enum background_mode parse_background_mode(const char *mode);
 cairo_surface_t *load_background_image(const char *path);
 void render_background_image(cairo_t *cairo, cairo_surface_t *image,
-		enum background_mode mode, int buffer_width, int buffer_height,
-		int buffer_scale);
+		enum background_mode mode, int buffer_width, int buffer_height);
 
 #endif
diff --git a/meson.build b/meson.build
index 01788fd9..d02a446b 100644
--- a/meson.build
+++ b/meson.build
@@ -35,6 +35,7 @@ gdk_pixbuf     = dependency('gdk-pixbuf-2.0', required: false)
 pixman         = dependency('pixman-1')
 libcap         = dependency('libcap')
 libinput       = dependency('libinput')
+libpam         = cc.find_library('libpam')
 math           = cc.find_library('m')
 rt             = cc.find_library('rt')
 git = find_program('git', required: false)
@@ -105,6 +106,7 @@ subdir('swaymsg')
 subdir('client')
 subdir('swaybg')
 subdir('swaybar')
+subdir('swaylock')
 
 config = configuration_data()
 config.set('sysconfdir', join_paths(prefix, sysconfdir))
diff --git a/swaybg/main.c b/swaybg/main.c
index ffefcd08..679b8c20 100644
--- a/swaybg/main.c
+++ b/swaybg/main.c
@@ -64,15 +64,17 @@ bool is_valid_color(const char *color) {
 }
 
 static void render_frame(struct swaybg_state *state) {
-	state->current_buffer = get_next_buffer(state->shm, state->buffers,
-		state->width * state->scale, state->height * state->scale);
+	int buffer_width = state->width * state->scale,
+		buffer_height = state->height * state->scale;
+	state->current_buffer = get_next_buffer(state->shm,
+			state->buffers, buffer_width, buffer_height);
 	cairo_t *cairo = state->current_buffer->cairo;
 	if (state->args->mode == BACKGROUND_MODE_SOLID_COLOR) {
 		cairo_set_source_u32(cairo, state->context.color);
 		cairo_paint(cairo);
 	} else {
 		render_background_image(cairo, state->context.image,
-				state->args->mode, state->width, state->height, state->scale);
+				state->args->mode, buffer_width, buffer_height);
 	}
 
 	wl_surface_set_buffer_scale(state->surface, state->scale);
@@ -193,24 +195,10 @@ int main(int argc, const char **argv) {
 	args.output_idx = atoi(argv[1]);
 	args.path = argv[2];
 
-	args.mode = BACKGROUND_MODE_STRETCH;
-	if (strcmp(argv[3], "stretch") == 0) {
-		args.mode = BACKGROUND_MODE_STRETCH;
-	} else if (strcmp(argv[3], "fill") == 0) {
-		args.mode = BACKGROUND_MODE_FILL;
-	} else if (strcmp(argv[3], "fit") == 0) {
-		args.mode = BACKGROUND_MODE_FIT;
-	} else if (strcmp(argv[3], "center") == 0) {
-		args.mode = BACKGROUND_MODE_CENTER;
-	} else if (strcmp(argv[3], "tile") == 0) {
-		args.mode = BACKGROUND_MODE_TILE;
-	} else if (strcmp(argv[3], "solid_color") == 0) {
-		args.mode = BACKGROUND_MODE_SOLID_COLOR;
-	} else {
-		wlr_log(L_ERROR, "Unsupported background mode: %s", argv[3]);
+	args.mode = parse_background_mode(argv[3]);
+	if (args.mode == BACKGROUND_MODE_INVALID) {
 		return 1;
 	}
-
 	if (!prepare_context(&state)) {
 		return 1;
 	}
@@ -244,10 +232,10 @@ int main(int argc, const char **argv) {
 	zwlr_layer_surface_v1_set_exclusive_zone(state.layer_surface, -1);
 	zwlr_layer_surface_v1_add_listener(state.layer_surface,
 			&layer_surface_listener, &state);
-	state.run_display = true;
 	wl_surface_commit(state.surface);
 	wl_display_roundtrip(state.display);
 
+	state.run_display = true;
 	while (wl_display_dispatch(state.display) != -1 && state.run_display) {
 		// This space intentionally left blank
 	}
diff --git a/swaylock/main.c b/swaylock/main.c
index c2615951..8673694d 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -1,387 +1,235 @@
-#define _XOPEN_SOURCE 500
-#include "wayland-swaylock-client-protocol.h"
-#include <xkbcommon/xkbcommon.h>
-#include <xkbcommon/xkbcommon-names.h>
-#include <security/pam_appl.h>
-#include <json-c/json.h>
+#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200112L
+#include <assert.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <getopt.h>
-#include <signal.h>
-#include <stdbool.h>
+#include <sys/stat.h>
+#include <time.h>
 #include <unistd.h>
-#include "client/window.h"
-#include "client/registry.h"
-#include "client/cairo.h"
-#include "swaylock/swaylock.h"
-#include "ipc-client.h"
-#include "log.h"
+#include <wayland-client.h>
+#include <wlr/util/log.h>
+#include "background-image.h"
+#include "pool-buffer.h"
+#include "cairo.h"
 #include "util.h"
-
-struct registry *registry;
-struct render_data render_data;
-struct lock_config *config;
-bool show_indicator = true;
-
-void wl_dispatch_events() {
-	wl_display_flush(registry->display);
-	if (wl_display_dispatch(registry->display) == -1) {
-		sway_log(L_ERROR, "failed to run wl_display_dispatch");
-		exit(1);
+#include "wlr-layer-shell-unstable-v1-client-protocol.h"
+
+struct swaylock_args {
+	uint32_t color;
+	enum background_mode mode;
+	bool show_indicator;
+};
+
+struct swaylock_state {
+	struct wl_display *display;
+	struct wl_compositor *compositor;
+	struct zwlr_layer_shell_v1 *layer_shell;
+	struct wl_shm *shm;
+	struct wl_list contexts;
+	struct swaylock_args args;
+	bool run_display;
+};
+
+struct swaylock_context {
+	cairo_surface_t *image;
+	struct swaylock_state *state;
+	struct wl_output *output;
+	struct wl_surface *surface;
+	struct zwlr_layer_surface_v1 *layer_surface;
+	struct pool_buffer buffers[2];
+	struct pool_buffer *current_buffer;
+	uint32_t width, height;
+	struct wl_list link;
+};
+
+static void daemonize() {
+	if (fork() == 0) {
+		int devnull = open("/dev/null", O_RDWR);
+		dup2(STDOUT_FILENO, devnull);
+		dup2(STDERR_FILENO, devnull);
+		chdir("/");
+	} else {
+		exit(0);
 	}
 }
 
-void sigalarm_handler(int sig) {
-	signal(SIGALRM, SIG_IGN);
-	// Hide typing indicator
-	render_data.auth_state = AUTH_STATE_IDLE;
-	render(&render_data, config);
-	wl_display_flush(registry->display);
-	signal(SIGALRM, sigalarm_handler);
-}
-
-void sway_terminate(int exit_code) {
-	int i;
-	for (i = 0; i < render_data.surfaces->length; ++i) {
-		struct window *window = render_data.surfaces->items[i];
-		window_teardown(window);
-	}
-	list_free(render_data.surfaces);
-	if (registry) {
-		registry_teardown(registry);
+static void render_frame(struct swaylock_context *context) {
+	struct swaylock_state *state = context->state;
+	context->current_buffer = get_next_buffer(state->shm,
+			context->buffers, context->width, context->height);
+	cairo_t *cairo = context->current_buffer->cairo;
+	if (state->args.mode == BACKGROUND_MODE_SOLID_COLOR) {
+		cairo_set_source_u32(cairo, state->args.color);
+		cairo_paint(cairo);
+	} else {
+		render_background_image(cairo, context->image,
+				state->args.mode, context->width, context->height);
 	}
-	exit(exit_code);
+	wl_surface_attach(context->surface, context->current_buffer->buffer, 0, 0);
+	wl_surface_damage(context->surface, 0, 0, context->width, context->height);
+	wl_surface_commit(context->surface);
 }
 
-char *password;
-int password_size;
-enum line_source line_source = LINE_SOURCE_DEFAULT;
-
-struct lock_config *init_config() {
-	struct lock_config *config = calloc(1, sizeof(struct lock_config));
-
-	config->font = strdup("sans-serif");
-	config->colors.text = 0x000000FF;
-
-	config->colors.line = 0x000000FF;
-	config->colors.separator = 0x000000FF;
-
-	config->colors.input_cursor = 0x33DB00FF;
-	config->colors.backspace_cursor = 0xDB3300FF;
-
-	config->colors.normal.inner_ring = 0x000000BF;
-	config->colors.normal.outer_ring = 0x337D00FF;
-
-	config->colors.validating.inner_ring = 0x0072FFBF;
-	config->colors.validating.outer_ring = 0x3300FAFF;
-
-	config->colors.invalid.inner_ring = 0xFA0000BF;
-	config->colors.invalid.outer_ring = 0x7D3300FF;
-
-	config->radius = 50;
-	config->thickness = 10;
-
-	return config;
+static void layer_surface_configure(void *data,
+		struct zwlr_layer_surface_v1 *surface,
+		uint32_t serial, uint32_t width, uint32_t height) {
+	struct swaylock_context *context = data;
+	context->width = width;
+	context->height = height;
+	zwlr_layer_surface_v1_ack_configure(surface, serial);
+	render_frame(context);
 }
 
-void free_config(struct lock_config *config) {
-	free(config->font);
-	free(config);
+static void layer_surface_closed(void *data,
+		struct zwlr_layer_surface_v1 *surface) {
+	struct swaylock_context *context = data;
+	zwlr_layer_surface_v1_destroy(context->layer_surface);
+	wl_surface_destroy(context->surface);
+	context->state->run_display = false;
 }
 
-int function_conversation(int num_msg, const struct pam_message **msg,
-		struct pam_response **resp, void *appdata_ptr) {
-
-	const char* msg_style_names[] = {
-		NULL,
-		"PAM_PROMPT_ECHO_OFF",
-		"PAM_PROMPT_ECHO_ON",
-		"PAM_ERROR_MSG",
-		"PAM_TEXT_INFO",
-	};
+struct zwlr_layer_surface_v1_listener layer_surface_listener = {
+	.configure = layer_surface_configure,
+	.closed = layer_surface_closed,
+};
 
-	/* PAM expects an array of responses, one for each message */
-	struct pam_response *pam_reply = calloc(num_msg, sizeof(struct pam_response));
-	*resp = pam_reply;
-
-	for(int i=0; i<num_msg; ++i) {
-		sway_log(L_DEBUG, "msg[%d]: (%s) %s", i,
-				msg_style_names[msg[i]->msg_style],
-				msg[i]->msg);
-
-		switch (msg[i]->msg_style) {
-		case PAM_PROMPT_ECHO_OFF:
-		case PAM_PROMPT_ECHO_ON:
-			pam_reply[i].resp = password;
-			break;
+static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
+		uint32_t serial, struct wl_surface *surface,
+		wl_fixed_t surface_x, wl_fixed_t surface_y) {
+	wl_pointer_set_cursor(wl_pointer, serial, NULL, 0, 0);
+}
 
-		case PAM_ERROR_MSG:
-		case PAM_TEXT_INFO:
-			break;
-		}
-	}
+static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
+		uint32_t serial, struct wl_surface *surface) {
+	// Who cares
+}
 
-	return PAM_SUCCESS;
+static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
+		uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
+	// Who cares
 }
 
-/**
- * Note: PAM will free() 'password' during the process
- */
-bool verify_password() {
-	struct passwd *passwd = getpwuid(getuid());
-	char *username = passwd->pw_name;
-
-	const struct pam_conv local_conversation = { function_conversation, NULL };
-	pam_handle_t *local_auth_handle = NULL;
-	int pam_err;
-	if ((pam_err = pam_start("swaylock", username, &local_conversation, &local_auth_handle)) != PAM_SUCCESS) {
-		sway_abort("PAM returned %d\n", pam_err);
-	}
-	if ((pam_err = pam_authenticate(local_auth_handle, 0)) != PAM_SUCCESS) {
-		return false;
-	}
-	if ((pam_err = pam_end(local_auth_handle, pam_err)) != PAM_SUCCESS) {
-		return false;
-	}
-	return true;
+static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
+		uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
+	// Who cares
 }
 
-void notify_key(enum wl_keyboard_key_state state, xkb_keysym_t sym, uint32_t code, uint32_t codepoint) {
-	int redraw_screen = 0;
-	char *password_realloc;
-	int i;
+static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
+		uint32_t time, uint32_t axis, wl_fixed_t value) {
+	// Who cares
+}
 
-	if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
-		switch (sym) {
-		case XKB_KEY_KP_Enter:
-		case XKB_KEY_Return:
-			render_data.auth_state = AUTH_STATE_VALIDATING;
+static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) {
+	// Who cares
+}
 
-			render(&render_data, config);
-			// Make sure our render call will actually be displayed on the screen
-			wl_dispatch_events();
+static void wl_pointer_axis_source(void *data, struct wl_pointer *wl_pointer,
+		uint32_t axis_source) {
+	// Who cares
+}
 
-			if (verify_password()) {
-				exit(0);
-			}
+static void wl_pointer_axis_stop(void *data, struct wl_pointer *wl_pointer,
+		uint32_t time, uint32_t axis) {
+	// Who cares
+}
 
-			render_data.auth_state = AUTH_STATE_INVALID;
-			redraw_screen = 1;
+static void wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
+		uint32_t axis, int32_t discrete) {
+	// Who cares
+}
 
-			password_size = 1024;
-			password = malloc(password_size);
-			password[0] = '\0';
-			break;
-		case XKB_KEY_BackSpace:
-			i = strlen(password);
-			if (i > 0) {
-				password[i - 1] = '\0';
-				render_data.auth_state = AUTH_STATE_BACKSPACE;
-				redraw_screen = 1;
-			}
-			break;
-		case XKB_KEY_Control_L:
-		case XKB_KEY_Control_R:
-		case XKB_KEY_Shift_L:
-		case XKB_KEY_Shift_R:
-		case XKB_KEY_Caps_Lock:
-		case XKB_KEY_Shift_Lock:
-		case XKB_KEY_Meta_L:
-		case XKB_KEY_Meta_R:
-		case XKB_KEY_Alt_L:
-		case XKB_KEY_Alt_R:
-		case XKB_KEY_Super_L:
-		case XKB_KEY_Super_R:
-		case XKB_KEY_Hyper_L:
-		case XKB_KEY_Hyper_R:
-			break; // don't draw screen on modifier keys
-		case XKB_KEY_Escape:
-		case XKB_KEY_u:
-		case XKB_KEY_U:
-			// clear password buffer on ctrl-u (or escape for i3lock compatibility)
-			if (sym == XKB_KEY_Escape || xkb_state_mod_name_is_active(registry->input->xkb.state,
-					XKB_MOD_NAME_CTRL, XKB_STATE_MODS_EFFECTIVE) > 0) {
-				render_data.auth_state = AUTH_STATE_BACKSPACE;
-				redraw_screen = 1;
-
-				password_size = 1024;
-				free(password);
-				password = malloc(password_size);
-				password[0] = '\0';
-				break;
-			}
-			/* fallthrough */
-		default:
-			render_data.auth_state = AUTH_STATE_INPUT;
-			redraw_screen = 1;
-			i = strlen(password);
-			if (i + 1 == password_size) {
-				password_size += 1024;
-				password_realloc = realloc(password, password_size);
-				// reset password if realloc fails.
-				if (password_realloc == NULL) {
-					password_size = 1024;
-					free(password);
-					password = malloc(password_size);
-					password[0] = '\0';
-					break;
-				} else {
-					password = password_realloc;
-				}
-			}
-			password[i] = (char)codepoint;
-			password[i + 1] = '\0';
-			break;
-		}
-		if (redraw_screen) {
-			render(&render_data, config);
-			wl_dispatch_events();
-			// Hide the indicator after a couple of seconds
-			alarm(5);
-		}
+struct wl_pointer_listener pointer_listener = {
+	.enter = wl_pointer_enter,
+	.leave = wl_pointer_leave,
+	.motion = wl_pointer_motion,
+	.button = wl_pointer_button,
+	.axis = wl_pointer_axis,
+	.frame = wl_pointer_frame,
+	.axis_source = wl_pointer_axis_source,
+	.axis_stop = wl_pointer_axis_stop,
+	.axis_discrete = wl_pointer_axis_discrete,
+};
+
+static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
+		enum wl_seat_capability caps) {
+	if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
+		struct wl_pointer *pointer = wl_seat_get_pointer(wl_seat);
+		wl_pointer_add_listener(pointer, &pointer_listener, NULL);
 	}
 }
 
-void render_color(struct window *window, uint32_t color) {
-	cairo_set_source_u32(window->cairo, color);
-	cairo_paint(window->cairo);
+static void seat_handle_name(void *data, struct wl_seat *wl_seat,
+		const char *name) {
+	// Who cares
 }
 
-void render_image(struct window *window, cairo_surface_t *image, enum scaling_mode scaling_mode) {
-	double width = cairo_image_surface_get_width(image);
-	double height = cairo_image_surface_get_height(image);
-	int wwidth = window->width * window->scale;
-	int wheight = window->height * window->scale;
-
-	switch (scaling_mode) {
-	case SCALING_MODE_STRETCH:
-		cairo_scale(window->cairo,
-				(double) wwidth / width,
-				(double) wheight / height);
-		cairo_set_source_surface(window->cairo, image, 0, 0);
-		break;
-	case SCALING_MODE_FILL:
-	{
-		double window_ratio = (double) wwidth / wheight;
-		double bg_ratio = width / height;
-
-		if (window_ratio > bg_ratio) {
-			double scale = (double) wwidth / width;
-			cairo_scale(window->cairo, scale, scale);
-			cairo_set_source_surface(window->cairo, image,
-					0,
-					(double) wheight/2 / scale - height/2);
-		} else {
-			double scale = (double) wheight / height;
-			cairo_scale(window->cairo, scale, scale);
-			cairo_set_source_surface(window->cairo, image,
-					(double) wwidth/2 / scale - width/2,
-					0);
-		}
-		break;
-	}
-	case SCALING_MODE_FIT:
-	{
-		double window_ratio = (double) wwidth / wheight;
-		double bg_ratio = width / height;
-
-		if (window_ratio > bg_ratio) {
-			double scale = (double) wheight / height;
-			cairo_scale(window->cairo, scale, scale);
-			cairo_set_source_surface(window->cairo, image,
-					(double) wwidth/2 / scale - width/2,
-					0);
-		} else {
-			double scale = (double) wwidth / width;
-			cairo_scale(window->cairo, scale, scale);
-			cairo_set_source_surface(window->cairo, image,
-					0,
-					(double) wheight/2 / scale - height/2);
-		}
-		break;
-	}
-	case SCALING_MODE_CENTER:
-		cairo_set_source_surface(window->cairo, image,
-				(double) wwidth/2 - width/2,
-				(double) wheight/2 - height/2);
-		break;
-	case SCALING_MODE_TILE:
-	{
-		cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image);
-		cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
-		cairo_set_source(window->cairo, pattern);
-		break;
-	}
+const struct wl_seat_listener seat_listener = {
+	.capabilities = seat_handle_capabilities,
+	.name = seat_handle_name,
+};
+
+static void handle_global(void *data, struct wl_registry *registry,
+		uint32_t name, const char *interface, uint32_t version) {
+	struct swaylock_state *state = data;
+	if (strcmp(interface, wl_compositor_interface.name) == 0) {
+		state->compositor = wl_registry_bind(registry, name,
+				&wl_compositor_interface, 1);
+	} else if (strcmp(interface, wl_shm_interface.name) == 0) {
+		state->shm = wl_registry_bind(registry, name,
+				&wl_shm_interface, 1);
+	} else if (strcmp(interface, wl_seat_interface.name) == 0) {
+		struct wl_seat *seat = wl_registry_bind(
+				registry, name, &wl_seat_interface, 1);
+		wl_seat_add_listener(seat, &seat_listener, NULL);
+	} else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
+		state->layer_shell = wl_registry_bind(
+				registry, name, &zwlr_layer_shell_v1_interface, 1);
+	} else if (strcmp(interface, wl_output_interface.name) == 0) {
+		struct swaylock_context *context =
+			calloc(1, sizeof(struct swaylock_context));
+		context->state = state;
+		context->output = wl_registry_bind(registry, name,
+				&wl_output_interface, 1);
+		wl_list_insert(&state->contexts, &context->link);
 	}
+}
 
-	cairo_paint(window->cairo);
+static void handle_global_remove(void *data, struct wl_registry *registry,
+		uint32_t name) {
+	// who cares
 }
 
-cairo_surface_t *load_image(char *image_path) {
-	cairo_surface_t *image = NULL;
+static const struct wl_registry_listener registry_listener = {
+	.global = handle_global,
+	.global_remove = handle_global_remove,
+};
 
-#ifdef WITH_GDK_PIXBUF
-	GError *err = NULL;
-	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(image_path, &err);
-	if (!pixbuf) {
-		sway_abort("Failed to load background image: %s", err->message);
-	}
-	image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf);
-	g_object_unref(pixbuf);
-#else
-	image = cairo_image_surface_create_from_png(image_path);
-#endif //WITH_GDK_PIXBUF
-	if (!image) {
-		sway_abort("Failed to read background image.");
-	}
+static struct swaylock_state state;
 
-	return image;
+static void sigalarm_handler(int sig) {
+	signal(SIGALRM, SIG_IGN);
+	// TODO: Hide typing indicator
+	signal(SIGALRM, sigalarm_handler);
 }
 
 int main(int argc, char **argv) {
-	const char *scaling_mode_str = "fit", *socket_path = NULL;
-	int i;
-	void *images = NULL;
-	config = init_config();
-
-	render_data.num_images = 0;
-	render_data.color_set = 0;
-	render_data.color = 0xFFFFFFFF;
-	render_data.auth_state = AUTH_STATE_IDLE;
-
-	init_log(L_INFO);
-	// Install SIGALARM handler (for hiding the typing indicator)
 	signal(SIGALRM, sigalarm_handler);
 
 	static struct option long_options[] = {
 		{"help", no_argument, NULL, 'h'},
 		{"color", required_argument, NULL, 'c'},
 		{"image", required_argument, NULL, 'i'},
-		{"scaling", required_argument, NULL, 0},
+		{"scaling", required_argument, NULL, 's'},
 		{"tiling", no_argument, NULL, 't'},
 		{"version", no_argument, NULL, 'v'},
 		{"socket", required_argument, NULL, 'p'},
 		{"no-unlock-indicator", no_argument, NULL, 'u'},
 		{"daemonize", no_argument, NULL, 'f'},
-		{"font", required_argument, NULL, 0},
-		{"line-uses-ring", no_argument, NULL, 'r'},
-		{"line-uses-inside", no_argument, NULL, 's'},
-		{"textcolor", required_argument, NULL, 0},
-		{"insidevercolor", required_argument, NULL, 0},
-		{"insidewrongcolor", required_argument, NULL, 0},
-		{"insidecolor", required_argument, NULL, 0},
-		{"ringvercolor", required_argument, NULL, 0},
-		{"ringwrongcolor", required_argument, NULL, 0},
-		{"ringcolor", required_argument, NULL, 0},
-		{"linecolor", required_argument, NULL, 0},
-		{"separatorcolor", required_argument, NULL, 0},
-		{"keyhlcolor", required_argument, NULL, 0},
-		{"bshlcolor", required_argument, NULL, 0},
-		{"indicator-radius", required_argument, NULL, 0},
-		{"indicator-thickness", required_argument, NULL, 0},
 		{0, 0, 0, 0}
 	};
 
@@ -390,415 +238,109 @@ int main(int argc, char **argv) {
 		"\n"
 		"  -h, --help                     Show help message and quit.\n"
 		"  -c, --color <rrggbb[aa]>       Turn the screen into the given color instead of white.\n"
-		"  --scaling                      Scaling mode: stretch, fill, fit, center, tile.\n"
+		"  -s, --scaling                  Scaling mode: stretch, fill, fit, center, tile.\n"
 		"  -t, --tiling                   Same as --scaling=tile.\n"
 		"  -v, --version                  Show the version number and quit.\n"
 		"  -i, --image [<output>:]<path>  Display the given image.\n"
 		"  -u, --no-unlock-indicator      Disable the unlock indicator.\n"
-		"  -f, --daemonize                Detach from the controlling terminal.\n"
-		"  --socket <socket>              Use the specified socket.\n"
-		"  For more information see `man swaylock`\n";
-
+		"  -f, --daemonize                Detach from the controlling terminal.\n" 
+		"  --socket <socket>              Use the specified socket.\n";
 
-	registry = registry_poll();
+	struct swaylock_args args = {
+		.mode = BACKGROUND_MODE_SOLID_COLOR,
+		.color = 0xFFFFFFFF,
+		.show_indicator = true,
+	};
+	state.args = args;
+	wlr_log_init(L_DEBUG, NULL);
 
 	int c;
 	while (1) {
 		int option_index = 0;
-		c = getopt_long(argc, argv, "hc:i:srtvuf", long_options, &option_index);
+		c = getopt_long(argc, argv, "hc:i:s:tvuf", long_options, &option_index);
 		if (c == -1) {
 			break;
 		}
 		switch (c) {
-		case 'c':
-		{
-			render_data.color = parse_color(optarg);
-			render_data.color_set = 1;
+		case 'c': {
+			state.args.color = parse_color(optarg);
+			state.args.mode = BACKGROUND_MODE_SOLID_COLOR;
 			break;
 		}
 		case 'i':
-		{
-			char *image_path = strchr(optarg, ':');
-			if (image_path == NULL) {
-				if (render_data.num_images == 0) {
-					// Provided image without output
-					render_data.image = load_image(optarg);
-					render_data.num_images = -1;
-				} else {
-					sway_log(L_ERROR, "output must be defined for all --images or no --images");
-					exit(EXIT_FAILURE);
-				}
-			} else {
-				// Provided image for all outputs
-				if (render_data.num_images == 0) {
-					images = calloc(registry->outputs->length, sizeof(char*) * 2);
-				} else if (render_data.num_images == -1) {
-					sway_log(L_ERROR, "output must be defined for all --images or no --images");
-					exit(EXIT_FAILURE);
-				}
-
-				image_path[0] = '\0';
-				((char**) images)[render_data.num_images * 2] = optarg;
-				((char**) images)[render_data.num_images++ * 2 + 1] = ++image_path;
+			// TODO
+			return 1;
+		case 's':
+			state.args.mode = parse_background_mode(optarg);
+			if (state.args.mode == BACKGROUND_MODE_INVALID) {
+				return 1;
 			}
 			break;
-		}
 		case 't':
-			scaling_mode_str = "tile";
-			break;
-		case 'p':
-			socket_path = optarg;
+			// TODO
 			break;
 		case 'v':
-			fprintf(stdout, "swaylock version " SWAY_VERSION "\n");
-			exit(EXIT_SUCCESS);
-			break;
+#if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE
+			fprintf(stdout, "swaylock version %s (%s, branch \"%s\")\n",
+					SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH);
+#else
+			fprintf(stdout, "version unknown\n");
+#endif
+			return 0;
 		case 'u':
-			show_indicator = false;
-			break;
-		case 'f': {
-			pid_t t = fork();
-			if (t == -1) {
-				sway_log(L_ERROR, "daemon call failed");
-				exit(EXIT_FAILURE);
-			} else if (t > 0) {
-				exit(0);
-			}
+			state.args.show_indicator = false;
 			break;
-		}
-		case 'r':
-			if (line_source != LINE_SOURCE_DEFAULT) {
-				sway_log(L_ERROR, "line source options conflict");
-				exit(EXIT_FAILURE);
-			}
-			line_source = LINE_SOURCE_RING;
-			break;
-		case 's':
-			if (line_source != LINE_SOURCE_DEFAULT) {
-				sway_log(L_ERROR, "line source options conflict");
-				exit(EXIT_FAILURE);
-			}
-			line_source = LINE_SOURCE_INSIDE;
-			break;
-		case 0:
-			if (strcmp(long_options[option_index].name, "font") == 0) {
-				free(config->font);
-				config->font = strdup(optarg);
-			} else if (strcmp(long_options[option_index].name, "scaling") == 0) {
-				scaling_mode_str = optarg;
-			} else if (strcmp(long_options[option_index].name, "textcolor") == 0) {
-				config->colors.text = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "insidevercolor") == 0) {
-				config->colors.validating.inner_ring = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "insidewrongcolor") == 0) {
-				config->colors.invalid.inner_ring = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "insidecolor") == 0) {
-				config->colors.normal.inner_ring = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "ringvercolor") == 0) {
-				config->colors.validating.outer_ring = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "ringwrongcolor") == 0) {
-				config->colors.invalid.outer_ring = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "ringcolor") == 0) {
-				config->colors.normal.outer_ring = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "linecolor") == 0) {
-				config->colors.line = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "separatorcolor") == 0) {
-				config->colors.separator = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "keyhlcolor") == 0) {
-				config->colors.input_cursor = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "bshlcolor") == 0) {
-				config->colors.backspace_cursor = parse_color(optarg);
-			} else if (strcmp(long_options[option_index].name, "indicator-radius") == 0) {
-				config->radius = atoi(optarg);
-			} else if (strcmp(long_options[option_index].name, "indicator-thickness") == 0) {
-				config->thickness = atoi(optarg);
-			}
+		case 'f':
+			daemonize();
 			break;
 		default:
 			fprintf(stderr, "%s", usage);
-			exit(EXIT_FAILURE);
+			return 1;
 		}
 	}
 
-	render_data.scaling_mode = SCALING_MODE_STRETCH;
-	if (strcmp(scaling_mode_str, "stretch") == 0) {
-		render_data.scaling_mode = SCALING_MODE_STRETCH;
-	} else if (strcmp(scaling_mode_str, "fill") == 0) {
-		render_data.scaling_mode = SCALING_MODE_FILL;
-	} else if (strcmp(scaling_mode_str, "fit") == 0) {
-		render_data.scaling_mode = SCALING_MODE_FIT;
-	} else if (strcmp(scaling_mode_str, "center") == 0) {
-		render_data.scaling_mode = SCALING_MODE_CENTER;
-	} else if (strcmp(scaling_mode_str, "tile") == 0) {
-		render_data.scaling_mode = SCALING_MODE_TILE;
-	} else {
-		sway_abort("Unsupported scaling mode: %s", scaling_mode_str);
-	}
-
-	password_size = 1024;
-	password = malloc(password_size);
-	password[0] = '\0';
-	render_data.surfaces = create_list();
-	if (!socket_path) {
-		socket_path = get_socketpath();
-		if (!socket_path) {
-			sway_abort("Unable to retrieve socket path");
-		}
-	}
-
-	if (!registry) {
-		sway_abort("Unable to connect to wayland compositor");
-	}
-
-	if (!registry->swaylock) {
-		sway_abort("swaylock requires the compositor to support the swaylock extension.");
-	}
+	wl_list_init(&state.contexts);
 
-	if (registry->pointer) {
-		// We don't want swaylock to have a pointer
-		wl_pointer_destroy(registry->pointer);
-		registry->pointer = NULL;
-	}
-
-	for (i = 0; i < registry->outputs->length; ++i) {
-		struct output_state *output = registry->outputs->items[i];
-		struct window *window = window_setup(registry,
-				output->width, output->height, output->scale, true);
-		if (!window) {
-			sway_abort("Failed to create surfaces.");
-		}
-		list_add(render_data.surfaces, window);
-	}
-
-	registry->input->notify = notify_key;
-
-	// Different background for the output
-	if (render_data.num_images >= 1) {
-		char **displays_paths = images;
-		render_data.images = calloc(registry->outputs->length, sizeof(cairo_surface_t*));
-
-		int socketfd = ipc_open_socket(socket_path);
-		uint32_t len = 0;
-		char *outputs = ipc_single_command(socketfd, IPC_GET_OUTPUTS, "", &len);
-		struct json_object *json_outputs = json_tokener_parse(outputs);
-
-		for (i = 0; i < registry->outputs->length; ++i) {
-			if (displays_paths[i * 2] != NULL) {
-				for (int j = 0;; ++j) {
-					if (j >= json_object_array_length(json_outputs)) {
-						sway_log(L_ERROR, "%s is not an extant output", displays_paths[i * 2]);
-						exit(EXIT_FAILURE);
-					}
-
-					struct json_object *dsp_name, *at_j = json_object_array_get_idx(json_outputs, j);
-					if (!json_object_object_get_ex(at_j, "name", &dsp_name)) {
-						sway_abort("output doesn't have a name field");
-					}
-					if (!strcmp(displays_paths[i * 2], json_object_get_string(dsp_name))) {
-						render_data.images[j] = load_image(displays_paths[i * 2 + 1]);
-						break;
-					}
-				}
-			}
-		}
+	assert(state.display = wl_display_connect(NULL));
 
-		json_object_put(json_outputs);
-		close(socketfd);
-		free(displays_paths);
-	}
+	struct wl_registry *registry = wl_display_get_registry(state.display);
+	wl_registry_add_listener(registry, &registry_listener, &state);
+	wl_display_roundtrip(state.display);
+	assert(state.compositor && state.layer_shell && state.shm);
 
-	render(&render_data, config);
-	bool locked = false;
-	while (wl_display_dispatch(registry->display) != -1) {
-		if (!locked) {
-			for (i = 0; i < registry->outputs->length; ++i) {
-				struct output_state *output = registry->outputs->items[i];
-				struct window *window = render_data.surfaces->items[i];
-				lock_set_lock_surface(registry->swaylock, output->output, window->surface);
-			}
-			locked = true;
-		}
+	if (wl_list_empty(&state.contexts)) {
+		wlr_log(L_DEBUG, "Exiting - no outputs to show on.");
+		return 0;
 	}
 
-	// Free surfaces
-	if (render_data.num_images == -1) {
-		cairo_surface_destroy(render_data.image);
-	} else if (render_data.num_images >= 1) {
-		for (i = 0; i < registry->outputs->length; ++i) {
-			if (render_data.images[i] != NULL) {
-				cairo_surface_destroy(render_data.images[i]);
-			}
-		}
-		free(render_data.images);
+	struct swaylock_context *context;
+	wl_list_for_each(context, &state.contexts, link) {
+		assert(context->surface =
+				wl_compositor_create_surface(state.compositor));
+
+		context->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
+				state.layer_shell, context->surface, context->output,
+				ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY, "lockscreen");
+		assert(context->layer_surface);
+
+		zwlr_layer_surface_v1_set_size(context->layer_surface, 0, 0);
+		zwlr_layer_surface_v1_set_anchor(context->layer_surface,
+				ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
+				ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
+				ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM |
+				ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT);
+		zwlr_layer_surface_v1_set_exclusive_zone(context->layer_surface, -1);
+		zwlr_layer_surface_v1_set_keyboard_interactivity(
+				context->layer_surface, true);
+		zwlr_layer_surface_v1_add_listener(context->layer_surface,
+				&layer_surface_listener, context);
+		wl_surface_commit(context->surface);
+		wl_display_roundtrip(state.display);
 	}
 
-	for (i = 0; i < render_data.surfaces->length; ++i) {
-		struct window *window = render_data.surfaces->items[i];
-		window_teardown(window);
+	state.run_display = true;
+	while (wl_display_dispatch(state.display) != -1 && state.run_display) {
+		// This space intentionally left blank
 	}
-	list_free(render_data.surfaces);
-	registry_teardown(registry);
-
-	free_config(config);
-
 	return 0;
 }
-
-void render(struct render_data *render_data, struct lock_config *config) {
-	int i;
-	for (i = 0; i < render_data->surfaces->length; ++i) {
-		sway_log(L_DEBUG, "Render surface %d of %d", i, render_data->surfaces->length);
-		struct window *window = render_data->surfaces->items[i];
-		if (!window_prerender(window) || !window->cairo) {
-			continue;
-		}
-		int wwidth = window->width * window->scale;
-		int wheight = window->height * window->scale;
-
-		cairo_save(window->cairo);
-		cairo_set_operator(window->cairo, CAIRO_OPERATOR_CLEAR);
-		cairo_paint(window->cairo);
-		cairo_restore(window->cairo);
-
-		// Reset the transformation matrix
-		cairo_identity_matrix(window->cairo);
-
-		if (render_data->num_images == 0 || render_data->color_set) {
-			render_color(window, render_data->color);
-		}
-
-		if (render_data->num_images == -1) {
-			// One background for all
-			render_image(window, render_data->image, render_data->scaling_mode);
-		} else if (render_data->num_images >= 1) {
-			// Different backgrounds
-			if (render_data->images[i] != NULL) {
-				render_image(window, render_data->images[i], render_data->scaling_mode);
-			}
-		}
-
-		// Reset the transformation matrix again
-		cairo_identity_matrix(window->cairo);
-
-		// Draw specific values (copied from i3)
-		const float TYPE_INDICATOR_RANGE = M_PI / 3.0f;
-		const float TYPE_INDICATOR_BORDER_THICKNESS = M_PI / 128.0f;
-
-		// Add visual indicator
-		if (show_indicator && render_data->auth_state != AUTH_STATE_IDLE) {
-			// Draw circle
-			cairo_set_line_width(window->cairo, config->thickness);
-			cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius, 0, 2 * M_PI);
-			switch (render_data->auth_state) {
-			case AUTH_STATE_INPUT:
-			case AUTH_STATE_BACKSPACE: {
-				cairo_set_source_u32(window->cairo, config->colors.normal.inner_ring);
-				cairo_fill_preserve(window->cairo);
-				cairo_set_source_u32(window->cairo, config->colors.normal.outer_ring);
-				cairo_stroke(window->cairo);
-			} break;
-			case AUTH_STATE_VALIDATING: {
-				cairo_set_source_u32(window->cairo, config->colors.validating.inner_ring);
-				cairo_fill_preserve(window->cairo);
-				cairo_set_source_u32(window->cairo, config->colors.validating.outer_ring);
-				cairo_stroke(window->cairo);
-			} break;
-			case AUTH_STATE_INVALID: {
-				cairo_set_source_u32(window->cairo, config->colors.invalid.inner_ring);
-				cairo_fill_preserve(window->cairo);
-				cairo_set_source_u32(window->cairo, config->colors.invalid.outer_ring);
-				cairo_stroke(window->cairo);
-			} break;
-			default: break;
-			}
-
-			// Draw a message
-			char *text = NULL;
-			cairo_set_source_u32(window->cairo, config->colors.text);
-			cairo_select_font_face(window->cairo, config->font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-			cairo_set_font_size(window->cairo, config->radius/3.0f);
-			switch (render_data->auth_state) {
-			case AUTH_STATE_VALIDATING:
-				text = "verifying";
-				break;
-			case AUTH_STATE_INVALID:
-				text = "wrong";
-				break;
-			default: break;
-			}
-
-			if (text) {
-				cairo_text_extents_t extents;
-				double x, y;
-
-				cairo_text_extents(window->cairo, text, &extents);
-				x = wwidth/2 - ((extents.width/2) + extents.x_bearing);
-				y = wheight/2 - ((extents.height/2) + extents.y_bearing);
-
-				cairo_move_to(window->cairo, x, y);
-				cairo_show_text(window->cairo, text);
-				cairo_close_path(window->cairo);
-				cairo_new_sub_path(window->cairo);
-			}
-
-			// Typing indicator: Highlight random part on keypress
-			if (render_data->auth_state == AUTH_STATE_INPUT || render_data->auth_state == AUTH_STATE_BACKSPACE) {
-				static double highlight_start = 0;
-				highlight_start += (rand() % (int)(M_PI * 100)) / 100.0 + M_PI * 0.5;
-				cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius, highlight_start, highlight_start + TYPE_INDICATOR_RANGE);
-				if (render_data->auth_state == AUTH_STATE_INPUT) {
-					cairo_set_source_u32(window->cairo, config->colors.input_cursor);
-				} else {
-					cairo_set_source_u32(window->cairo, config->colors.backspace_cursor);
-				}
-				cairo_stroke(window->cairo);
-
-				// Draw borders
-				cairo_set_source_u32(window->cairo, config->colors.separator);
-				cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius, highlight_start, highlight_start + TYPE_INDICATOR_BORDER_THICKNESS);
-				cairo_stroke(window->cairo);
-
-				cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius, highlight_start + TYPE_INDICATOR_RANGE, (highlight_start + TYPE_INDICATOR_RANGE) + TYPE_INDICATOR_BORDER_THICKNESS);
-				cairo_stroke(window->cairo);
-			}
-
-			switch(line_source) {
-			case LINE_SOURCE_RING:
-				switch(render_data->auth_state) {
-				case AUTH_STATE_VALIDATING:
-					cairo_set_source_u32(window->cairo, config->colors.validating.outer_ring);
-					break;
-				case AUTH_STATE_INVALID:
-					cairo_set_source_u32(window->cairo, config->colors.invalid.outer_ring);
-					break;
-				default:
-					cairo_set_source_u32(window->cairo, config->colors.normal.outer_ring);
-				}
-				break;
-			case LINE_SOURCE_INSIDE:
-				switch(render_data->auth_state) {
-				case AUTH_STATE_VALIDATING:
-					cairo_set_source_u32(window->cairo, config->colors.validating.inner_ring);
-					break;
-				case AUTH_STATE_INVALID:
-					cairo_set_source_u32(window->cairo, config->colors.invalid.inner_ring);
-					break;
-				default:
-					cairo_set_source_u32(window->cairo, config->colors.normal.inner_ring);
-					break;
-				}
-				break;
-			default:
-				cairo_set_source_u32(window->cairo, config->colors.line);
-				break;
-			}
-			// Draw inner + outer border of the circle
-			cairo_set_line_width(window->cairo, 2.0);
-			cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius - config->thickness/2, 0, 2*M_PI);
-			cairo_stroke(window->cairo);
-			cairo_arc(window->cairo, wwidth/2, wheight/2, config->radius + config->thickness/2, 0, 2*M_PI);
-			cairo_stroke(window->cairo);
-		}
-		window_render(window);
-	}
-}
diff --git a/swaylock/meson.build b/swaylock/meson.build
new file mode 100644
index 00000000..5b886ded
--- /dev/null
+++ b/swaylock/meson.build
@@ -0,0 +1,18 @@
+executable(
+	'swaylock',
+	'main.c',
+	include_directories: [sway_inc],
+	dependencies: [
+		cairo,
+		client_protos,
+		gdk_pixbuf,
+		libpam,
+		math,
+		pango,
+		pangocairo,
+		wayland_client,
+		wlroots,
+	],
+	link_with: [lib_sway_common, lib_sway_client],
+	install: true
+)