3 files changed, 12 insertions, 3 deletions
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 68a80abf..1081ad4b 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -20,6 +20,8 @@ static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode
 		bar->mode = strdup("hide");
 	} else if (strcasecmp("invisible", mode) == 0) {
 		bar->mode = strdup("invisible");
+	} else if (strcasecmp("overlay", mode) == 0) {
+		bar->mode = strdup("overlay");
 	} else {
 		return cmd_results_new(CMD_INVALID, "Invalid value %s", mode);
 	}
diff --git a/sway/commands/hide_edge_borders.c b/sway/commands/hide_edge_borders.c
index 84a217b8..6120a17f 100644
--- a/sway/commands/hide_edge_borders.c
+++ b/sway/commands/hide_edge_borders.c
@@ -5,10 +5,16 @@
 
 struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
 	struct cmd_results *error = NULL;
-	if ((error = checkarg(argc, "hide_edge_borders", EXPECTED_EQUAL_TO, 1))) {
+	if ((error = checkarg(argc, "hide_edge_borders", EXPECTED_AT_LEAST, 1))) {
 		return error;
 	}
 
+	if (strcmp(*argv, "--i3") == 0) {
+		config->hide_lone_tab = true;
+		++argv;
+		--argc;
+	}
+
 	if (strcmp(argv[0], "none") == 0) {
 		config->hide_edge_borders = E_NONE;
 	} else if (strcmp(argv[0], "vertical") == 0) {
@@ -23,7 +29,7 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
 		config->hide_edge_borders = E_SMART_NO_GAPS;
 	} else {
 		return cmd_results_new(CMD_INVALID, "Expected 'hide_edge_borders "
-				"<none|vertical|horizontal|both|smart|smart_no_gaps>'");
+				"[--i3] <none|vertical|horizontal|both|smart|smart_no_gaps>'");
 	}
 	config->saved_edge_borders = config->hide_edge_borders;
 
diff --git a/sway/commands/output/transform.c b/sway/commands/output/transform.c
index 8613a8e7..8e5324ad 100644
--- a/sway/commands/output/transform.c
+++ b/sway/commands/output/transform.c
@@ -12,7 +12,8 @@ struct cmd_results *output_cmd_transform(int argc, char **argv) {
 		return cmd_results_new(CMD_INVALID, "Missing transform argument.");
 	}
 	enum wl_output_transform transform;
-	if (strcmp(*argv, "normal") == 0) {
+	if (strcmp(*argv, "normal") == 0 ||
+			strcmp(*argv, "0") == 0) {
 		transform = WL_OUTPUT_TRANSFORM_NORMAL;
 	} else if (strcmp(*argv, "90") == 0) {
 		transform = WL_OUTPUT_TRANSFORM_90;