Bug fix and code standard cleaning

Submitted by skiquel on Sun, 06/01/2008 - 1:58pm
Commit #118922

Used the Coder module to brush up on some of the modules.

Fixed a bug where schemes would change across themes.