diff --git a/locale/el.po b/locale/el.po
index 678a12491..4f38f6e15 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -9759,9 +9759,6 @@ msgstr ""
 "ή για LISP, αρχίστε με μια ανοικτή παρένθεση όπως:\n"
 "        (mult *track* 0.1)\n"
 " ."
-=======
-" ."
->>>>>>> master
 
 #: src/effects/nyquist/Nyquist.cpp:1749
 msgid "Error in Nyquist code"
diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
index eb9c1b409..94b40d377 100644
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
@@ -329,9 +329,17 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S )
 {
    CreateCreditsList();
 
-   wxString par1Str = _(
+   wxString par1Str = 
+// DA: Says that it is a customised version.
+#ifdef EXPERIMENTAL_DA
+      wxT(
 "Audacity, which this is a customised version of, is a free program written by a worldwide team of [[http://www.audacityteam.org/about/credits|volunteers]]. \
 Audacity is [[http://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems).");
+#else
+      _(
+"Audacity is a free program written by a worldwide team of [[http://www.audacityteam.org/about/credits|volunteers]]. \
+Audacity is [[http://www.audacityteam.org/download|available]] for Windows, Mac, and GNU/Linux (and other Unix-like systems).");
+#endif
 
    // This trick here means that the English language version won't mention using
    // English, whereas all translated versions will.
@@ -367,9 +375,12 @@ visit our [[http://forum.audacityteam.org/|forum]].");
       wxT("<h3>DarkAudacity ") + wxString(AUDACITY_VERSION_STRING) + wxT("</center></h3>") +
       wxT("Customised version of the Audacity free, open source, cross-platform software " ) +
       wxT("for recording and editing sounds.") +
-      wxT("<p><br>&nbsp; &nbsp; <b>Audacity<sup>&reg;</sup></b> software is copyright")+
-      wxT("&copy; 1999-2017 Audacity Team.<br>") +
+      wxT("<p><br>&nbsp; &nbsp; <b>Audacity<sup>&reg;</sup></b> software is copyright &copy; 1999-2017 Audacity Team.<br>") +
       wxT("&nbsp; &nbsp; The name <b>Audacity</b> is a registered trademark of Dominic Mazzoni.<br><br>") +
+
+#else
+      _("<h3>Audacity ") + wxString(AUDACITY_VERSION_STRING) + wxT("</center></h3>") +
+      _("Audacity the free, open source, cross-platform software for recording and editing sounds.") +
 #endif
 
       //wxT("<p><br>") + par1Str +
@@ -397,7 +408,7 @@ visit our [[http://forum.audacityteam.org/|forum]].");
       GetCreditsByRole(roleTranslators) +
 
       wxT("<p><b>") +  _("Libraries") + wxT("</b><br>") +
-      wxT("Audacity includes code from the following projects:") + wxT("<br><br>") +
+      _("Audacity includes code from the following projects:") + wxT("<br><br>") +
       GetCreditsByRole(roleLibrary) +
 
       wxT("<p><b>") +  _("Special thanks:") + wxT("</b><br>") +
@@ -408,6 +419,9 @@ visit our [[http://forum.audacityteam.org/|forum]].");
 // DA: Link for DA url too
 #ifdef EXPERIMENTAL_DA
       wxT("<br>DarkAudacity website: [[http://www.darkaudacity.com/|http://www.darkaudacity.com/]]") +
+#else
+      _("<p><br>&nbsp; &nbsp; <b>Audacity<sup>&reg;</sup></b> software is copyright &copy; 1999-2017 Audacity Team.<br>") +
+      _("&nbsp; &nbsp; The name <b>Audacity</b> is a registered trademark of Dominic Mazzoni.<br><br>") +
 #endif
 
       wxT("</center>")
@@ -572,7 +586,11 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
    informationStr += _("Features");
    informationStr += wxT("</h3>\n<table>");  // start table of features
 
-   AddBuildinfoRow(&informationStr, wxT("Theme"), _("Dark Theme"), enabled);
+#ifdef EXPERIMENTAL_DA
+   AddBuildinfoRow(&informationStr, wxT("Theme"), _("Dark Theme Extras"), enabled);
+#else
+   AddBuildinfoRow(&informationStr, wxT("Theme"), _("Dark Theme Extras"), disabled);
+#endif
 
    # if USE_NYQUIST
    AddBuildinfoRow(&informationStr, wxT("Nyquist"), _("Plug-in support"),
diff --git a/src/AllThemeResources.h b/src/AllThemeResources.h
index 32f52cdaf..9960bbe83 100644
--- a/src/AllThemeResources.h
+++ b/src/AllThemeResources.h
@@ -249,7 +249,13 @@ from there.  Audacity will look for a file called "Pause.png".
 */
    SET_THEME_FLAGS(  resFlagNewLine  );
 
+// DA: The logo with name xpm has a different width.
+#ifdef EXPERIMENTAL_DA
 #define LOGOWITHNAME_WIDTH 629
+#else
+#define LOGOWITHNAME_WIDTH 506
+#endif
+
 #define LOGOWITHNAME_HEIGHT 200
 
    DEFINE_IMAGE( bmpAudacityLogo, wxImage( 215, 190 ), wxT("AudacityLogo"));
diff --git a/src/Audacity.h b/src/Audacity.h
index b756a8316..698e44908 100644
--- a/src/Audacity.h
+++ b/src/Audacity.h
@@ -58,11 +58,20 @@
                                 wxT( AUDACITY_QUOTE( AUDACITY_REVISION ) ) \
                                 AUDACITY_SUFFIX
 
+// DA: x on end of version string.
+#ifdef EXPERIMENTAL_DA
 // Version string for file info (under Windows)
 #define AUDACITY_FILE_VERSION AUDACITY_QUOTE( AUDACITY_VERSION ) "," \
                               AUDACITY_QUOTE( AUDACITY_RELEASE ) "," \
                               AUDACITY_QUOTE( AUDACITY_REVISION ) "," \
                               AUDACITY_QUOTE( AUDACITY_MODLEVEL ) " x"
+#else
+#define AUDACITY_FILE_VERSION AUDACITY_QUOTE( AUDACITY_VERSION ) "," \
+                              AUDACITY_QUOTE( AUDACITY_RELEASE ) "," \
+                              AUDACITY_QUOTE( AUDACITY_REVISION ) "," \
+                              AUDACITY_QUOTE( AUDACITY_MODLEVEL )
+#endif
+
 
 // Increment this every time the prefs need to be reset
 // the first part (before the r) indicates the version the reset took place
diff --git a/src/AudacityHeaders.cpp b/src/AudacityHeaders.cpp
index 3f5ff007d..1fc83be0d 100644
--- a/src/AudacityHeaders.cpp
+++ b/src/AudacityHeaders.cpp
@@ -9,5 +9,3 @@
 **********************************************************************/
 
 #include "AudacityHeaders.h"
-
-
diff --git a/src/Experimental.h b/src/Experimental.h
index 80792571c..745537e1b 100644
--- a/src/Experimental.h
+++ b/src/Experimental.h
@@ -58,7 +58,7 @@
 
 //August 2009 - Theming not locked down enough for a stable release.
 // This turns on the Theme panel in Prefs dialog. It is independent of EXPERIMENTAL_THEMING.
-#define EXPERIMENTAL_THEME_PREFS
+//#define EXPERIMENTAL_THEME_PREFS
 
 //Next line enables Mic monitoring at times when it was previously off.
 //More work is needed as after recording or playing it results in an
diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp
index ee1c4663b..587fa7490 100644
--- a/src/effects/TruncSilence.cpp
+++ b/src/effects/TruncSilence.cpp
@@ -16,7 +16,6 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
-#include "../Experimental.h"
 #include "TruncSilence.h"
 
 #include <algorithm>
diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp
index 3aa1c2b43..313ffaac7 100644
--- a/src/toolbars/EditToolBar.cpp
+++ b/src/toolbars/EditToolBar.cpp
@@ -175,7 +175,10 @@ void EditToolBar::Populate()
    mButtons[ETBPasteID]->SetEnabled(false);
 
 #ifdef EXPERIMENTAL_SYNC_LOCK
-//   mButtons[ETBSyncLockID]->PushDown();
+// DA: Has no sync Lock Button
+#ifndef EXPERIMENTAL_DA
+   mButtons[ETBSyncLockID]->PushDown();
+#endif
 #endif
 
 #if defined(EXPERIMENTAL_EFFECTS_RACK)
@@ -251,7 +254,16 @@ void EditToolBar::OnButton(wxCommandEvent &event)
    // due to bugs elsewhere (see: AudacityProject::UpdateMenus() )
 
    // Be sure the pop-up happens even if there are exceptions
-   auto cleanup = finally( [&] { SetButton(false, mButtons[id]); } );
+   // Except, Sync Lock button is a toggle...
+   auto cleanup = finally( [&] { 
+      bool bIsToggle = false;
+#ifndef EXPERIMENTAL_DA
+      bIsToggle = bIsToggle || ( id != ETBSyncLockID );
+#endif
+      if( bIsToggle )
+         SetButton(false, mButtons[id]); 
+      } 
+   );
 
    switch (id) {
       case ETBCutID:
@@ -280,9 +292,12 @@ void EditToolBar::OnButton(wxCommandEvent &event)
          p->OnRedo();
          break;
 #ifdef EXPERIMENTAL_SYNC_LOCK
-//      case ETBSyncLockID:
-//         p->OnSyncLock();
-//         return;//avoiding the call to SetButton()
+// DA: Has no sync Lock Button
+#ifndef EXPERIMENTAL_DA
+      case ETBSyncLockID:
+         p->OnSyncLock();
+         break;
+#endif
 #endif
       case ETBZoomInID:
          p->OnZoomIn();
@@ -291,7 +306,7 @@ void EditToolBar::OnButton(wxCommandEvent &event)
          p->OnZoomOut();
          break;
 
-#if 0 // Disabled for version 1.2.0 since it doesn't work quite right...
+#if 0 // Disabled for version 1.2.0 because we have many other zoomers.
       case ETBZoomToggleID:
          p->OnZoomToggle();
          break;
@@ -339,12 +354,15 @@ void EditToolBar::EnableDisableButtons()
    mButtons[ETBPasteID]->SetEnabled(cm->GetEnabled("Paste"));
 
 #ifdef EXPERIMENTAL_SYNC_LOCK
-//   bool bSyncLockTracks;
-//   gPrefs->Read(wxT("/GUI/SyncLockTracks"), &bSyncLockTracks, false);
+// DA: Does not have Sync-Lock Button.
+#ifndef EXPERIMENTAL_DA
+   bool bSyncLockTracks;
+   gPrefs->Read(wxT("/GUI/SyncLockTracks"), &bSyncLockTracks, false);
 
-//   if (bSyncLockTracks)
-//      mButtons[ETBSyncLockID]->PushDown();
-//   else
-//      mButtons[ETBSyncLockID]->PopUp();
+   if (bSyncLockTracks)
+      mButtons[ETBSyncLockID]->PushDown();
+   else
+      mButtons[ETBSyncLockID]->PopUp();
+#endif
 #endif
 }
diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp
index 5b3e242c7..0ed75d170 100644
--- a/src/widgets/ASlider.cpp
+++ b/src/widgets/ASlider.cpp
@@ -78,6 +78,10 @@ const int sliderFontSize = 10;
 const int sliderFontSize = 12;
 #endif
 
+#ifndef EXPERIMENTAL_DA
+#define OPTIONAL_SLIDER_TICKS
+#endif
+
 //
 // TipPanel
 //
@@ -651,7 +655,7 @@ void LWSlider::Draw(wxDC & paintDC)
 
    mThumbBitmap = std::make_unique<wxBitmap>(wxBitmap( theTheme.Bitmap( bmpSliderThumb )));
 
-#if 0
+#ifdef OPTIONAL_SLIDER_TICKS
    // Create the bitmap
    mThumbBitmap = std::make_unique<wxBitmap>();
    mThumbBitmap->Create(mThumbWidth, mThumbHeight, paintDC);
@@ -858,7 +862,7 @@ void LWSlider::Draw(wxDC & paintDC)
             divs = mMaxValue - mMinValue + 1;
          upp = divs / (double)(mHeightY-1);
       }
-#if 0
+#ifdef OPTIONAL_SLIDER_TICKS
       double d = 0.0;
       int int_d = -1;
       const int kMax = (mOrientation == wxHORIZONTAL) ? mWidthX : mHeightY;
diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp
index f5b8e693e..2960ea30a 100644
--- a/src/widgets/Ruler.cpp
+++ b/src/widgets/Ruler.cpp
@@ -1984,7 +1984,12 @@ namespace {
    bool ReadScrubEnabledPref()
    {
       bool result {};
+// DA: Scrub is disabled by default.
+#ifdef EXPERIMENTAL_DA
       gPrefs->Read(scrubEnabledPrefName, &result, false);
+#else
+      gPrefs->Read(scrubEnabledPrefName, &result, true);
+#endif
       return result;
    }