some fixes and Theme paddings