[IMP] Improved Airmail theme and some misc changes