v8.0.03 Final Commit

Further tweaks to enhance theme-ability