Two part question: (1) I look at template modifications using the "view modifications" link and they appear different than the template I'm looking at and there is no red/green indication for delete/add changes. The template mod is just substituted as if it were part of the template. So I realize that I'm working on a style that is actually a child style of the one I'm editing. But when I try to edit the template, let's say navigation, the template being shown is NOT the one I'm editing. It's actually the navigation.css version of the *parent* template. OK... so how do I make a template modification to the parent template using the modification system for find/replace rather than physically editing the parent template which is part of the framework? (2) I've got a couple of conflicts that exist between addons. I'd like for my modifications to take priority over others that "got there first." What do you do when this happens? So far I've been able to turn off some of these individual modifications in these other addons to get what I need done. Is there a suggested way to handle such conflicts?