diff --git a/libsrc/telestrat/clrscr.s b/libsrc/telestrat/clrscr.s
index a24647f86..22a880126 100644
--- a/libsrc/telestrat/clrscr.s
+++ b/libsrc/telestrat/clrscr.s
@@ -30,14 +30,13 @@
     sta     ADSCRH
 
     ; reset display position
-    lda     #$01
-    sta     SCRY
-    lda     #$00
-    sta     SCRX
+    ldx     #$01
+    stx     SCRY
+    dex
+    stx     SCRX
 
-    lda     #$00
-    sta     CHARCOLOR_CHANGE
-    sta     BGCOLOR_CHANGE
+    stx     CHARCOLOR_CHANGE
+    stx     BGCOLOR_CHANGE
 
     lda     #$07
     sta     CHARCOLOR
diff --git a/libsrc/telestrat/cputc.s b/libsrc/telestrat/cputc.s
index 96763cafb..d313d7780 100644
--- a/libsrc/telestrat/cputc.s
+++ b/libsrc/telestrat/cputc.s
@@ -15,7 +15,7 @@
     dec     SCRX
     pha
     lda     CHARCOLOR
-    BRK_TELEMON  $4E             ; Change color on the screen (foreground)
+    BRK_TELEMON  XFWR             ; Change color on the screen (foreground)
     lda     #$00
     sta     CHARCOLOR_CHANGE
     inc     SCRX
diff --git a/libsrc/telestrat/gotoxy.s b/libsrc/telestrat/gotoxy.s
index 8dcb69e89..7a53a77ab 100644
--- a/libsrc/telestrat/gotoxy.s
+++ b/libsrc/telestrat/gotoxy.s
@@ -23,14 +23,17 @@ gotoxy: jsr     popa            ; Get Y
         
         jsr     update_adscr          ; Update adress video ram position when SCRY et SCRX are modified
         ;       Force to put again attribute when it moves on the screen
-        lda     #$01
-        sta     CHARCOLOR_CHANGE
-        sta     BGCOLOR_CHANGE
+
         rts
 .endproc
 
 
 .proc update_adscr
+
+        lda     #$01
+        sta     CHARCOLOR_CHANGE
+        sta     BGCOLOR_CHANGE
+
         lda     #<SCREEN
         sta     ADSCRL
 
diff --git a/libsrc/telestrat/gotoy.s b/libsrc/telestrat/gotoy.s
index ae6a0bcf0..13be8e42b 100644
--- a/libsrc/telestrat/gotoy.s
+++ b/libsrc/telestrat/gotoy.s
@@ -2,7 +2,6 @@
 ; jede jede@oric.org 2017-02-25
 ;
     .export    _gotoy
-    .import    CHARCOLOR_CHANGE, BGCOLOR_CHANGE
 
     .import    update_adscr
 
@@ -14,8 +13,5 @@
 
    ; We change the current line, it means that we need to put color attributes again.
    ; That is not the case with _gotox because, it's on the same line attribute are already set
-   lda     #$01             
-   sta     CHARCOLOR_CHANGE
-   sta     BGCOLOR_CHANGE
    rts
 .endproc
diff --git a/libsrc/telestrat/textcolor.s b/libsrc/telestrat/textcolor.s
index b5584902d..ee6ba729a 100644
--- a/libsrc/telestrat/textcolor.s
+++ b/libsrc/telestrat/textcolor.s
@@ -9,11 +9,11 @@
 .proc _textcolor
     cmp     CHARCOLOR       ; Do we set the same color? If we don't detect it, we loose one char on the screen for each textcolor call with the same color
     bne     out             ; yes
-    
+
     ldy     #$00
     sty     CHARCOLOR_CHANGE
     
-    lda     CHARCOLOR       ; Return last color
+    ; Return last color
 
     rts
 out: