FIxed theme and added custom settings buttons