Fixed
 - fixed some theme related minor issues