diff --git a/.cvsignore b/.cvsignore
index 50d19787..86a11ecb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -32,3 +32,4 @@ default-config.h
 irssi-version.h
 irssi-version.h.in
 irssi-config
+colorless.theme
diff --git a/autogen.sh b/autogen.sh
index 7ae651ed..a78de8b1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -142,8 +142,7 @@ for i in $files; do
   file=`echo "$i"|sed 's@^src/@@'`
   file=`echo "$file"|sed 's@/module-formats\.c$@@'`
   echo "  \"$file\" = {" >> colorless.theme
-  #cat $i | perl -e 'while (<>) { if (/.*".*".*".*"/) { s/^\W*{\W*"([^"]*)",\W*"([^"]*)".*/    \1 = "\2;"/; print $_; } }' >> colorless.theme
-  cat $i | perl -e 'while (<>) { if (/^\W*{\W*"([^"]*)",\W*"([^"]*)".*/) { $key = $1; $value = $2; $value ~= s/%[krgybmpcwKRGYBMPCW01234567]//g; print("    $key = \"$value\";\n"); } }' >> colorless.theme
+  cat $i | perl -e 'while (<>) { if (/^\W*{\W*"([^"]*)",\W*"([^"]*)".*/) { $key = $1; $value = $2; $value =~ s/%[krgybmpcwKRGYBMPCW01234567]//g; print("    $key = \"$value\";\n"); } }' >> colorless.theme
   echo "  };" >> colorless.theme
 done