diff --git a/server/drivers/bayrad.c b/server/drivers/bayrad.c
index c3cb809..6cce0f6 100644
--- a/server/drivers/bayrad.c
+++ b/server/drivers/bayrad.c
@@ -60,278 +60,6 @@ typedef struct driver_private_data {
 } PrivateData;	
 
 
-  /////////////////////////////////////////////////////////////
- /* Declare a bunch of global, static custom character data */
-/////////////////////////////////////////////////////////////
-
-char bar_up[7][5*8] = {
-  {
-	 0,0,0,0,0, //  char u1[] =
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 1,1,1,1,1,
-      },
-      {
-	 0,0,0,0,0, //  char u2[] =
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-      },{
-	 0,0,0,0,0, //  char u3[] =
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-      },{
-	 0,0,0,0,0, //  char u4[] =
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-      },{
-	 0,0,0,0,0, //  char u5[] =
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-      },{
-	 0,0,0,0,0, //  char u6[] =
-	 0,0,0,0,0,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-      },{
-	 0,0,0,0,0, //  char u7[] =
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-      },};
-
-
-char bar_down[7][5*8] = {  /* Presently, this is not used */
-     {
-	 1,1,1,1,1, //  char d1[] =
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-      },{
-	 1,1,1,1,1, //  char d2[] =
-	 1,1,1,1,1,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-      },{
-	 1,1,1,1,1, //  char d3[] =
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-      },{
-	 1,1,1,1,1, //  char d4[] =
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-      },{
-	 1,1,1,1,1, //  char d5[] =
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-      },{
-	 1,1,1,1,1, //  char d6[] =
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 0,0,0,0,0,
-	 0,0,0,0,0,
-      },{
-	 1,1,1,1,1, //  char d7[] =
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 0,0,0,0,0,
-      },};
-
-char bar_right[5][5*8] = {
-  {
-	 1,0,0,0,0, //  char r1[] =
-	 1,0,0,0,0,
-	 1,0,0,0,0,
-	 1,0,0,0,0,
-	 1,0,0,0,0,
-	 1,0,0,0,0,
-	 1,0,0,0,0,
-	 1,0,0,0,0,
-      },{
-	 1,1,0,0,0, //  char r2[] =
-	 1,1,0,0,0,
-	 1,1,0,0,0,
-	 1,1,0,0,0,
-	 1,1,0,0,0,
-	 1,1,0,0,0,
-	 1,1,0,0,0,
-	 1,1,0,0,0,
-      },{
-	 1,1,1,0,0, //  char r3[] =
-	 1,1,1,0,0,
-	 1,1,1,0,0,
-	 1,1,1,0,0,
-	 1,1,1,0,0,
-	 1,1,1,0,0,
-	 1,1,1,0,0,
-	 1,1,1,0,0,
-      },{
-	 1,1,1,1,0, //  char r4[] =
-	 1,1,1,1,0,
-	 1,1,1,1,0,
-	 1,1,1,1,0,
-	 1,1,1,1,0,
-	 1,1,1,1,0,
-	 1,1,1,1,0,
-	 1,1,1,1,0,
-      },{
-	 1,1,1,1,1, //  char r5[] =
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-      },};
-
-char bar_left[5][5*8] = {  /* Presently, this is not used. */
-  {
-	 0,0,0,0,1, //  char l1[] =
-	 0,0,0,0,1,
-	 0,0,0,0,1,
-	 0,0,0,0,1,
-	 0,0,0,0,1,
-	 0,0,0,0,1,
-	 0,0,0,0,1,
-	 0,0,0,0,1,
-      },{
-	 0,0,0,1,1, //  char l2[] =
-	 0,0,0,1,1,
-	 0,0,0,1,1,
-	 0,0,0,1,1,
-	 0,0,0,1,1,
-	 0,0,0,1,1,
-	 0,0,0,1,1,
-	 0,0,0,1,1,
-      },{
-	 0,0,1,1,1, //  char l3[] =
-	 0,0,1,1,1,
-	 0,0,1,1,1,
-	 0,0,1,1,1,
-	 0,0,1,1,1,
-	 0,0,1,1,1,
-	 0,0,1,1,1,
-	 0,0,1,1,1,
-      },{
-	 0,1,1,1,1, //  char l4[] =
-	 0,1,1,1,1,
-	 0,1,1,1,1,
-	 0,1,1,1,1,
-	 0,1,1,1,1,
-	 0,1,1,1,1,
-	 0,1,1,1,1,
-	 0,1,1,1,1,
-      },{
-	 1,1,1,1,1, //  char l5[] =
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-	 1,1,1,1,1,
-      },};
-
-
-char icons[3][5*8] = {
-   {
-     1,1,1,1,1,  // Empty Heart
-     1,0,1,0,1,
-     0,0,0,0,0,
-     0,0,0,0,0,
-     0,0,0,0,0,
-     1,0,0,0,1,
-     1,1,0,1,1,
-     1,1,1,1,1,
-   },
-
-   {
-     1,1,1,1,1,  // Filled Heart
-     1,0,1,0,1,
-     0,1,0,1,0,
-     0,1,1,1,0,
-     0,1,1,1,0,
-     1,0,1,0,1,
-     1,1,0,1,1,
-     1,1,1,1,1,
-   },
-
-   {
-     0,0,0,0,0,  // Ellipsis
-     0,0,0,0,0,
-     0,0,0,0,0,
-     0,0,0,0,0,
-     0,0,0,0,0,
-     0,0,0,0,0,
-     0,0,0,0,0,
-     1,0,1,0,1,
-   },
-
-  };
-
-
 // Vars for the server core
 MODULE_EXPORT char * api_version = API_VERSION;
 MODULE_EXPORT int stay_in_foreground = 1;
