Bug Fixes + Theme Finalized