Theme less fixes