@@ -638,6 +366,72 @@ void
 bayrad_init_vbar(Driver * drvthis)
 {
   PrivateData *p = drvthis->private_data;
+  static char bar_up[7][5*8] = {
+      {
+	 0,0,0,0,0, //  char u1[] =
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 1,1,1,1,1,
+      }, {
+	 0,0,0,0,0, //  char u2[] =
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+      },{
+	 0,0,0,0,0, //  char u3[] =
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+      },{
+	 0,0,0,0,0, //  char u4[] =
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+      },{
+	 0,0,0,0,0, //  char u5[] =
+	 0,0,0,0,0,
+	 0,0,0,0,0,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+      },{
+	 0,0,0,0,0, //  char u6[] =
+	 0,0,0,0,0,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+      },{
+	 0,0,0,0,0, //  char u7[] =
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+      }
+  };
 
   //debug(RPT_DEBUG,"Init Vertical bars.");
 
@@ -670,6 +464,54 @@ void
 bayrad_init_hbar(Driver * drvthis)
 {
   PrivateData *p = drvthis->private_data;
+  static char bar_right[5][5*8] = {
+      {
+	 1,0,0,0,0, //  char r1[] =
+	 1,0,0,0,0,
+	 1,0,0,0,0,
+	 1,0,0,0,0,
+	 1,0,0,0,0,
+	 1,0,0,0,0,
+	 1,0,0,0,0,
+	 1,0,0,0,0,
+      },{
+	 1,1,0,0,0, //  char r2[] =
+	 1,1,0,0,0,
+	 1,1,0,0,0,
+	 1,1,0,0,0,
+	 1,1,0,0,0,
+	 1,1,0,0,0,
+	 1,1,0,0,0,
+	 1,1,0,0,0,
+      },{
+	 1,1,1,0,0, //  char r3[] =
+	 1,1,1,0,0,
+	 1,1,1,0,0,
+	 1,1,1,0,0,
+	 1,1,1,0,0,
+	 1,1,1,0,0,
+	 1,1,1,0,0,
+	 1,1,1,0,0,
+      },{
+	 1,1,1,1,0, //  char r4[] =
+	 1,1,1,1,0,
+	 1,1,1,1,0,
+	 1,1,1,1,0,
+	 1,1,1,1,0,
+	 1,1,1,1,0,
+	 1,1,1,1,0,
+	 1,1,1,1,0,
+      },{
+	 1,1,1,1,1, //  char r5[] =
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+	 1,1,1,1,1,
+      }
+  };
 
   //debug(RPT_DEBUG,"Init Horizontal bars.");
 
@@ -803,6 +645,36 @@ MODULE_EXPORT int
 bayrad_icon(Driver * drvthis, int x, int y, int icon)
 {
   //PrivateData *p = drvthis->private_data;
+  static char icons[3][5*8] = {
+   {
+     1,1,1,1,1,  // Empty Heart
+     1,0,1,0,1,
+     0,0,0,0,0,
+     0,0,0,0,0,
+     0,0,0,0,0,
+     1,0,0,0,1,
+     1,1,0,1,1,
+     1,1,1,1,1,
+   },{
+     1,1,1,1,1,  // Filled Heart
+     1,0,1,0,1,
+     0,1,0,1,0,
+     0,1,1,1,0,
+     0,1,1,1,0,
+     1,0,1,0,1,
+     1,1,0,1,1,
+     1,1,1,1,1,
+   },{
+     0,0,0,0,0,  // Ellipsis
+     0,0,0,0,0,
+     0,0,0,0,0,
+     0,0,0,0,0,
+     0,0,0,0,0,
+     0,0,0,0,0,
+     0,0,0,0,0,
+     1,0,1,0,1,
+   }
+  };
 
   switch (icon) {
     case ICON_BLOCK_FILLED: