Seeing how they work now (I wasn't too sure quite how they work - placement, setup, etc) I think that's an excellent idea.
The current changes to the Electricity disclaimer - I like the exchange for the dotted border and line break for easier visual appeal, but I don't like the text alignment the way it currently is. I think it "worked" better centered.
If it's a "disclaimer" or "warning" templete (kind of like a static pop-up), they should all appear similar at least in formatting of them, right?