Stopwatch

fixing merge conflicts and adding fallback color for app