I moved everything to match the scheme of Marin0 non-special edition.