Remake all of the themes

* Colours applied to new elements from upstream
* Light theme remake
* HiContrast theme remake
* Classic Theme remake
* Removal of black border and shadows around tracks
* Decreased contrast of bevels around TrackVRulerControls to make it fit better with the new themes.
* Tweaks to track lock symbols
* The unused colors have been reverted to their old colors to prevent unforeseen consequences.

Signed-off-by: akleja <storspov@gmail.com>

src/AColor.cpp

@@ -258,6 +258,7 @@ void AColor::BevelTrackInfo(wxDC & dc, bool up, const wxRect & r, bool highlight
 
    wxColour col;
    col = Blend( theTheme.Colour( clrTrackInfo ), up ? wxColour( 255,255,255):wxColour(0,0,0));
+   col = Blend( theTheme.Colour( clrTrackInfo ), col);
 
    wxPen pen( highlight ? uglyPen : col );
    dc.SetPen( pen );
@@ -266,6 +267,7 @@ void AColor::BevelTrackInfo(wxDC & dc, bool up, const wxRect & r, bool highlight
    dc.DrawLine(r.x, r.y, r.x, r.y + r.height);
 
    col = Blend( theTheme.Colour( clrTrackInfo ), up ? wxColour(0,0,0): wxColour(255,255,255));
+   col = Blend( theTheme.Colour( clrTrackInfo ), col);
 
    pen.SetColour( col );
    dc.SetPen( highlight ? uglyPen : pen );

src/TrackPanel.cpp

@@ -1390,28 +1390,6 @@ struct LabeledChannelGroup final : TrackPanelGroup {
    void Draw( TrackPanelDrawingContext &context,
       const wxRect &rect, unsigned iPass ) override
    {
-      if ( iPass == TrackArtist::PassBorders ) {
-         auto &dc = context.dc;
-         dc.SetBrush(*wxTRANSPARENT_BRUSH);
-         dc.SetPen(*wxBLACK_PEN);
-
-         // border
-         dc.DrawRectangle(
-            rect.x, rect.y,
-            rect.width - kShadowThickness, rect.height - kShadowThickness
-         );
-
-         // shadow
-         // Stroke lines along bottom and right, which are slightly short at
-         // bottom-left and top-right
-         const auto right = rect.GetRight();
-         const auto bottom = rect.GetBottom();
-
-         // bottom
-         AColor::Line(dc, rect.x + 2, bottom, right, bottom);
-         // right
-         AColor::Line(dc, right, rect.y + 2, right, bottom);
-      }
       if ( iPass == TrackArtist::PassFocus ) {
          // Sometimes highlight is not drawn on backing bitmap. I thought
          // it was because FindFocus did not return the TrackPanel on Mac, but

src/ZoomInfo.h

@@ -26,7 +26,7 @@ class AudacityProject;
 enum : int {
    // Constants related to x coordinates in the track panel
    kBorderThickness = 1,
-   kShadowThickness = 1,
+   kShadowThickness = 0,
 
    kLeftInset = 4,
    kRightInset = kLeftInset,