Implemented additional theme options