Think about it, though. When you go to upgrade and you have to copy files over, the templates (most of them, anyway) will stay the same. So, for upgrading, it is the best way to go. And it is a lot easier than editing the php files. Like your hack for the edit button in the postbit. I did that same thing with one conditional statement and never had to touch a php file to do it.