diff --git a/.gitignore b/.gitignore
index f836b86..1b810e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,219 +1,7 @@
 
-# /
-/build*
-/output
+rockbox/
+templates/compiled
 
-# /rbutil/
-/rbutil/Makefile
-/rbutil/rbutil
-
-# /rbutil/chinachippatcher/
-/rbutil/chinachippatcher/chinachip
-
-# /rbutil/rbutilqt/
-/rbutil/rbutilqt/build
-/rbutil/rbutilqt/RockboxUtility
-/rbutil/rbutilqt/RockboxUtility.*
-/rbutil/rbutilqt/Makefile
-/rbutil/rbutilqt/*.qm
-/rbutil/rbutilqt/release
-/rbutil/rbutilqt/debug
-/rbutil/rbutilqt/*.Debug
-/rbutil/rbutilqt/*.Release
-/rbutil/rbutilqt/tags
-
-# /rbutil/rbutilqt/lang/
-/rbutil/rbutilqt/lang/*.qm
-
-# /tools/
-/tools/bdf2bmp
-/tools/sh2d
-/tools/scramble
-/tools/generate_rocklatin
-/tools/descramble
-/tools/convbdf
-/tools/bmp2rb
-/tools/codepages
-/tools/rdf2binary
-/tools/mkboot
-/tools/player_unifont
-/tools/uclpack
-/tools/ipod_fw
-/tools/checkwps
-/tools/wavtrim
-/tools/voicefont
-/tools/rbspeexenc
-/tools/rbspeexdec
-/tools/mknkboot
-/tools/mktccboot
-/tools/mkzenboot
-/tools/iaudio_bl_flash.c
-/tools/iaudio_bl_flash.h
-
-# /tools/checkwps/
-/tools/checkwps/checkwps.*
-
-# /tools/database/
-/tools/database/database
-
-# /tools/rbspeex/
-/tools/rbspeex/build
-/tools/rbspeex/libspeex.a
-/tools/rbspeex/librbspeex.a
-/tools/rbspeex/dep-speex
-
-# /tools/ucl/src/
-/tools/ucl/src/libucl.a
-
-# /utils/MTP/
-/utils/MTP/sendfirm
-
-# /utils/MTP/beastpatcher/
-/utils/MTP/beastpatcher/bootimg.*
-/utils/MTP/beastpatcher/beastpatcher
-/utils/MTP/beastpatcher/beastpatcher.exe
-/utils/MTP/beastpatcher/bin2c*
-
-# /utils/MTP/beastpatcher/vs2005/
-/utils/MTP/beastpatcher/vs2005/*.ncb
-/utils/MTP/beastpatcher/vs2005/*.suo
-/utils/MTP/beastpatcher/vs2005/*.user
-/utils/MTP/beastpatcher/vs2005/Debug
-/utils/MTP/beastpatcher/vs2005/Release
-
-# /utils/jz4740_tools/
-/utils/jz4740_tools/HXFreplace
-/utils/jz4740_tools/HXF2IHFS
-/utils/jz4740_tools/usbtool
-/utils/jz4740_tools/DLanalyser
-/utils/jz4740_tools/HXFsplit
-/utils/jz4740_tools/HXFmerge
-/utils/jz4740_tools/IHFSsplit
-/utils/jz4740_tools/HXFreplace.exe
-/utils/jz4740_tools/HXF2IHFS.exe
-/utils/jz4740_tools/usbtool.exe
-/utils/jz4740_tools/DLanalyser.exe
-/utils/jz4740_tools/HXFsplit.exe
-/utils/jz4740_tools/HXFmerge.exe
-/utils/jz4740_tools/IHFSsplit.exe
-/utils/jz4740_tools/jz_xloader.*
-/utils/jz4740_tools/bin2c
-
-# /utils/themeeditor/
-/utils/themeeditor/debug
-/utils/themeeditor/release
-/utils/themeeditor/build
-/utils/themeeditor/Makefile*
-/utils/themeeditor/object_script*
-/utils/themeeditor/rbthemeeditor
-/utils/themeeditor/*.exe
-
-# /utils/zenutils/
-/utils/zenutils/build
-/utils/zenutils/bin
-/utils/zenutils/CMakeCache.txt
-/utils/zenutils/CMakeFiles
-/utils/zenutils/cmake_install.cmake
-/utils/zenutils/Makefile
-
-# /utils/zenutils/libraries/
-/utils/zenutils/libraries/CMakeCache.txt
-/utils/zenutils/libraries/CMakeFiles
-/utils/zenutils/libraries/cmake_install.cmake
-/utils/zenutils/libraries/Makefile
-
-# /utils/zenutils/libraries/beecrypt-4.1.2/
-/utils/zenutils/libraries/beecrypt-4.1.2/CMakeCache.txt
-/utils/zenutils/libraries/beecrypt-4.1.2/CMakeFiles
-/utils/zenutils/libraries/beecrypt-4.1.2/cmake_install.cmake
-/utils/zenutils/libraries/beecrypt-4.1.2/Makefile
-
-# /utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/
-/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/CMakeCache.txt
-/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/CMakeFiles
-/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/cmake_install.cmake
-/utils/zenutils/libraries/beecrypt-4.1.2/beecrypt/Makefile
-
-# /utils/zenutils/libraries/getpot-c++-1.1.18/
-/utils/zenutils/libraries/getpot-c++-1.1.18/CMakeCache.txt
-/utils/zenutils/libraries/getpot-c++-1.1.18/CMakeFiles
-/utils/zenutils/libraries/getpot-c++-1.1.18/cmake_install.cmake
-/utils/zenutils/libraries/getpot-c++-1.1.18/Makefile
-
-# /utils/zenutils/libraries/getpot-c++-1.1.18/getpot/
-/utils/zenutils/libraries/getpot-c++-1.1.18/getpot/CMakeCache.txt
-/utils/zenutils/libraries/getpot-c++-1.1.18/getpot/CMakeFiles
-/utils/zenutils/libraries/getpot-c++-1.1.18/getpot/cmake_install.cmake
-/utils/zenutils/libraries/getpot-c++-1.1.18/getpot/Makefile
-
-# /utils/zenutils/libraries/pelib-0.9/
-/utils/zenutils/libraries/pelib-0.9/CMakeCache.txt
-/utils/zenutils/libraries/pelib-0.9/CMakeFiles
-/utils/zenutils/libraries/pelib-0.9/cmake_install.cmake
-/utils/zenutils/libraries/pelib-0.9/Makefile
-
-# /utils/zenutils/libraries/pelib-0.9/pelib/
-/utils/zenutils/libraries/pelib-0.9/pelib/CMakeCache.txt
-/utils/zenutils/libraries/pelib-0.9/pelib/CMakeFiles
-/utils/zenutils/libraries/pelib-0.9/pelib/cmake_install.cmake
-/utils/zenutils/libraries/pelib-0.9/pelib/Makefile
-
-# /utils/zenutils/libraries/pelib-0.9/pelib/buffer/
-/utils/zenutils/libraries/pelib-0.9/pelib/buffer/CMakeCache.txt
-/utils/zenutils/libraries/pelib-0.9/pelib/buffer/CMakeFiles
-/utils/zenutils/libraries/pelib-0.9/pelib/buffer/cmake_install.cmake
-/utils/zenutils/libraries/pelib-0.9/pelib/buffer/Makefile
-
-# /utils/zenutils/libraries/zlib123/
-/utils/zenutils/libraries/zlib123/CMakeCache.txt
-/utils/zenutils/libraries/zlib123/CMakeFiles
-/utils/zenutils/libraries/zlib123/cmake_install.cmake
-/utils/zenutils/libraries/zlib123/Makefile
-
-# /utils/zenutils/libraries/zlib123/zlib/
-/utils/zenutils/libraries/zlib123/zlib/CMakeCache.txt
-/utils/zenutils/libraries/zlib123/zlib/CMakeFiles
-/utils/zenutils/libraries/zlib123/zlib/cmake_install.cmake
-/utils/zenutils/libraries/zlib123/zlib/Makefile
-
-# /utils/zenutils/source/
-/utils/zenutils/source/CMakeCache.txt
-/utils/zenutils/source/CMakeFiles
-/utils/zenutils/source/cmake_install.cmake
-/utils/zenutils/source/Makefile
-
-# /utils/zenutils/source/firmware_extract/
-/utils/zenutils/source/firmware_extract/CMakeCache.txt
-/utils/zenutils/source/firmware_extract/CMakeFiles
-/utils/zenutils/source/firmware_extract/cmake_install.cmake
-/utils/zenutils/source/firmware_extract/Makefile
-
-# /utils/zenutils/source/firmware_make/
-/utils/zenutils/source/firmware_make/CMakeCache.txt
-/utils/zenutils/source/firmware_make/CMakeFiles
-/utils/zenutils/source/firmware_make/cmake_install.cmake
-/utils/zenutils/source/firmware_make/Makefile
-
-# /utils/zenutils/source/shared/
-/utils/zenutils/source/shared/CMakeCache.txt
-/utils/zenutils/source/shared/CMakeFiles
-/utils/zenutils/source/shared/cmake_install.cmake
-/utils/zenutils/source/shared/Makefile
-
-# /utils/zenutils/source/update_extract/
-/utils/zenutils/source/update_extract/CMakeCache.txt
-/utils/zenutils/source/update_extract/CMakeFiles
-/utils/zenutils/source/update_extract/cmake_install.cmake
-/utils/zenutils/source/update_extract/Makefile
-
-# /utils/zenutils/source/update_patch/
-/utils/zenutils/source/update_patch/CMakeCache.txt
-/utils/zenutils/source/update_patch/CMakeFiles
-/utils/zenutils/source/update_patch/cmake_install.cmake
-/utils/zenutils/source/update_patch/Makefile
-
-# /utils/zenutils/source/zen_crypt/
-/utils/zenutils/source/zen_crypt/CMakeCache.txt
-/utils/zenutils/source/zen_crypt/CMakeFiles
-/utils/zenutils/source/zen_crypt/cmake_install.cmake
-/utils/zenutils/source/zen_crypt/Makefile
+stats.dat
+versions.dat
+fontcoverage.ini