You are right as it is expanding a lot! ;)
Anyway I'm planning other brand new templates mods for the future...