4
Whenever editing a theme's theme.html file, enable the "update module templates from theme folder" setting in preferences -> general settings.
When the theme is as you want it, set the setting to off again.
(I don't know whether this is a solution to the problems, you've encountered, so please give more information about what you want to change and what the problems are in detail)