New theme apply
Many fixes import