Added custom mode selection modes
Added 3 modules and improved custom mode