Theme Issues Fix