Theme Adjustment + Bug Fix