diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index 99a279268..809cd1a3d 100644
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -23,18 +23,13 @@
 
 const char* aboutLine[]={
   "tildearrow",
-  "is not so happy to present",
+  "is proud to present",
   "",
   ("Furnace " DIV_VERSION),
   "",
   "the biggest multi-system chiptune tracker!",
   "featuring DefleMask song compatibility.",
   "",
-  "what a mess of a versioning scheme we have...",
-  "I mean it! these pre-releases are like normal releases",
-  "by now but only because I promised you to have SNES in",
-  "0.6pre2 I am doing this whole mess...",
-  "",
   "> CREDITS <",
   "",
   "-- program --",
@@ -187,7 +182,7 @@ void FurnaceGUI::drawAbout() {
   // do stuff
   if (ImGui::Begin("About Furnace",NULL,ImGuiWindowFlags_Modal|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoDocking|ImGuiWindowFlags_NoTitleBar)) {
     ImGui::SetWindowPos(ImVec2(0,0));
-    ImGui::SetWindowSize(ImVec2(scrW*dpiScale,scrH*dpiScale));
+    ImGui::SetWindowSize(ImVec2(canvasW,canvasH));
     ImGui::PushFont(bigFont);
     ImDrawList* dl=ImGui::GetWindowDrawList();
     float r=0;
@@ -195,47 +190,47 @@ void FurnaceGUI::drawAbout() {
     float b=0;
     float peakMix=settings.partyTime?((peak[0]+peak[1])*0.5):0.3;
     ImGui::ColorConvertHSVtoRGB(aboutHue,1.0,0.25+MIN(0.75f,peakMix*0.75f),r,g,b);
-    dl->AddRectFilled(ImVec2(0,0),ImVec2(scrW*dpiScale,scrH*dpiScale),0xff000000);
+    dl->AddRectFilled(ImVec2(0,0),ImVec2(canvasW,canvasH),0xff000000);
     bool skip=false;
     bool skip2=false;
-    for (int i=(-80-sin(double(aboutSin)*2*M_PI/120.0)*80.0)*2; i<scrW; i+=160) {
+    for (int i=(-80-sin(double(aboutSin)*2*M_PI/120.0)*80.0)*2*dpiScale; i<canvasW; i+=160*dpiScale) {
       skip2=!skip2;
       skip=skip2;
-      for (int j=(-80-cos(double(aboutSin)*2*M_PI/150.0)*80.0)*2; j<scrH; j+=160) {
+      for (int j=(-80-cos(double(aboutSin)*2*M_PI/150.0)*80.0)*2*dpiScale; j<canvasH; j+=160*dpiScale) {
         skip=!skip;
         if (skip) continue;
-        dl->AddRectFilled(ImVec2(i*dpiScale,j*dpiScale),ImVec2((i+160)*dpiScale,(j+160)*dpiScale),ImGui::GetColorU32(ImVec4(r*0.25,g*0.25,b*0.25,1.0)));
+        dl->AddRectFilled(ImVec2(i,j),ImVec2(i+160*dpiScale,j+160*dpiScale),ImGui::GetColorU32(ImVec4(r*0.25,g*0.25,b*0.25,1.0)));
       }
     }
 
     skip=false;
     skip2=false;
-    for (int i=(-80-cos(double(aboutSin)*2*M_PI/120.0)*80.0)*2; i<scrW; i+=160) {
+    for (int i=(-80-cos(double(aboutSin)*2*M_PI/120.0)*80.0)*2*dpiScale; i<canvasW; i+=160*dpiScale) {
       skip2=!skip2;
       skip=skip2;
-      for (int j=(-80-sin(double(aboutSin)*2*M_PI/150.0)*80.0)*2; j<scrH; j+=160) {
+      for (int j=(-80-sin(double(aboutSin)*2*M_PI/150.0)*80.0)*2*dpiScale; j<canvasH; j+=160*dpiScale) {
         skip=!skip;
         if (skip) continue;
-        dl->AddRectFilled(ImVec2(i*dpiScale,j*dpiScale),ImVec2((i+160)*dpiScale,(j+160)*dpiScale),ImGui::GetColorU32(ImVec4(r*0.5,g*0.5,b*0.5,1.0)));
+        dl->AddRectFilled(ImVec2(i,j),ImVec2(i+160*dpiScale,j+160*dpiScale),ImGui::GetColorU32(ImVec4(r*0.5,g*0.5,b*0.5,1.0)));
       }
     }
 
     skip=false;
     skip2=false;
-    for (int i=(-160+fmod(aboutSin*2,160))*2; i<scrW; i+=160) {
+    for (int i=(-160+fmod(aboutSin*2,160))*2*dpiScale; i<canvasW; i+=160*dpiScale) {
       skip2=!skip2;
       skip=skip2;
-      for (int j=(-240-cos(double(aboutSin*M_PI/300.0))*240.0)*2; j<scrH; j+=160) {
+      for (int j=(-240-cos(double(aboutSin*M_PI/300.0))*240.0)*2*dpiScale; j<canvasH; j+=160*dpiScale) {
         skip=!skip;
         if (skip) continue;
-        dl->AddRectFilled(ImVec2(i*dpiScale,j*dpiScale),ImVec2((i+160)*dpiScale,(j+160)*dpiScale),ImGui::GetColorU32(ImVec4(r*0.75,g*0.75,b*0.75,1.0)));
+        dl->AddRectFilled(ImVec2(i,j),ImVec2(i+160*dpiScale,j+160*dpiScale),ImGui::GetColorU32(ImVec4(r*0.75,g*0.75,b*0.75,1.0)));
       }
     }
 
     for (size_t i=0; i<aboutCount; i++) {
-      double posX=(scrW*dpiScale/2.0)+(sin(double(i)*0.5+double(aboutScroll)/90.0)*120*dpiScale)-(ImGui::CalcTextSize(aboutLine[i]).x*0.5);
-      double posY=(scrH-aboutScroll+42*i)*dpiScale;
-      if (posY<-80*dpiScale || posY>scrH*dpiScale) continue;
+      double posX=(canvasW/2.0)+(sin(double(i)*0.5+double(aboutScroll)/(90.0*dpiScale))*120*dpiScale)-(ImGui::CalcTextSize(aboutLine[i]).x*0.5);
+      double posY=(canvasH-aboutScroll+42*i*dpiScale);
+      if (posY<-80*dpiScale || posY>canvasH) continue;
       dl->AddText(bigFont,bigFont->FontSize,
                   ImVec2(posX+dpiScale,posY+dpiScale),
                   0xff000000,aboutLine[i]);
@@ -257,12 +252,12 @@ void FurnaceGUI::drawAbout() {
     float timeScale=60.0f*ImGui::GetIO().DeltaTime;
 
     aboutHue+=(0.001+peakMix*0.004)*timeScale;
-    aboutScroll+=(2+(peakMix>0.78)*3)*timeScale;
+    aboutScroll+=(2+(peakMix>0.78)*3)*timeScale*dpiScale;
     aboutSin+=(1+(peakMix>0.75)*2)*timeScale;
 
     while (aboutHue>1) aboutHue--;
     while (aboutSin>=2400) aboutSin-=2400;
-    if (aboutScroll>(42*aboutCount+scrH)) aboutScroll=-20;
+    if (aboutScroll>(42*dpiScale*aboutCount+canvasH)) aboutScroll=-20*dpiScale;
 
     WAKE_UP;
   }
diff --git a/src/gui/chanOsc.cpp b/src/gui/chanOsc.cpp
index 89b89801b..851ca6ede 100644
--- a/src/gui/chanOsc.cpp
+++ b/src/gui/chanOsc.cpp
@@ -109,7 +109,7 @@ void FurnaceGUI::drawChanOsc() {
     nextWindow=GUI_WINDOW_NOTHING;
   }
   if (!chanOscOpen) return;
-  ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(canvasW,canvasH));
   if (ImGui::Begin("Oscilloscope (per-channel)",&chanOscOpen,globalWinFlags|((chanOscOptions)?0:ImGuiWindowFlags_NoTitleBar))) {
     bool centerSettingReset=false;
     ImDrawList* dl=ImGui::GetWindowDrawList();
diff --git a/src/gui/debugWindow.cpp b/src/gui/debugWindow.cpp
index 38275c74c..68130d9dc 100644
--- a/src/gui/debugWindow.cpp
+++ b/src/gui/debugWindow.cpp
@@ -42,7 +42,7 @@ void FurnaceGUI::drawDebug() {
     nextWindow=GUI_WINDOW_NOTHING;
   }
   if (!debugOpen) return;
-  ImGui::SetNextWindowSizeConstraints(ImVec2(400.0f*dpiScale,200.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowSizeConstraints(ImVec2(400.0f*dpiScale,200.0f*dpiScale),ImVec2(canvasW,canvasH));
   if (ImGui::Begin("Debug",&debugOpen,globalWinFlags|ImGuiWindowFlags_NoDocking)) {
     ImGui::Text("NOTE: use with caution.");
     if (ImGui::TreeNode("Debug Controls")) {
diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp
index 1d0e2a250..e3e348c14 100644
--- a/src/gui/editControls.cpp
+++ b/src/gui/editControls.cpp
@@ -38,8 +38,8 @@ void FurnaceGUI::drawMobileControls() {
       mobileMenuPos=0.0f;
     }
   }
-  ImGui::SetNextWindowPos(portrait?ImVec2(0.0f,((1.0-mobileMenuPos*0.65)*scrH*dpiScale)-(0.16*scrW*dpiScale)):ImVec2(0.5*scrW*dpiScale*mobileMenuPos,0.0f));
-  ImGui::SetNextWindowSize(portrait?ImVec2(scrW*dpiScale,0.16*scrW*dpiScale):ImVec2(0.16*scrH*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowPos(portrait?ImVec2(0.0f,((1.0-mobileMenuPos*0.65)*canvasH)-(0.16*canvasW)):ImVec2(0.5*canvasW*mobileMenuPos,0.0f));
+  ImGui::SetNextWindowSize(portrait?ImVec2(canvasW,0.16*canvasW):ImVec2(0.16*canvasH,canvasH));
   if (ImGui::Begin("Mobile Controls",NULL,ImGuiWindowFlags_NoScrollbar|ImGuiWindowFlags_NoScrollWithMouse|globalWinFlags)) {
     float avail=portrait?ImGui::GetContentRegionAvail().y:ImGui::GetContentRegionAvail().x;
     ImVec2 buttonSize=ImVec2(avail,avail);
@@ -101,8 +101,8 @@ void FurnaceGUI::drawMobileControls() {
   if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_EDIT_CONTROLS;
   ImGui::End();
 
-  ImGui::SetNextWindowPos(portrait?ImVec2(0.0f,((1.0-mobileMenuPos*0.65)*scrH*dpiScale)):ImVec2(0.5*scrW*dpiScale*(mobileMenuPos-1.0),0.0f));
-  ImGui::SetNextWindowSize(portrait?ImVec2(scrW*dpiScale,0.65*scrH*dpiScale):ImVec2(0.5*scrW*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowPos(portrait?ImVec2(0.0f,((1.0-mobileMenuPos*0.65)*canvasH)):ImVec2(0.5*canvasW*(mobileMenuPos-1.0),0.0f));
+  ImGui::SetNextWindowSize(portrait?ImVec2(canvasW,0.65*canvasH):ImVec2(0.5*canvasW,canvasH));
   if (ImGui::Begin("Mobile Menu",NULL,ImGuiWindowFlags_NoScrollbar|ImGuiWindowFlags_NoScrollWithMouse|globalWinFlags)) {
     if (ImGui::BeginTable("SceneSel",5)) {
       ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthStretch,1.0f);
diff --git a/src/gui/effectList.cpp b/src/gui/effectList.cpp
index 2c71b5671..604204b86 100644
--- a/src/gui/effectList.cpp
+++ b/src/gui/effectList.cpp
@@ -9,7 +9,7 @@ void FurnaceGUI::drawEffectList() {
     nextWindow=GUI_WINDOW_NOTHING;
   }
   if (!effectListOpen) return;
-  ImGui::SetNextWindowSizeConstraints(ImVec2(60.0f*dpiScale,20.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowSizeConstraints(ImVec2(60.0f*dpiScale,20.0f*dpiScale),ImVec2(canvasW,canvasH));
   if (ImGui::Begin("Effect List",&effectListOpen,globalWinFlags)) {
     ImGui::Text("Chip at cursor: %s",e->getSystemName(e->sysOfChan[cursor.xCoarse]));
     if (ImGui::BeginTable("effectList",2)) {
diff --git a/src/gui/findReplace.cpp b/src/gui/findReplace.cpp
index 428fce5a4..91b494210 100644
--- a/src/gui/findReplace.cpp
+++ b/src/gui/findReplace.cpp
@@ -494,7 +494,7 @@ void FurnaceGUI::drawFindReplace() {
     nextWindow=GUI_WINDOW_NOTHING;
   }
   if (!findOpen) return;
-  ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(canvasW,canvasH));
   if (ImGui::Begin("Find/Replace",&findOpen,globalWinFlags)) {
     if (curQuery.empty()) {
       curQuery.push_back(FurnaceGUIFindQuery());
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index ec5e25cb3..45c4f018b 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -2751,12 +2751,8 @@ void FurnaceGUI::processPoint(SDL_Event& ev) {
       TouchPoint* point=NULL;
       FIND_POINT(point,-1);
       if (point!=NULL) {
-        point->x=ev.motion.x;
-        point->y=ev.motion.y;
-#ifdef __APPLE__
-        point->x*=dpiScale;
-        point->y*=dpiScale;
-#endif
+        point->x=(double)ev.motion.x*((double)canvasW/(double)scrW);
+        point->y=(double)ev.motion.y*((double)canvasH/(double)scrH);
       }
       break;
     }
@@ -2797,8 +2793,8 @@ void FurnaceGUI::processPoint(SDL_Event& ev) {
       if (point!=NULL) {
         float prevX=point->x;
         float prevY=point->y;
-        point->x=ev.tfinger.x*scrW*dpiScale;
-        point->y=ev.tfinger.y*scrH*dpiScale;
+        point->x=ev.tfinger.x*canvasW;
+        point->y=ev.tfinger.y*canvasH;
         point->z=ev.tfinger.pressure;
 
         if (point->id==0) {
@@ -2817,7 +2813,7 @@ void FurnaceGUI::processPoint(SDL_Event& ev) {
           break;
         }
       }
-      TouchPoint newPoint(ev.tfinger.fingerId,ev.tfinger.x*scrW*dpiScale,ev.tfinger.y*scrH*dpiScale,ev.tfinger.pressure);
+      TouchPoint newPoint(ev.tfinger.fingerId,ev.tfinger.x*canvasW,ev.tfinger.y*canvasH,ev.tfinger.pressure);
       activePoints.push_back(newPoint);
       pressedPoints.push_back(newPoint);
 
@@ -2983,16 +2979,10 @@ bool FurnaceGUI::loop() {
       if (!doThreadedInput) processEvent(&ev);
       switch (ev.type) {
         case SDL_MOUSEMOTION: {
-          int motionX=ev.motion.x;
-          int motionY=ev.motion.y;
-          int motionXrel=ev.motion.xrel;
-          int motionYrel=ev.motion.yrel;
-#ifdef __APPLE__
-          motionX*=dpiScale;
-          motionY*=dpiScale;
-          motionXrel*=dpiScale;
-          motionYrel*=dpiScale;
-#endif
+          int motionX=(double)ev.motion.x*((double)canvasW/(double)scrW);
+          int motionY=(double)ev.motion.y*((double)canvasH/(double)scrH);
+          int motionXrel=(double)ev.motion.xrel*((double)canvasW/(double)scrW);
+          int motionYrel=(double)ev.motion.yrel*((double)canvasH/(double)scrH);
           pointMotion(motionX,motionY,motionXrel,motionYrel);
           break;
         }
@@ -3009,13 +2999,8 @@ bool FurnaceGUI::loop() {
         case SDL_WINDOWEVENT:
           switch (ev.window.event) {
             case SDL_WINDOWEVENT_RESIZED:
-#ifdef __APPLE__
               scrW=ev.window.data1;
               scrH=ev.window.data2;
-#else
-              scrW=ev.window.data1/dpiScale;
-              scrH=ev.window.data2/dpiScale;
-#endif
               portrait=(scrW<scrH);
               logV("portrait: %d (%dx%d)",portrait,scrW,scrH);
               updateWindow=true;
@@ -3095,6 +3080,9 @@ bool FurnaceGUI::loop() {
         scrConfW=scrW;
         scrConfH=scrH;
       }
+
+      // update canvas size as well
+      SDL_GetRendererOutputSize(sdlRend,&canvasW,&canvasH);
     }
 
     wantCaptureKeyboard=ImGui::GetIO().WantTextInput;
@@ -3773,10 +3761,10 @@ bool FurnaceGUI::loop() {
       firstFrame=false;
 #ifdef IS_MOBILE
       SDL_GetWindowSize(sdlWin,&scrW,&scrH);
-      scrW/=dpiScale;
-      scrH/=dpiScale;
       portrait=(scrW<scrH);
       logV("portrait: %d (%dx%d)",portrait,scrW,scrH);
+
+      SDL_GetRendererOutputSize(sdlRend,&canvasW,&canvasH);
 #endif
       if (patternOpen) nextWindow=GUI_WINDOW_PATTERN;
 #ifdef __APPLE__
@@ -3794,12 +3782,12 @@ bool FurnaceGUI::loop() {
         ImGui::CloseCurrentPopup();
       }
       ImDrawList* dl=ImGui::GetForegroundDrawList();
-      dl->AddRectFilled(ImVec2(0.0f,0.0f),ImVec2(scrW*dpiScale,scrH*dpiScale),ImGui::ColorConvertFloat4ToU32(uiColors[GUI_COLOR_MODAL_BACKDROP]));
+      dl->AddRectFilled(ImVec2(0.0f,0.0f),ImVec2(canvasW,canvasH),ImGui::ColorConvertFloat4ToU32(uiColors[GUI_COLOR_MODAL_BACKDROP]));
       ImGui::EndPopup();
     }
 #endif
 
-    if (fileDialog->render(ImVec2(600.0f*dpiScale,400.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale))) {
+    if (fileDialog->render(ImVec2(600.0f*dpiScale,400.0f*dpiScale),ImVec2(canvasW,canvasH))) {
       bool openOpen=false;
       //ImGui::GetIO().ConfigFlags&=~ImGuiConfigFlags_NavEnableKeyboard;
       if ((curFileDialog==GUI_FILE_INS_OPEN || curFileDialog==GUI_FILE_INS_OPEN_REPLACE) && prevIns!=-3) {
@@ -4345,9 +4333,9 @@ bool FurnaceGUI::loop() {
       ImGui::EndPopup();
     }
 
-    ImGui::SetNextWindowSizeConstraints(ImVec2(400.0f*dpiScale,200.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+    ImGui::SetNextWindowSizeConstraints(ImVec2(400.0f*dpiScale,200.0f*dpiScale),ImVec2(canvasW,canvasH));
     if (ImGui::BeginPopupModal("New Song",NULL,ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoScrollWithMouse|ImGuiWindowFlags_NoScrollbar)) {
-      ImGui::SetWindowPos(ImVec2(((scrW*dpiScale)-ImGui::GetWindowSize().x)*0.5,((scrH*dpiScale)-ImGui::GetWindowSize().y)*0.5));
+      ImGui::SetWindowPos(ImVec2(((canvasW)-ImGui::GetWindowSize().x)*0.5,((canvasH)-ImGui::GetWindowSize().y)*0.5));
       drawNewSong();
       ImGui::EndPopup();
     }
@@ -4715,8 +4703,8 @@ bool FurnaceGUI::loop() {
       }
       bool anySelected=false;
       float sizeY=ImGui::GetFrameHeightWithSpacing()*pendingIns.size();
-      if (sizeY>(scrH-180.0)*dpiScale) {
-        sizeY=(scrH-180.0)*dpiScale;
+      if (sizeY>(canvasH-180.0*dpiScale)) {
+        sizeY=canvasH-180.0*dpiScale;
         if (sizeY<60.0*dpiScale) sizeY=60.0*dpiScale;
       }
       if (ImGui::BeginTable("PendingInsList",1,ImGuiTableFlags_ScrollY,ImVec2(0.0f,sizeY))) {
@@ -5077,7 +5065,7 @@ bool FurnaceGUI::init() {
     canvasH=scrH;
   }
 
-#if !defined(__APPLE__) && !defined(IS_MOBILE)
+#ifndef IS_MOBILE
   SDL_Rect displaySize;
 #endif
 
@@ -5098,6 +5086,7 @@ bool FurnaceGUI::init() {
     return false;
   }
 
+#ifndef IS_MOBILE
   if (SDL_GetDisplayUsableBounds(SDL_GetWindowDisplayIndex(sdlWin),&displaySize)==0) {
     bool mustChange=false;
     if (scrW>((displaySize.w)-48) && scrH>((displaySize.h)-64)) {
@@ -5122,6 +5111,7 @@ bool FurnaceGUI::init() {
       }
     }
   }
+#endif
 
 #ifdef IS_MOBILE
   SDL_GetWindowSize(sdlWin,&scrW,&scrH);
diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index 8cfbf9ec5..2894f4346 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -1903,12 +1903,12 @@ void FurnaceGUI::drawInsEdit() {
   }
   if (!insEditOpen) return;
   if (mobileUI) {
-    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*scrH*dpiScale)):ImVec2((0.16*scrH*dpiScale)+0.5*scrW*dpiScale*mobileMenuPos,0.0f));
-    patWindowSize=(portrait?ImVec2(scrW*dpiScale,scrH*dpiScale-(0.16*scrW*dpiScale)-(pianoOpen?(0.4*scrW*dpiScale):0.0f)):ImVec2(scrW*dpiScale-(0.16*scrH*dpiScale),scrH*dpiScale-(pianoOpen?(0.3*scrH*dpiScale):0.0f)));
+    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*canvasH)):ImVec2((0.16*canvasH)+0.5*canvasW*mobileMenuPos,0.0f));
+    patWindowSize=(portrait?ImVec2(canvasW,canvasH-(0.16*canvasW)-(pianoOpen?(0.4*canvasW):0.0f)):ImVec2(canvasW-(0.16*canvasH),canvasH-(pianoOpen?(0.3*canvasH):0.0f)));
     ImGui::SetNextWindowPos(patWindowPos);
     ImGui::SetNextWindowSize(patWindowSize);
   } else {
-    ImGui::SetNextWindowSizeConstraints(ImVec2(440.0f*dpiScale,400.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+    ImGui::SetNextWindowSizeConstraints(ImVec2(440.0f*dpiScale,400.0f*dpiScale),ImVec2(canvasW,canvasH));
   }
   if (ImGui::Begin("Instrument Editor",&insEditOpen,globalWinFlags|(settings.allowEditDocking?0:ImGuiWindowFlags_NoDocking))) {
     if (curIns<0 || curIns>=(int)e->song.ins.size()) {
diff --git a/src/gui/mixer.cpp b/src/gui/mixer.cpp
index 4897c64ac..019336ae4 100644
--- a/src/gui/mixer.cpp
+++ b/src/gui/mixer.cpp
@@ -27,7 +27,7 @@ void FurnaceGUI::drawMixer() {
     nextWindow=GUI_WINDOW_NOTHING;
   }
   if (!mixerOpen) return;
-  ImGui::SetNextWindowSizeConstraints(ImVec2(400.0f*dpiScale,200.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowSizeConstraints(ImVec2(400.0f*dpiScale,200.0f*dpiScale),ImVec2(canvasW,canvasH));
   if (ImGui::Begin("Mixer",&mixerOpen,globalWinFlags|(settings.allowEditDocking?0:ImGuiWindowFlags_NoDocking))) {
     char id[32];
     if (ImGui::SliderFloat("Master Volume",&e->song.masterVol,0,3,"%.2fx")) {
diff --git a/src/gui/osc.cpp b/src/gui/osc.cpp
index 176d7d54f..7791e8e56 100644
--- a/src/gui/osc.cpp
+++ b/src/gui/osc.cpp
@@ -84,7 +84,7 @@ void FurnaceGUI::drawOsc() {
     nextWindow=GUI_WINDOW_NOTHING;
   }
   if (!oscOpen) return;
-  ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(canvasW,canvasH));
   if (settings.oscTakesEntireWindow) {
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,ImVec2(0,0));
     ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing,ImVec2(0,0));
diff --git a/src/gui/pattern.cpp b/src/gui/pattern.cpp
index 385441d42..00e9b5106 100644
--- a/src/gui/pattern.cpp
+++ b/src/gui/pattern.cpp
@@ -376,8 +376,8 @@ void FurnaceGUI::drawPattern() {
   }
   ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,ImVec2(0.0f,0.0f));
   if (mobileUI) {
-    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*scrH*dpiScale)):ImVec2((0.16*scrH*dpiScale)+0.5*scrW*dpiScale*mobileMenuPos,0.0f));
-    patWindowSize=(portrait?ImVec2(scrW*dpiScale,scrH*dpiScale-(0.16*scrW*dpiScale)-(pianoOpen?(0.4*scrW*dpiScale):0.0f)):ImVec2(scrW*dpiScale-(0.16*scrH*dpiScale),scrH*dpiScale-(pianoOpen?(0.3*scrH*dpiScale):0.0f)));
+    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*canvasH)):ImVec2((0.16*canvasH)+0.5*canvasW*mobileMenuPos,0.0f));
+    patWindowSize=(portrait?ImVec2(canvasW,canvasH-(0.16*canvasW)-(pianoOpen?(0.4*canvasW):0.0f)):ImVec2(canvasW-(0.16*canvasH),canvasH-(pianoOpen?(0.3*canvasH):0.0f)));
     ImGui::SetNextWindowPos(patWindowPos);
     ImGui::SetNextWindowSize(patWindowSize);
   }
diff --git a/src/gui/piano.cpp b/src/gui/piano.cpp
index 082cc65e9..c0664e987 100644
--- a/src/gui/piano.cpp
+++ b/src/gui/piano.cpp
@@ -54,7 +54,7 @@ void FurnaceGUI::drawPiano() {
   if (!pianoOpen) return;
   if (mobileUI) {
     ImGui::SetNextWindowPos(ImVec2(patWindowPos.x,patWindowPos.y+patWindowSize.y));
-    ImGui::SetNextWindowSize(portrait?ImVec2(scrW*dpiScale,0.4*scrW*dpiScale):ImVec2(scrW*dpiScale-(0.16*scrH*dpiScale),0.3*scrH*dpiScale));
+    ImGui::SetNextWindowSize(portrait?ImVec2(canvasW,0.4*canvasW):ImVec2(canvasW-(0.16*canvasH),0.3*canvasH));
   }
   if (ImGui::Begin("Piano",&pianoOpen,((pianoOptions)?0:ImGuiWindowFlags_NoTitleBar)|ImGuiWindowFlags_NoScrollbar|ImGuiWindowFlags_NoScrollWithMouse|globalWinFlags)) {
     bool oldPianoKeyPressed[180];
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 1d1b4e97f..2dc12ad56 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -39,8 +39,8 @@ void FurnaceGUI::drawSampleEdit() {
   }
   if (!sampleEditOpen) return;
   if (mobileUI) {
-    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*scrH*dpiScale)):ImVec2((0.16*scrH*dpiScale)+0.5*scrW*dpiScale*mobileMenuPos,0.0f));
-    patWindowSize=(portrait?ImVec2(scrW*dpiScale,scrH*dpiScale-(0.16*scrW*dpiScale)-(pianoOpen?(0.4*scrW*dpiScale):0.0f)):ImVec2(scrW*dpiScale-(0.16*scrH*dpiScale),scrH*dpiScale-(pianoOpen?(0.3*scrH*dpiScale):0.0f)));
+    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*canvasH)):ImVec2((0.16*canvasH)+0.5*canvasW*mobileMenuPos,0.0f));
+    patWindowSize=(portrait?ImVec2(canvasW,canvasH-(0.16*canvasW)-(pianoOpen?(0.4*canvasW):0.0f)):ImVec2(canvasW-(0.16*canvasH),canvasH-(pianoOpen?(0.3*canvasH):0.0f)));
     ImGui::SetNextWindowPos(patWindowPos);
     ImGui::SetNextWindowSize(patWindowSize);
   }
diff --git a/src/gui/subSongs.cpp b/src/gui/subSongs.cpp
index f076298f2..a6eb70f0b 100644
--- a/src/gui/subSongs.cpp
+++ b/src/gui/subSongs.cpp
@@ -11,7 +11,7 @@ void FurnaceGUI::drawSubSongs() {
     nextWindow=GUI_WINDOW_NOTHING;
   }
   if (!subSongsOpen) return;
-  ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowSizeConstraints(ImVec2(64.0f*dpiScale,32.0f*dpiScale),ImVec2(canvasW,canvasH));
   if (ImGui::Begin("Subsongs",&subSongsOpen,globalWinFlags)) {
     char id[1024];
     ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-ImGui::GetFrameHeightWithSpacing()*2.0f-ImGui::GetStyle().ItemSpacing.x);
diff --git a/src/gui/volMeter.cpp b/src/gui/volMeter.cpp
index 7f68709c4..d058e31f7 100644
--- a/src/gui/volMeter.cpp
+++ b/src/gui/volMeter.cpp
@@ -28,7 +28,7 @@ void FurnaceGUI::drawVolMeter() {
   }
   if (!volMeterOpen) return;
   if (--isClipping<0) isClipping=0;
-  ImGui::SetNextWindowSizeConstraints(ImVec2(6.0f*dpiScale,6.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+  ImGui::SetNextWindowSizeConstraints(ImVec2(6.0f*dpiScale,6.0f*dpiScale),ImVec2(canvasW,canvasH));
   ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,ImVec2(0,0));
   ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0,0));
   ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing,ImVec2(0,0));
diff --git a/src/gui/waveEdit.cpp b/src/gui/waveEdit.cpp
index 41ac5cbf7..4054a66b9 100644
--- a/src/gui/waveEdit.cpp
+++ b/src/gui/waveEdit.cpp
@@ -177,12 +177,12 @@ void FurnaceGUI::drawWaveEdit() {
   if (!waveEditOpen) return;
   float wavePreview[257];
   if (mobileUI) {
-    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*scrH*dpiScale)):ImVec2((0.16*scrH*dpiScale)+0.5*scrW*dpiScale*mobileMenuPos,0.0f));
-    patWindowSize=(portrait?ImVec2(scrW*dpiScale,scrH*dpiScale-(0.16*scrW*dpiScale)-(pianoOpen?(0.4*scrW*dpiScale):0.0f)):ImVec2(scrW*dpiScale-(0.16*scrH*dpiScale),scrH*dpiScale-(pianoOpen?(0.3*scrH*dpiScale):0.0f)));
+    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*canvasH)):ImVec2((0.16*canvasH)+0.5*canvasW*mobileMenuPos,0.0f));
+    patWindowSize=(portrait?ImVec2(canvasW,canvasH-(0.16*canvasW)-(pianoOpen?(0.4*canvasW):0.0f)):ImVec2(canvasW-(0.16*canvasH),canvasH-(pianoOpen?(0.3*canvasH):0.0f)));
     ImGui::SetNextWindowPos(patWindowPos);
     ImGui::SetNextWindowSize(patWindowSize);
   } else {
-    ImGui::SetNextWindowSizeConstraints(ImVec2(300.0f*dpiScale,300.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+    ImGui::SetNextWindowSizeConstraints(ImVec2(300.0f*dpiScale,300.0f*dpiScale),ImVec2(canvasW,canvasH));
   }
   if (ImGui::Begin("Wavetable Editor",&waveEditOpen,globalWinFlags|(settings.allowEditDocking?0:ImGuiWindowFlags_NoDocking))) {
     if (curWave<0 || curWave>=(int)e->song.wave.size()) {