[IMP] Improved Neopolitan and Skyline themes