Only the luna template is 'upgraded'. All other template directories are left alone and you need to merge in the changes yourself (that's what the template diffs are for). If you are using the luna templates, then you need to go through your modified templates and look at the diffs to see what changes you need to merge back into your modified files (or you can just restore the file and make your changes again).

Adrian