added yoda, changed indicators, decoloured buttons