changes on basic theme and multiple fixes