diff --git a/sam/types/channel_perms.go b/sam/types/channel_perms.go
index 03f201b41..9ca5370d2 100644
--- a/sam/types/channel_perms.go
+++ b/sam/types/channel_perms.go
@@ -13,7 +13,8 @@ func (c *Channel) Permissions() []rbac.OperationGroup {
 					Key:     "manage.webhooks",
 					Name:    "Manage webhooks (@todo: implement webhooks)",
 					Title:   "Members with this permission can create, edit and delete webhooks",
-					Enabled: false, Default: "",
+					Enabled: false,
+					Default: "",
 				},
 			},
 		}, rbac.OperationGroup{
@@ -23,27 +24,32 @@ func (c *Channel) Permissions() []rbac.OperationGroup {
 					Key:     "send",
 					Name:    "Send Messages",
 					Title:   "",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				}, rbac.Operation{
 					Key:     "embed",
 					Name:    "Embed Links",
 					Title:   "",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				}, rbac.Operation{
 					Key:     "attach",
 					Name:    "Attach Files",
 					Title:   "",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				}, rbac.Operation{
 					Key:     "manage.messages",
 					Name:    "Manage messages",
 					Title:   "Members with this permission can edit/delete messages inside this channel",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				}, rbac.Operation{
 					Key:     "react",
 					Name:    "Manage reactions",
 					Title:   "Members with this permission can add new reactions to a message",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				},
 			},
 		},
diff --git a/sam/types/organisation_perms.go b/sam/types/organisation_perms.go
index 1ba75ce3b..331cf6708 100644
--- a/sam/types/organisation_perms.go
+++ b/sam/types/organisation_perms.go
@@ -13,32 +13,38 @@ func (c *Organisation) Permissions() []rbac.OperationGroup {
 					Key:     "admin",
 					Name:    "Administrator",
 					Title:   "Members with this permission have every permission and also bypass channel specific permissions. Granting this permission is dangerous",
-					Enabled: true, Default: "deny",
+					Enabled: true,
+					Default: "deny",
 				}, rbac.Operation{
 					Key:     "audit",
 					Name:    "View Audit Log (@todo: add audit logs)",
 					Title:   "Members with this permission have access to view the servers audit logs",
-					Enabled: false, Default: "deny",
+					Enabled: false,
+					Default: "deny",
 				}, rbac.Operation{
 					Key:     "manage.organisation",
 					Name:    "Manage Organisation",
 					Title:   "Members with this permission can change the organisation name and other organisation details",
-					Enabled: true, Default: "deny",
+					Enabled: true,
+					Default: "deny",
 				}, rbac.Operation{
 					Key:     "manage.roles",
 					Name:    "Manage Roles",
 					Title:   "Members with this permission can create/edit/delete roles inside this organisation",
-					Enabled: true, Default: "deny",
+					Enabled: true,
+					Default: "deny",
 				}, rbac.Operation{
 					Key:     "manage.channels",
 					Name:    "Manage channels",
 					Title:   "Members with this permission can create/edit/delete channels inside this organisation",
-					Enabled: true, Default: "deny",
+					Enabled: true,
+					Default: "deny",
 				}, rbac.Operation{
 					Key:     "manage.webhooks",
 					Name:    "Manage webhooks (@todo: implement webhooks)",
 					Title:   "Members with this permission can create, edit and delete webhooks",
-					Enabled: false, Default: "deny",
+					Enabled: false,
+					Default: "deny",
 				},
 			},
 		}, rbac.OperationGroup{
@@ -48,27 +54,32 @@ func (c *Organisation) Permissions() []rbac.OperationGroup {
 					Key:     "send",
 					Name:    "Send Messages",
 					Title:   "",
-					Enabled: true, Default: "allow",
+					Enabled: true,
+					Default: "allow",
 				}, rbac.Operation{
 					Key:     "embed",
 					Name:    "Embed Links",
 					Title:   "",
-					Enabled: true, Default: "allow",
+					Enabled: true,
+					Default: "allow",
 				}, rbac.Operation{
 					Key:     "attach",
 					Name:    "Attach Files",
 					Title:   "",
-					Enabled: true, Default: "allow",
+					Enabled: true,
+					Default: "allow",
 				}, rbac.Operation{
 					Key:     "manage.messages",
 					Name:    "Manage messages",
 					Title:   "Members with this permission can edit/delete messages inside channels",
-					Enabled: true, Default: "deny",
+					Enabled: true,
+					Default: "deny",
 				}, rbac.Operation{
 					Key:     "react",
 					Name:    "Manage reactions",
 					Title:   "Members with this permission can add new reactions to a message",
-					Enabled: true, Default: "allow",
+					Enabled: true,
+					Default: "allow",
 				},
 			},
 		},
diff --git a/sam/types/permissions/main.go b/sam/types/permissions/main.go
index efc0ba1f4..eac2e7926 100644
--- a/sam/types/permissions/main.go
+++ b/sam/types/permissions/main.go
@@ -23,6 +23,8 @@ func main() {
 	flag.Parse()
 
 	export := func(s string) string {
+		s = strings.Replace(s, "true,", "true,\n", -1)
+		s = strings.Replace(s, "false,", "false,\n", -1)
 		s = strings.Replace(s, "{", "{\n", -1)
 		s = strings.Replace(s, "}", ",\n}", -1)
 		s = strings.Replace(s, "\", ", "\",\n", -1)
diff --git a/sam/types/team_perms.go b/sam/types/team_perms.go
index 3ab439872..65495e726 100644
--- a/sam/types/team_perms.go
+++ b/sam/types/team_perms.go
@@ -13,7 +13,8 @@ func (c *Team) Permissions() []rbac.OperationGroup {
 					Key:     "manage.webhooks",
 					Name:    "Manage webhooks (@todo: implement webhooks)",
 					Title:   "Members with this permission can create, edit and delete webhooks",
-					Enabled: false, Default: "",
+					Enabled: false,
+					Default: "",
 				},
 			},
 		}, rbac.OperationGroup{
@@ -23,27 +24,32 @@ func (c *Team) Permissions() []rbac.OperationGroup {
 					Key:     "send",
 					Name:    "Send Messages",
 					Title:   "",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				}, rbac.Operation{
 					Key:     "embed",
 					Name:    "Embed Links",
 					Title:   "",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				}, rbac.Operation{
 					Key:     "attach",
 					Name:    "Attach Files",
 					Title:   "",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				}, rbac.Operation{
 					Key:     "manage.messages",
 					Name:    "Manage messages",
 					Title:   "Members with this permission can edit/delete messages inside channels",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				}, rbac.Operation{
 					Key:     "react",
 					Name:    "Manage reactions",
 					Title:   "Members with this permission can add new reactions to a message",
-					Enabled: true, Default: "",
+					Enabled: true,
+					Default: "",
 				},
 			},
 		},