diff --git a/app.psgi b/app.psgi
index 2cd35b6..7459555 100644
--- a/app.psgi
+++ b/app.psgi
@@ -1,4 +1,17 @@
 #!/usr/bin/env perl
+# Copyright 2011 Maximilian Gaß <mxey@ghosthacking.net>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 use strict;
 use warnings;
@@ -36,7 +49,7 @@ sub generate_genre {
   push @genre, rand_enum(set => $data->{subgroup});
   push @genre, rand_enum(set => $data->{group});
 
-  return join ' ', map { ucfirst } @genre;
+  return join ' ', @genre;
 }
 
 builder {
diff --git a/genres.yaml b/genres.yaml
index 53b9417..8b18193 100644
--- a/genres.yaml
+++ b/genres.yaml
@@ -9,137 +9,137 @@ cities:
 - Rotterdam
 - San Francisco
 group:
-- aggrotech
-- ambient
-- beat
-- bluegrass
-- blues
-- chiptune
-- core
-- country
-- cumbia
-- dance
-- dancehall
-- drum and bass
-- dub
-- dubstep
-- flamenco
-- grunge
-- gospel
-- hip-hop
-- house
-- humppa
-- industrial
-- jazz
-- metal
-- oi!
-- polka
-- pop
-- punk
-- rap
-- rave
-- reggae
-- rockabilly
-- samba
-- schranz
-- ska
-- soul
-- techno
-- trance
-- western
+- Aggrotech
+- Ambient
+- Beat
+- Bluegrass
+- Blues
+- Chiptune
+- Core
+- Country
+- Cumbia
+- Dance
+- Dancehall
+- Drum and Bass
+- Dub
+- Dubstep
+- Flamenco
+- Grunge
+- Gospel
+- Hip-hop
+- House
+- Humppa
+- Industrial
+- Jazz
+- Metal
+- Oi!
+- Polka
+- Pop
+- Punk
+- Rap
+- Rave
+- Reggae
+- Rockabilly
+- Samba
+- Schranz
+- Ska
+- Soul
+- Techno
+- Trance
+- Western
 subgroup:
-- acid
-- alternative
-- anatolian
-- arena
-- art
-- australian
-- australian
-- avantgarde
-- balkan
-- battle
-- black
-- body
-- bossa nova
-- brit
-- celtic
-- chinese
-- christian
-- comedy
-- conscious
-- cow
-- crust
-- dark
-- death
-- dirty
-- doom
-- drone
-- east coast
-- electroclash
-- electronic
-- emo
-- euro
-- experimental
-- extreme
-- flower
-- folk
-- free
-- freestyle
-- fucking
-- fun
-- funk
-- fusion
-- future
-- gangsta
-- garage
-- ghetto
-- glam
-- goa
-- gospel
-- gothic
-- grind
-- groove
-- happy
-- hard
-- harmonica
-- heavy
-- horror
-- indian
-- industrial
-- instrumental
-- latin
-- lounge
-- mainstream
-- medieval
-- melodic
-- minimal
-- neo
-- new age
-- nintendo
-- noise
-- nu
-- pagan
-- pirate
-- post
-- power
-- progressive
-- psychedelic
-- skate
-- sludge
-- southern
-- speed
-- stoner
-- street
-- sunshine
-- surf
-- swedish
-- swing
-- symphonic
-- synth
-- teutonic
-- traditional
-- trash
-- viking
-- vocal
-- west coast
-- world
+- Acid
+- Alternative
+- Anatolian
+- Arena
+- Art
+- Australian
+- Australian
+- Avantgarde
+- Balkan
+- Battle
+- Black
+- Body
+- Bossa nova
+- Brit
+- Celtic
+- Chinese
+- Christian
+- Comedy
+- Conscious
+- Cow
+- Crust
+- Dark
+- Death
+- Dirty
+- Doom
+- Drone
+- East Coast
+- Electroclash
+- Electronic
+- Emo
+- Euro
+- Experimental
+- Extreme
+- Flower
+- Folk
+- Free
+- Freestyle
+- Fucking
+- Fun
+- Funk
+- Fusion
+- Future
+- Gangsta
+- Garage
+- Ghetto
+- Glam
+- Goa
+- Gospel
+- Gothic
+- Grind
+- Groove
+- Happy
+- Hard
+- Harmonica
+- Heavy
+- Horror
+- Indian
+- Industrial
+- Instrumental
+- Latin
+- Lounge
+- Mainstream
+- Medieval
+- Melodic
+- Minimal
+- Neo
+- New age
+- Nintendo
+- Noise
+- Nu
+- Pagan
+- Pirate
+- Post
+- Power
+- Progressive
+- Psychedelic
+- Skate
+- Sludge
+- Southern
+- Speed
+- Stoner
+- Street
+- Sunshine
+- Surf
+- Swedish
+- Swing
+- Symphonic
+- Synth
+- Teutonic
+- Traditional
+- Trash
+- Viking
+- Vocal
+- West Coast
+- World