some colors and definitions moved from buttons to variables