Changed some theme and added shortcuts