Add Psyco Theme
Fix Conflict