Not on subject, but to save you future grief, I suggest that you first make local copies of all the files that you have edited. Look to the date stamp on the files on your host as the ones that you have changed will have a later date than most. Keep these in the zen structure on your machine.
Create a custom template even if identical to the one that you are using so that all of these files can be in their own folders named for your template. This is to preserve all of your edits when you eventually do an upgrade.
I would base this template on the template default files(not the classic files), and this will correct and ease styling for many issues.