--- a/cmd/utils.go	Fri May 26 12:05:50 2017 +0200
+++ b/cmd/utils.go	Fri May 26 13:41:58 2017 +0200
@@ -41,15 +41,12 @@
 			of = "plain"
 		}
 	}
-	// Override format if a template is provided
-	if of == "plain" {
-		// If the format is plain and there is a template option,
-		// set the format to "template".  Same for "theme".
-		if outputTemplate != "" || outputTemplateFile != "" {
-			of = "template"
-		} else if outputTheme != "" {
-			of = "theme"
-		}
+
+	// Override format if a template or a theme is provided
+	if outputTemplate != "" || outputTemplateFile != "" {
+		of = "template"
+	} else if outputTheme != "" {
+		of = "theme"
 	}
 	return of
 }