Minor Updates To Theme System