diff --git a/server.go b/server.go
index 37e2e1b..e3f2abf 100644
--- a/server.go
+++ b/server.go
@@ -21,15 +21,15 @@ var Config struct {
 	bind                      string
 	filesDir                  string
 	metaDir                   string
-	noLogs                    bool
-	allowHotlink              bool
 	siteName                  string
 	siteURL                   string
-	fastcgi                   bool
-	remoteUploads             bool
 	contentSecurityPolicy     string
 	fileContentSecurityPolicy string
 	xFrameOptions             string
+	noLogs                    bool
+	allowHotlink              bool
+	fastcgi                   bool
+	remoteUploads             bool
 }
 
 var Templates = make(map[string]*pongo2.Template)
diff --git a/templates.go b/templates.go
index 195f0f4..eb2997d 100644
--- a/templates.go
+++ b/templates.go
@@ -41,8 +41,7 @@ func (fs *Pongo2Loader) Abs(base, name string) string {
 }
 
 func populateTemplatesMap(tSet *pongo2.TemplateSet, tMap map[string]*pongo2.Template) error {
-
-	templates := [...]string{
+	templates := []string{
 		"index.html",
 		"paste.html",
 		"404.html",