diff --git a/lib/LDV/Zerobin.pm b/lib/LDV/Zerobin.pm
index 7973975..dee86f4 100644
--- a/lib/LDV/Zerobin.pm
+++ b/lib/LDV/Zerobin.pm
@@ -20,9 +20,9 @@ sub _paste_path {
 sub create {
   my ($self) = @_;
 
-  my @syntax = ('auto');
+  my @syntax = ($self->c(text => ['plaintext', 'markdown']));
   my $langs = $self->app->config->{zerobin}->{syntax};
-  push @syntax, $self->c('-------' => $langs)
+  push @syntax, $self->c(code => $langs)
     if (ref($langs) eq 'ARRAY');
 
   $self->stash({syntax => \@syntax});
diff --git a/templates/zerobin/create.html.ep b/templates/zerobin/create.html.ep
index 69dd1de..570a99f 100644
--- a/templates/zerobin/create.html.ep
+++ b/templates/zerobin/create.html.ep
@@ -19,7 +19,7 @@
         <%= select_field 'expire' => \@times %>
       </span>
       <span class="zerobin cblock">
-        <%= tag 'label' => (for => 'syntax') => l('Syntax') %>:
+        <%= tag 'label' => (for => 'syntax') => l('Format') %>:
         <%= select_field 'syntax' => $syntax; %>
       </span>
     </div>