Integrated latest changes from default theme