--- rxvt-unicode/src/scrollbar-xterm.C	2006/02/20 22:42:01	1.22
+++ rxvt-unicode/src/scrollbar-xterm.C	2007/11/15 11:36:15	1.25
@@ -49,7 +49,7 @@
         rxvt_fatal ("can't create bitmap\n");
 
       gcvalue.fill_style = FillOpaqueStippled;
-      gcvalue.foreground = pix_colors_focused[Color_fg];
+      gcvalue.foreground = pix_colors_focused[Color_scroll];
       gcvalue.background = pix_colors_focused[Color_bg];
 
       xscrollbarGC = XCreateGC (dpy, scrollBar.win,
@@ -61,7 +61,7 @@
 
   if (update)
     {
-      xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
+      xsb = option (Opt_scrollBar_right) ? 1 : 0;
       if (last_top < scrollBar.top)
         XClearArea (dpy, scrollBar.win,
                    sb_shadow + xsb, last_top,
@@ -84,5 +84,5 @@
             xsb ? 0 : sbwidth, scrollBar.end);
   return 1;
 }
-#endif				/* XTERM_SCROLLBAR */
+#endif /* XTERM_SCROLLBAR */
 /*----------------------- end-of-file (C source) -----------------------*/