#58 Adjusted theme colors and theme config