fixed theme and formatting