some changes on theme