diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qss
index eafcbd15..3c20d4c2 100644
--- a/stuff/config/qss/Dark/Dark.qss
+++ b/stuff/config/qss/Dark/Dark.qss
@@ -2118,12 +2118,12 @@ SpreadsheetViewer {
   qproperty-MarkerLineColor: #1E96C4;
   qproperty-BGColor: #383838;
   qproperty-VerticalLineColor: #0f0f0f;
-  qproperty-KeyFrameColor: orange;
-  qproperty-KeyFrameBorderColor: #ffc04d;
-  qproperty-SelectedKeyFrameColor: #fab538;
-  qproperty-InBetweenColor: cyan;
-  qproperty-InBetweenBorderColor: #4dffff;
-  qproperty-SelectedInBetweenColor: #38fafa;
+  qproperty-KeyFrameColor: rgba(191, 146, 64, 0.1);
+  qproperty-KeyFrameBorderColor: orange;
+  qproperty-SelectedKeyFrameColor: rgba(191, 146, 64, 0.5);
+  qproperty-InBetweenColor: rgba(64, 191, 191, 0.1);
+  qproperty-InBetweenBorderColor: cyan;
+  qproperty-SelectedInBetweenColor: rgba(64, 191, 191, 0.5);
   qproperty-SelectedEmptyColor: rgba(83, 133, 166, 0.3);
   qproperty-SelectedSceneRangeEmptyColor: #5d5d5d;
   qproperty-TextColor: #e6e6e6;
diff --git a/stuff/config/qss/Darker/Darker.qss b/stuff/config/qss/Darker/Darker.qss
index 889e541f..8e2cff22 100644
--- a/stuff/config/qss/Darker/Darker.qss
+++ b/stuff/config/qss/Darker/Darker.qss
@@ -2118,12 +2118,12 @@ SpreadsheetViewer {
   qproperty-MarkerLineColor: #1E96C4;
   qproperty-BGColor: #282828;
   qproperty-VerticalLineColor: #000000;
-  qproperty-KeyFrameColor: orange;
-  qproperty-KeyFrameBorderColor: #ffc04d;
-  qproperty-SelectedKeyFrameColor: #fab538;
-  qproperty-InBetweenColor: cyan;
-  qproperty-InBetweenBorderColor: #4dffff;
-  qproperty-SelectedInBetweenColor: #38fafa;
+  qproperty-KeyFrameColor: rgba(191, 146, 64, 0.1);
+  qproperty-KeyFrameBorderColor: orange;
+  qproperty-SelectedKeyFrameColor: rgba(191, 146, 64, 0.5);
+  qproperty-InBetweenColor: rgba(64, 191, 191, 0.1);
+  qproperty-InBetweenBorderColor: cyan;
+  qproperty-SelectedInBetweenColor: rgba(64, 191, 191, 0.5);
   qproperty-SelectedEmptyColor: rgba(83, 133, 166, 0.3);
   qproperty-SelectedSceneRangeEmptyColor: #4d4d4d;
   qproperty-TextColor: #e6e6e6;
diff --git a/stuff/config/qss/Medium/Medium.qss b/stuff/config/qss/Medium/Medium.qss
index 34699bd5..4ae33946 100644
--- a/stuff/config/qss/Medium/Medium.qss
+++ b/stuff/config/qss/Medium/Medium.qss
@@ -2118,12 +2118,12 @@ SpreadsheetViewer {
   qproperty-MarkerLineColor: #1E96C4;
   qproperty-BGColor: #404040;
   qproperty-VerticalLineColor: #272727;
-  qproperty-KeyFrameColor: orange;
-  qproperty-KeyFrameBorderColor: #ffc04d;
-  qproperty-SelectedKeyFrameColor: #fab538;
-  qproperty-InBetweenColor: cyan;
-  qproperty-InBetweenBorderColor: #4dffff;
-  qproperty-SelectedInBetweenColor: #38fafa;
+  qproperty-KeyFrameColor: rgba(191, 146, 64, 0.1);
+  qproperty-KeyFrameBorderColor: orange;
+  qproperty-SelectedKeyFrameColor: rgba(191, 146, 64, 0.5);
+  qproperty-InBetweenColor: rgba(64, 191, 191, 0.1);
+  qproperty-InBetweenBorderColor: cyan;
+  qproperty-SelectedInBetweenColor: rgba(64, 191, 191, 0.5);
   qproperty-SelectedEmptyColor: rgba(83, 133, 166, 0.3);
   qproperty-SelectedSceneRangeEmptyColor: #757575;
   qproperty-TextColor: #e6e6e6;
diff --git a/stuff/config/qss/Medium/less/Medium.less b/stuff/config/qss/Medium/less/Medium.less
index b65660c0..c5cf2ad8 100644
--- a/stuff/config/qss/Medium/less/Medium.less
+++ b/stuff/config/qss/Medium/less/Medium.less
@@ -552,13 +552,13 @@
 @function-panel-Selected-color: #FFA500;
 
 // Function Spreadsheet Viewer
-@function-KeyFrame-color: @keyframe-total-color; //rgb(153,93,29);
-@function-KeyFrameBorder-color: lighten(@function-KeyFrame-color, 15); //rgb(201,176,75);
-@function-SelectedKeyFrame-color: lighten(desaturate(@function-KeyFrame-color, 5), 10);
+@function-KeyFrame-color: fadeout(desaturate(@keyframe-total-color, 50), 90); 
+@function-KeyFrameBorder-color: @keyframe-total-color; 
+@function-SelectedKeyFrame-color: fadeout(desaturate(@keyframe-total-color, 50), 50);
 
-@function-Inbetween-color: @keyframe-inbetween-color; //rgb(102,98,80);
-@function-InbetweenBorder-color: lighten(@keyframe-inbetween-color, 15); //rgb(205,206,200);
-@function-SelectedInbetween-color: lighten(desaturate(@function-Inbetween-color, 5), 10);
+@function-Inbetween-color: fadeout(desaturate(@keyframe-inbetween-color, 50), 90); 
+@function-InbetweenBorder-color: @keyframe-inbetween-color; //rgb(205,206,200);
+@function-SelectedInbetween-color: fadeout(desaturate(@keyframe-inbetween-color, 50), 50);
 
 @function-SelectedSceneRangeEmpty-color: lighten(@bg, 17.6471);
 
diff --git a/toonz/sources/stopmotion/canon.cpp b/toonz/sources/stopmotion/canon.cpp
index dd19349f..3d4708b2 100644
--- a/toonz/sources/stopmotion/canon.cpp
+++ b/toonz/sources/stopmotion/canon.cpp
@@ -873,6 +873,9 @@ bool Canon::downloadImage(EdsBaseRef object) {
   memcpy(rawData, resizedBuf, newSize);
   StopMotion::instance()->m_newImage->unlock();
 
+  m_proxyImageDimensions = StopMotion::instance()->m_newImage->getSize();
+
+
   // write out the full res file
   QFile fullImage(StopMotion::instance()->m_tempFile);
   fullImage.open(QIODevice::WriteOnly);
diff --git a/toonz/sources/stopmotion/stopmotion.cpp b/toonz/sources/stopmotion/stopmotion.cpp
index 2a107433..5594c137 100644
--- a/toonz/sources/stopmotion/stopmotion.cpp
+++ b/toonz/sources/stopmotion/stopmotion.cpp
@@ -43,7 +43,7 @@
 #include <QXmlStreamReader>
 
 // Connected camera
-TEnv::IntVar StopMotionOpacity("StopMotionOpacity", 100);
+TEnv::IntVar StopMotionOpacity("StopMotionOpacity", 204);
 TEnv::IntVar StopMotionAlwaysLiveView("StopMotionAlwaysLiveView", 0);
 TEnv::IntVar StopMotionPlaceOnXSheet("StopMotionPlaceOnXSheet", 1);
 TEnv::IntVar StopMotionReviewTime("StopMotionReviewTime", 1);
diff --git a/toonz/sources/tnztools/geometrictool.cpp b/toonz/sources/tnztools/geometrictool.cpp
index b43563ad..a66e04d0 100644
--- a/toonz/sources/tnztools/geometrictool.cpp
+++ b/toonz/sources/tnztools/geometrictool.cpp
@@ -427,7 +427,6 @@ public:
     if (targetType & TTool::Vectors) {
       m_prop[0].bind(m_autogroup);
       m_prop[0].bind(m_autofill);
-      m_prop[0].bind(m_smooth);
       m_prop[0].bind(m_snap);
       m_snap.setId("Snap");
       m_prop[0].bind(m_snapSensitivity);
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 398220be..4c416529 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -2421,7 +2421,7 @@ void MainWindow::defineActions() {
   createToolAction(T_Plastic, "plastic", tr("Plastic Tool"), "X",
                    tr("Plastic Tool: Builds a mesh that allows to deform and "
                       "animate a level"));
-  createToolAction(T_Ruler, "ruler", tr("Ruler Tool"), "");
+  createToolAction(T_Ruler, "ruler", tr("Ruler Tool"), "", tr("Ruler Tool: Measure distances on the canvas"));
   createToolAction(T_Finger, "finger", tr("Finger Tool"), "",
                    tr("Finger Tool: Smudges small areas to cover with line"));
 
diff --git a/toonz/sources/toonz/tpanels.h b/toonz/sources/toonz/tpanels.h
index 988d39cb..8dad334b 100644
--- a/toonz/sources/toonz/tpanels.h
+++ b/toonz/sources/toonz/tpanels.h
@@ -270,6 +270,7 @@ protected:
   // reimplementation of TPanel::widgetFocusOnEnter
   void widgetFocusOnEnter() override;
   void widgetClearFocusOnLeave() override;
+  bool isActivatableOnEnter() override { return true; }
 };
 
 //=========================================================
@@ -289,6 +290,7 @@ protected:
   // reimplementation of TPanel::widgetFocusOnEnter
   void widgetFocusOnEnter() override;
   void widgetClearFocusOnLeave() override;
+  bool isActivatableOnEnter() override { return true; }
 };
 
 //=========================================================