diff --git a/jssrc/term_screen.js b/jssrc/term_screen.js
index 9331ff9..c739aa1 100644
--- a/jssrc/term_screen.js
+++ b/jssrc/term_screen.js
@@ -1043,7 +1043,7 @@ Screen.once('load', () => {
 
 let fitScreen = false
 function fitScreenIfNeeded () {
-  Screen.window.fitIntoWidth = fitScreen ? window.innerWidth : 0
+  Screen.window.fitIntoWidth = fitScreen ? window.innerWidth - 20 : 0
   Screen.window.fitIntoHeight = fitScreen ? window.innerHeight : 0
 }
 fitScreenIfNeeded()
diff --git a/pages/term.php b/pages/term.php
index 7376c3f..f9dc768 100644
--- a/pages/term.php
+++ b/pages/term.php
@@ -43,7 +43,7 @@
 <h1><!-- Screen title gets loaded here by JS --></h1>
 
 <div id="term-wrap">
-	<div id="screen" class="theme-%theme%">
+	<div id="screen">
 		<input id="softkb-input" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
 		<div id="touch-select-menu">
 			<button id="touch-select-copy-btn">Copy</button>
@@ -73,7 +73,7 @@
 	try {
 		window.noAutoShow = true;
 		termInit(); // the screen will be loaded via ajax
-		Screen.load('%j:labels_seq%');
+		Screen.load('%j:labels_seq%', +'%theme%');
 	} catch(e) {
 		console.error(e);
 		<?php if (!DEBUG): ?>