Final Fixes, added settings, changed theme