add clip folders, icon margins, fix safe regions, update neophyte, fix folder edl...
[goodguy/history.git] / cinelerra-5.1 / plugins / theme_neophyte / neophyte.C
index a18bd905bdd5c50d0312f9a8671b4a8965fa00f4..4bc9f5210b3aa2baa2d75f5abd52a20aa402df17 100644 (file)
 #define BlackSevenTwo 0x474747     // 72% black
 #define BlackEightFive 0x262626    // 85% black
 #define BlackFive 0xf2f2f2         //  5% black
-#define BabyBlue 0x5f8dd3          // baby-blue
+#define BabyBlue 0x5f8dd3
 #define BabyBlueDark 0x162d50      // baby-blue -3 (inkscape), e.g. dialog Subtitle
-// traffic lights
-// light green 0x27ae60/0x37c871 - just on the buttons.
+// traffic lights, light green: 0x27ae60/0x37c871 - just on the buttons.
 #define ComicYellow 0xffcc00       // heads up!
 #define DarkRed 0xaa0000           // locked or not switched on. 
 #define LockedRed 0x400000
@@ -68,7 +67,7 @@ PluginClient* new_plugin(PluginServer *server)
 }
 
 NEOPHYTETHEMEMain::NEOPHYTETHEMEMain(PluginServer *server)
-  : PluginTClient(server)
+       : PluginTClient(server)
 {
 }
 
@@ -87,7 +86,7 @@ Theme* NEOPHYTETHEMEMain::new_theme()
 }
 
 NEOPHYTETHEME::NEOPHYTETHEME()
-  : Theme()
+       : Theme()
 {
 }
 
@@ -106,50 +105,58 @@ void NEOPHYTETHEME::initialize()
 {
        BC_Resources *resources = BC_WindowBase::get_resources();
 
-  // something own, fitting to the theme and independent of the integrated splash screen/about
-       about_bg = new VFramePng(get_image_data("about_bg.png")); // Preferences: About (logo)
-  // new_image("mwindow_icon", "cinelerra_icon_mwin.png");  // replacement for the heroine icon, maybe
-  // new_image("vwindow_icon", "cinelerra_icon_vwin.png");
-  // new_image("cwindow_icon", "cinelerra_icon_cwin.png");
-  // new_image("awindow_icon", "cinelerra_icon_awin.png");
-  // new_image("record_icon", "cinelerra_icon_rec.png");
+       /* Something own, fitting to the theme and independent of
+          the integrated splash screen/about */
+       // Preferences: About (logo)
+       about_bg = new VFramePng(get_image_data("about_bg.png"));
+       
+       /* Replacement for the heroine icon, maybe. Everyone has his 
+          own ideas about this, especially in connection with the 
+          new desktops[tm]. It would be better to solve this globally,
+          irrespective of the theme currently in use. */
+       // new_image("mwindow_icon", "cin_icon_mwin.png");
+       // new_image("vwindow_icon", "cin_icon_vwin.png");
+       // new_image("cwindow_icon", "cin_icon_cwin.png");
+       // new_image("awindow_icon", "cin_icon_awin.png");
+       // new_image("record_icon", "cin_icon_rec.png");
     
        resources->text_default = CreamyWhite;     // general text color
-       resources->text_background = BlackNineTwo; // 
+       resources->text_background = BlackNineTwo;
        resources->text_background_disarmed = LockedRed; // arm track locked (!)
-
-       resources->text_border2 = BlackNineTwo;  // l,t outside
-  resources->text_border1 = BLACK;         // l,t inside
-  resources->text_border3 = BlackSevenTwo; // r,d inside
-       resources->text_border4 = BlackNineTwo;  // r,d outside
-  resources->text_border2_hi = ComicYellow;  // highlighting on mouseover
-  resources->text_border3_hi = ComicYellow;
-  
-  resources->text_inactive_highlight = BabyBlueDark; // e.g. Subtitle (double click on inactive text, choose next or prev and be amazed).
+       resources->text_border2 = BlackNineTwo;    // l,t outside
+       resources->text_border1 = BLACK;           // l,t inside
+       resources->text_border3 = BlackSevenTwo;   // r,d inside
+       resources->text_border4 = BlackNineTwo;    // r,d outside
+       resources->text_border2_hi = ComicYellow;  // highlighting on mouseover
+       resources->text_border3_hi = ComicYellow;
+       resources->text_inactive_highlight = BabyBlueDark; /* e.g. Subtitle (double click
+                                                                                                                 on inactive text, choose next or 
+                                                                                                                 prev and be amazed). */
        resources->text_highlight = BabyBlue;
   
        resources->bg_color = BlackEightFive;
-  resources->border_light2 = resources->bg_color;
+       resources->border_light2 = resources->bg_color;
        resources->border_shadow2 = resources->bg_color;
 
-  resources->default_text_color = CreamyWhite; // Timeline, dialogs and much more. 
-       resources->menu_title_text = WHITE;    // high contrast
-  resources->popup_title_text = WHITE;   // 
-       resources->menu_item_text = WHITE;     // 
+       resources->default_text_color = CreamyWhite; // Timeline, dialogs and much more. 
+       resources->menu_title_text = WHITE;          // high contrast
+       resources->popup_title_text = WHITE;
+       resources->menu_item_text = WHITE; 
 
-  resources->menu_highlighted_fontcolor = CreamyWhiteBright;
-       resources->generic_button_margin = 20;     // [15] (Pref top right17)
+       resources->menu_highlighted_fontcolor = CreamyWhiteBright;
+       resources->generic_button_margin = 20;     // [15] (Pref top right: ~17)
        resources->pot_needle_color = CreamyWhite; // [resources->text_default] – marginal
        resources->pot_offset = 1;                 // only the needle
        resources->progress_text = resources->text_default;
        resources->meter_font_color = resources->default_text_color;
 
-  resources->menu_light = BlackEightFive;  // the following four are overwritten by graphics
-       resources->menu_down = ALARM;            // 
-       resources->menu_up = ALARM;              // 
-       resources->menu_shadow = ALARM;          // 
+       // the following four are overwritten by graphics
+       resources->menu_light = BlackEightFive;  
+       resources->menu_down = ALARM;
+       resources->menu_up = ALARM;
+       resources->menu_shadow = ALARM;
 
-       resources->menu_highlighted = BabyBlue; // 
+       resources->menu_highlighted = BabyBlue;
        resources->popupmenu_margin = 15;       // indent, moves the button text to the right
        resources->popupmenu_triangle_margin = 15;
 
@@ -157,208 +164,205 @@ void NEOPHYTETHEME::initialize()
        resources->listbox_title_margin = 15;               // [20] indent
        resources->listbox_title_hotspot = 15;              // [20]
 
-  resources->listbox_border2 = BlackNineTwo; // as text_border
-  resources->listbox_border1 = BLACK;
-  resources->listbox_border3 = BlackSevenTwo;
-  resources->listbox_border4 = BlackNineTwo;
-  // ../../guicast/bcresources.C:684:
-  resources->listbox_border2_hi = BabyBlue;  // highlighting on mouseover
-  resources->listbox_border3_hi = BabyBlue;
+       resources->listbox_border2 = BlackNineTwo; // as text_border
+       resources->listbox_border1 = BLACK;
+       resources->listbox_border3 = BlackSevenTwo;
+       resources->listbox_border4 = BlackNineTwo;
+       // ../../guicast/bcresources.C:684, highlighting on mouseover
+       resources->listbox_border2_hi = BabyBlue;
+       resources->listbox_border3_hi = BabyBlue;
 
        resources->listbox_highlighted = BabyBlue;  // recources, loadfiles
-       resources->listbox_inactive = BlackNineTwo; //            background
-       resources->listbox_bg = 0;                  // see ../theme_blond_cv/blondcvtheme.C:249
-       resources->listbox_text = CreamyWhite;      // 
-  resources->listbox_selected = 0x3d5477;     // approximately matches column_hi
+       resources->listbox_inactive = BlackNineTwo; //       background
+       resources->listbox_bg = 0;                  // s.a. ../theme_blond_cv/blondcvtheme.C:249
+       resources->listbox_text = CreamyWhite;
+       resources->listbox_selected = 0x3d5477;     // approximately matches column_hi
   
        resources->filebox_margin = 130; // [130]
        resources->file_color = WHITE;
        resources->directory_color = BabyBlue;
 
-  // Footage in the timeline
-       title_font = MEDIUMFONT; // ../../guicast/fonts.h
+       // Footage in the timeline
+       title_font = MEDIUMFONT;
        title_color = WHITE;
 
-  // Because the colors of the text in the list are fixed. So it is at least uniform.
-       recordgui_fixed_color = YELLOW; //
-       recordgui_variable_color = RED; // [RED]
+       /* Because the colors of the text in the list are fixed.
+          So it is at least uniform. */
+       recordgui_fixed_color = YELLOW;
+       recordgui_variable_color = RED;
              
-  channel_position_color = ComicYellow; // Set Format, speaker numbers 
+       channel_position_color = ComicYellow; // Set Format, speaker numbers 
        resources->meter_title_w = 25;
 
-  // (asset) edit info text color
-  edit_font_color = ComicYellow; // ? ../../cinelerra/theme.h:282
-  assetedit_color = CreamyWhiteBright; // variable attributes
+       // (asset) edit info text color
+       edit_font_color = ComicYellow; // ? ../../cinelerra/theme.h:282
+       assetedit_color = CreamyWhiteBright; // variable attributes
 
-  // flash_color = ALARM;          // ../../cinelerra/recordgui.C:135
-  timebar_cursor_color = WHITE; // ../../cinelerra/theme.C:73
+       // flash_color = ALARM;          // ../../cinelerra/recordgui.C:135
+       timebar_cursor_color = WHITE; // ../../cinelerra/theme.C:73
     
-  // tooltip ../../guicast/bcresources.C:786
-  resources->tooltip_bg_color = CreamyWhiteBright;
-  // resources->tooltip_fg_color = ALARM; // undefined.
-  resources->tooltip_delay = 1500; // [1000]
+       // tooltip ../../guicast/bcresources.C:786
+       resources->tooltip_bg_color = CreamyWhiteBright;
+       // resources->tooltip_fg_color = ALARM; // undefined.
+       resources->tooltip_delay = 1500; // [1000]
   
-  // Waveform of audio tracks.
-  // Instead of squeaky [GREEN]. This three are soft, warm and matte.
-  // 848661 beige
-  // 6d876f green
-  // 665f8a purple
+       /* Waveform of audio tracks.
+          Instead of squeaky [GREEN]. This three are soft, warm and matte:
+          848661 beige, 6d876f green, 665f8a purple */
        audio_color = 0x6d876f;
 
-  // Resources: the text overlay location display. What for?
-  // Affects a) Preferences, Performace: BR "Video" (text).
-  //         b) Render.
-  resources->audiovideo_color = CreamyWhite; // BlackNineTwo;
+       /* Resources: the text overlay location display. Affects 
+          a) Preferences, Performace: BR "Video" (text).
+          b) Render. */
+       resources->audiovideo_color = CreamyWhite; // BlackNineTwo;
 
-  // ../../guicast/bcresources.C-781 ff.: Delays must all be different for repeaters 
-  resources->blink_rate = 750; // [250] - we're not on the run.
+       /* ../../guicast/bcresources.C:781 ff.
+          Delays must all be different for repeaters */
+       resources->blink_rate = 750; // [250] - we're not on the run.
+
+       // ../../cinelerra/theme.C:87
+       clock_fg_color = ComicYellow;
+       // clock_bg_color = ALARM; // see vclock
 
-  // ../../cinelerra/theme.C:87
-  // clock_bg_color =  BLACK; // -> vclock
-  clock_fg_color = ComicYellow;
-  
        new_toggle(
-      "loadmode_new.png",
-      "loadmode_up.png",
-      "loadmode_hi.png",
-      "loadmode_checked.png",
-      "loadmode_dn.png",
-      "loadmode_checkedhi.png",
-      "loadmode_new");
+               "loadmode_new.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_new");
        new_toggle(
-      "loadmode_none.png",
-      "loadmode_up.png",
-      "loadmode_hi.png",
-      "loadmode_checked.png",
-      "loadmode_dn.png",
-      "loadmode_checkedhi.png",
-      "loadmode_none");
+               "loadmode_none.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_none");
        new_toggle(
-      "loadmode_newcat.png",
-      "loadmode_up.png",
-      "loadmode_hi.png",
-      "loadmode_checked.png",
-      "loadmode_dn.png",
-      "loadmode_checkedhi.png",
-      "loadmode_newcat");
+               "loadmode_newcat.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_newcat");
        new_toggle(
-      "loadmode_cat.png",
-      "loadmode_up.png",
-      "loadmode_hi.png",
-      "loadmode_checked.png",
-      "loadmode_dn.png",
-      "loadmode_checkedhi.png",
-      "loadmode_cat");
+               "loadmode_cat.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_cat");
        new_toggle(
-      "loadmode_newtracks.png",
-      "loadmode_up.png",
-      "loadmode_hi.png",
-      "loadmode_checked.png",
-      "loadmode_dn.png",
-      "loadmode_checkedhi.png",
-      "loadmode_newtracks");
+               "loadmode_newtracks.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_newtracks");
        new_toggle(
-      "loadmode_paste.png",
-      "loadmode_up.png",
-      "loadmode_hi.png",
-      "loadmode_checked.png",
-      "loadmode_dn.png",
-      "loadmode_checkedhi.png",
-      "loadmode_paste");
+               "loadmode_paste.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_paste");
        new_toggle(
-       "loadmode_resource.png",
-       "loadmode_up.png",
-       "loadmode_hi.png",
-       "loadmode_checked.png",
-       "loadmode_dn.png",
-       "loadmode_checkedhi.png",
-       "loadmode_resource");
+               "loadmode_resource.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_resource");
        new_toggle(
-       "loadmode_nested.png",
-       "loadmode_up.png",
-       "loadmode_hi.png",
-       "loadmode_checked.png",
-       "loadmode_dn.png",
-       "loadmode_checkedhi.png",
-       "loadmode_nested");
-
+               "loadmode_nested.png",
+               "loadmode_up.png",
+               "loadmode_hi.png",
+               "loadmode_checked.png",
+               "loadmode_dn.png",
+               "loadmode_checkedhi.png",
+               "loadmode_nested");
        resources->filebox_icons_images = new_button(
-       "icons.png",
-       "fileboxbutton_up.png",
-       "fileboxbutton_hi.png",
-       "fileboxbutton_dn.png",
-       "filebox_icons");
-       resources->filebox_text_images = new_button("text.png",
+               "icons.png",
+               "fileboxbutton_up.png",
+               "fileboxbutton_hi.png",
+               "fileboxbutton_dn.png",
+               "filebox_icons");
+       resources->filebox_text_images = new_button(
+               "text.png",
                "fileboxbutton_up.png",
                "fileboxbutton_hi.png",
                "fileboxbutton_dn.png",
                "filebox_text");
-
-       resources->filebox_newfolder_images = new_button("folder.png",
+       resources->filebox_newfolder_images = new_button(
+               "folder.png",
                "fileboxbutton_up.png",
                "fileboxbutton_hi.png",
                "fileboxbutton_dn.png",
                "filebox_newfolder");
-
-       resources->filebox_rename_images = new_button("rename.png",
+       resources->filebox_rename_images = new_button(
+               "rename.png",
                "fileboxbutton_up.png",
                "fileboxbutton_hi.png",
                "fileboxbutton_dn.png",
                "filebox_rename");
-
-       resources->filebox_updir_images = new_button("updir.png",
+       resources->filebox_updir_images = new_button(
+               "updir.png",
                "fileboxbutton_up.png",
                "fileboxbutton_hi.png",
                "fileboxbutton_dn.png",
                "filebox_updir");
-
-       resources->filebox_delete_images = new_button("delete.png",
+       resources->filebox_delete_images = new_button(
+               "delete.png",
                "fileboxbutton_up.png",
                "fileboxbutton_hi.png",
                "fileboxbutton_dn.png",
                "filebox_delete");
-
-       resources->filebox_reload_images = new_button("reload.png",
+       resources->filebox_reload_images = new_button(
+               "reload.png",
                "fileboxbutton_up.png",
                "fileboxbutton_hi.png",
                "fileboxbutton_dn.png",
                "filebox_reload");
-       resources->filebox_descend_images = new_button("openfolder.png",
+       resources->filebox_descend_images = new_button(
+               "openfolder.png",
                "filebox_bigbutton_up.png",
                "filebox_bigbutton_hi.png",
                "filebox_bigbutton_dn.png",
                "filebox_descend");
-
-       resources->usethis_button_images =
-               resources->ok_images = new_button("ok.png",
+       resources->usethis_button_images = resources->ok_images = new_button(
+               "ok.png",
                "filebox_bigbutton_up.png",
                "filebox_bigbutton_hi.png",
                "filebox_bigbutton_dn.png",
                "ok_button");
-
-       new_button("ok.png",
+       new_button(
+               "ok.png",
                "new_bigbutton_up.png",
                "new_bigbutton_hi.png",
                "new_bigbutton_dn.png",
                "new_ok_images");
-
-       resources->cancel_images = new_button("cancel.png",
+       resources->cancel_images = new_button(
+               "cancel.png",
                "filebox_bigbutton_up.png",
                "filebox_bigbutton_hi.png",
                "filebox_bigbutton_dn.png",
                "cancel_button");
-
-       new_button("cancel.png",
+       new_button(
+               "cancel.png",
                "new_bigbutton_up.png",
                "new_bigbutton_hi.png",
                "new_bigbutton_dn.png",
                "new_cancel_images");
-
-  // Clock - is not used (AFAIK). See also clock color.
+       // Clock - is not used (AFAIK). See also clock color.
        // resources->medium_7segment = new_image_set(TOTAL_7SEGMENT,
-  //   "0.png",
+       //      "0.png",
        //      "1.png",
        //      "2.png",
        //      "3.png",
@@ -384,112 +388,120 @@ void NEOPHYTETHEME::initialize()
 
        resources->min_menu_w = 96;
        resources->menu_popup_bg = new_image("menu_popup_bg.png");
-       resources->menu_item_bg = new_image_set(3,
+       resources->menu_item_bg = new_image_set(
+               3,
                "menuitem_up.png",
                "menuitem_hi.png",
                "menuitem_dn.png");
        resources->menu_bar_bg = new_image("menubar_bg.png");
-       resources->menu_title_bg = new_image_set(3,
-               "menubar_up.png",
-               "menubar_hi.png",
-               "menubar_dn.png");
-
+       resources->menu_title_bg = new_image_set
+               (3,
+                "menubar_up.png",
+                "menubar_hi.png",
+                "menubar_dn.png");
        resources->popupmenu_images = 0;
-//             new_image_set(3,
-//             "menupopup_up.png",
-//             "menupopup_hi.png",
-//             "menupopup_dn.png");
-
-       resources->toggle_highlight_bg = new_image("toggle_highlight_bg",
+       // new_image_set(3,
+       // "menupopup_up.png",
+       // "menupopup_hi.png",
+       // "menupopup_dn.png");
+       resources->toggle_highlight_bg = new_image(
+               "toggle_highlight_bg",
                "text_highlight.png");
-
-       resources->generic_button_images = new_image_set(3,
-                       "generic_up.png",
-                       "generic_hi.png",
-                       "generic_dn.png");
-       resources->horizontal_slider_data = new_image_set(6,
-                       "hslider_fg_up.png",
-                       "hslider_fg_hi.png",
-                       "hslider_fg_dn.png",
-                       "hslider_bg_up.png",
-                       "hslider_bg_hi.png",
-                       "hslider_bg_dn.png");
-       resources->vertical_slider_data = new_image_set(6,
-                       "hslider_fg_up.png",
-                       "hslider_fg_hi.png",
-                       "hslider_fg_dn.png",
-                       "hslider_bg_up.png",
-                       "hslider_bg_hi.png",
-                       "hslider_bg_dn.png");
+       resources->generic_button_images = new_image_set(
+               3,
+               "generic_up.png",
+               "generic_hi.png",
+               "generic_dn.png");
+       resources->horizontal_slider_data = new_image_set(
+               6,
+               "hslider_fg_up.png",
+               "hslider_fg_hi.png",
+               "hslider_fg_dn.png",
+               "hslider_bg_up.png",
+               "hslider_bg_hi.png",
+               "hslider_bg_dn.png");
+       resources->vertical_slider_data = new_image_set(
+               6,
+               "hslider_fg_up.png",
+               "hslider_fg_hi.png",
+               "hslider_fg_dn.png",
+               "hslider_bg_up.png",
+               "hslider_bg_hi.png",
+               "hslider_bg_dn.png");
+  
        for( int i=0; i<6; ++i )
                resources->vertical_slider_data[i]->rotate90();
 
-       resources->progress_images = new_image_set(2,
-                       "progress_bg.png",
-                       "progress_hi.png");
-       resources->tumble_data = new_image_set(4,
+       resources->progress_images = new_image_set(
+               2,
+               "progress_bg.png",
+               "progress_hi.png");
+       resources->tumble_data = new_image_set(
+               4,
                "tumble_up.png",
                "tumble_hi.png",
                "tumble_bottom.png",
                "tumble_top.png");
-       resources->listbox_button = new_button4("listbox_button.png",
+       resources->listbox_button = new_button4(
+               "listbox_button.png",
                "editpanel_up.png",
                "editpanel_hi.png",
                "editpanel_dn.png",
                "editpanel_hi.png",
                "listbox_button");
-
-  // Dialog "Load files…" switch SI/IEC
-       resources->filebox_szfmt_images = new_image_set(12,
-                                                  "file_size_capb_up.png",
-                                                  "file_size_capb_hi.png",
-                                                  "file_size_capb_dn.png",
-                                                  "file_size_semi_up.png",
-                                                  "file_size_semi_hi.png",
-                                                  "file_size_semi_dn.png",
-                                                  "file_size_lwrb_up.png",
-                                                  "file_size_lwrb_hi.png",
-                                                  "file_size_lwrb_dn.png",
-                                                  "file_size_zero_up.png",
-                                                  "file_size_zero_hi.png",
-                                                  "file_size_zero_dn.png");
-
-       resources->listbox_column = new_image_set(3,
+       // Dialog "Load files…" switch SI/IEC
+       resources->filebox_szfmt_images = new_image_set(
+               12,
+               "file_size_capb_up.png",
+               "file_size_capb_hi.png",
+               "file_size_capb_dn.png",
+               "file_size_semi_up.png",
+               "file_size_semi_hi.png",
+               "file_size_semi_dn.png",
+               "file_size_lwrb_up.png",
+               "file_size_lwrb_hi.png",
+               "file_size_lwrb_dn.png",
+               "file_size_zero_up.png",
+               "file_size_zero_hi.png",
+               "file_size_zero_dn.png");
+       resources->listbox_column = new_image_set(
+               3,
                "column_up.png",
                "column_hi.png",
                "column_dn.png");
        resources->listbox_up = new_image("listbox_up.png");
        resources->listbox_dn = new_image("listbox_dn.png");
-       resources->pan_data = new_image_set(7,
-                       "pan_up.png",
-                       "pan_hi.png",
-                       "pan_popup.png",
-                       "pan_channel.png",
-                       "pan_stick.png",
-                       "pan_channel_small.png",
-                       "pan_stick_small.png");
+       resources->pan_data = new_image_set(
+               7,
+               "pan_up.png",
+               "pan_hi.png",
+               "pan_popup.png",
+               "pan_channel.png",
+               "pan_stick.png",
+               "pan_channel_small.png",
+               "pan_stick_small.png");
        resources->pan_text_color = CreamyWhiteBright;
-
-       resources->pot_images = new_image_set(3,
+       resources->pot_images = new_image_set(
+               3,
                "pot_up.png",
                "pot_hi.png",
                "pot_dn.png");
-
-       resources->checkbox_images = new_image_set(5,
+       resources->checkbox_images = new_image_set(
+               5,
                "checkbox_up.png",
                "checkbox_hi.png",
                "checkbox_checked.png",
                "checkbox_dn.png",
                "checkbox_checkedhi.png");
-
-       resources->radial_images = new_image_set(5,
+       resources->radial_images = new_image_set(
+               5,
                "radial_up.png",
                "radial_hi.png",
                "radial_checked.png",
                "radial_dn.png",
                "radial_checkedhi.png");
-
-       resources->xmeter_images = new_image_set(7,
+       resources->xmeter_images = new_image_set(
+               7,
                "xmeter_normal.png",
                "xmeter_green.png",
                "xmeter_red.png",
@@ -497,7 +509,8 @@ void NEOPHYTETHEME::initialize()
                "xmeter_white.png",
                "xmeter_over.png",
                "downmix51_2.png");
-       resources->ymeter_images = new_image_set(7,
+       resources->ymeter_images = new_image_set(
+               7,
                "ymeter_normal.png",
                "ymeter_green.png",
                "ymeter_red.png",
@@ -505,42 +518,46 @@ void NEOPHYTETHEME::initialize()
                "ymeter_white.png",
                "ymeter_over.png",
                "downmix51_2.png");
-
-       resources->hscroll_data = new_image_set(10,
-                       "hscroll_handle_up.png",
-                       "hscroll_handle_hi.png",
-                       "hscroll_handle_dn.png",
-                       "hscroll_handle_bg.png",
-                       "hscroll_left_up.png",
-                       "hscroll_left_hi.png",
-                       "hscroll_left_dn.png",
-                       "hscroll_right_up.png",
-                       "hscroll_right_hi.png",
-                       "hscroll_right_dn.png");
-
-       resources->vscroll_data = new_image_set(10,
-                       "vscroll_handle_up.png",
-                       "vscroll_handle_hi.png",
-                       "vscroll_handle_dn.png",
-                       "vscroll_handle_bg.png",
-                       "vscroll_left_up.png",
-                       "vscroll_left_hi.png",
-                       "vscroll_left_dn.png",
-                       "vscroll_right_up.png",
-                       "vscroll_right_hi.png",
-                       "vscroll_right_dn.png");
+       resources->hscroll_data = new_image_set(
+               10,
+               "hscroll_handle_up.png",
+               "hscroll_handle_hi.png",
+               "hscroll_handle_dn.png",
+               "hscroll_handle_bg.png",
+               "hscroll_left_up.png",
+               "hscroll_left_hi.png",
+               "hscroll_left_dn.png",
+               "hscroll_right_up.png",
+               "hscroll_right_hi.png",
+               "hscroll_right_dn.png");
+       resources->vscroll_data = new_image_set(
+               10,
+               "vscroll_handle_up.png",
+               "vscroll_handle_hi.png",
+               "vscroll_handle_dn.png",
+               "vscroll_handle_bg.png",
+               "vscroll_left_up.png",
+               "vscroll_left_hi.png",
+               "vscroll_left_dn.png",
+               "vscroll_right_up.png",
+               "vscroll_right_hi.png",
+               "vscroll_right_dn.png");
        resources->scroll_minhandle = 20;
-
-       new_button("prevtip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "prev_tip");
-       new_button("nexttip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "next_tip");
-       new_button("closetip.png", "tipbutton_up.png", "tipbutton_hi.png", "tipbutton_dn.png", "close_tip");
-       new_button("swap_extents.png",
-               "editpanel_up.png",
-               "editpanel_hi.png",
-               "editpanel_dn.png",
-               "swap_extents");
-
-// Record windows
+    
+       new_button(
+               "prevtip.png", "tipbutton_up.png",
+               "tipbutton_hi.png", "tipbutton_dn.png", "prev_tip");
+       new_button(
+               "nexttip.png", "tipbutton_up.png",
+               "tipbutton_hi.png", "tipbutton_dn.png", "next_tip");
+       new_button(
+               "closetip.png", "tipbutton_up.png",
+               "tipbutton_hi.png", "tipbutton_dn.png", "close_tip");
+       new_button(
+               "swap_extents.png", "editpanel_up.png",
+               "editpanel_hi.png", "editpanel_dn.png", "swap_extents");
+
+       // Record windows
        preferences_category_overlap = 0;
        preferencescategory_x = 0;
        preferencescategory_y = 5;
@@ -549,15 +566,22 @@ void NEOPHYTETHEME::initialize()
        preferencesoptions_x = 5;
        preferencesoptions_y = 0;
 
-// MWindow
+       // MWindow
        message_normal = resources->text_default;
 
-  mtransport_margin = 10;
+       mtransport_margin = 10;
        toggle_margin = 10;
 
-       new_button("pane.png", "pane_up.png", "pane_hi.png", "pane_dn.png", "pane");
-       new_image_set("xpane", 3, "xpane_up.png", "xpane_hi.png", "xpane_dn.png");
-       new_image_set("ypane", 3, "ypane_up.png", "ypane_hi.png", "ypane_dn.png");
+       new_button("pane.png", "pane_up.png", "pane_hi.png", "pane_dn.png",
+                          "pane");
+       new_image_set("xpane", 3,
+                                 "xpane_up.png",
+                                 "xpane_hi.png",
+                                 "xpane_dn.png");
+       new_image_set("ypane", 3,
+                                 "ypane_up.png",
+                                 "ypane_hi.png",
+                                 "ypane_dn.png");
 
        new_image("mbutton_bg", "mbutton_bg.png");
        new_image("timebar_bg", "timebar_bg_flat.png");
@@ -565,12 +589,20 @@ void NEOPHYTETHEME::initialize()
        new_image("clock_bg", "mclock_flat.png");
        new_image("patchbay_bg", "patchbay_bg.png");
        new_image("statusbar", "statusbar.png");
-//     new_image("mscroll_filler", "mscroll_filler.png");
-
-       new_image_set("zoombar_menu", 3, "zoompopup_up.png", "zoompopup_hi.png", "zoompopup_dn.png");
-       new_image_set("zoombar_tumbler", 4, "zoomtumble_up.png", "zoomtumble_hi.png", "zoomtumble_bottom.png", "zoomtumble_top.png");
-
-       new_image_set("mode_popup", 3, "mode_up.png", "mode_hi.png", "mode_dn.png");
+       // new_image("mscroll_filler", "mscroll_filler.png");
+
+       new_image_set("zoombar_menu", 3,
+                                 "zoompopup_up.png",
+                                 "zoompopup_hi.png",
+                                 "zoompopup_dn.png");
+       new_image_set("zoombar_tumbler", 4,
+                                 "zoomtumble_up.png",
+                                 "zoomtumble_hi.png",
+                                 "zoomtumble_bottom.png",
+                                 "zoomtumble_top.png");
+
+       new_image_set("mode_popup", 3,
+                                 "mode_up.png", "mode_hi.png", "mode_dn.png");
        new_image("mode_add", "mode_add.png");
        new_image("mode_divide", "mode_divide.png");
        new_image("mode_multiply", "mode_multiply.png");
@@ -579,22 +611,41 @@ void NEOPHYTETHEME::initialize()
        new_image("mode_subtract", "mode_subtract.png");
        new_image("mode_max", "mode_max.png");
 
-       new_image_set("plugin_on", 5, "plugin_on.png", "plugin_onhi.png", "plugin_onselect.png", "plugin_ondn.png", "plugin_onselecthi.png");
-       new_image_set("plugin_show", 5, "plugin_show.png", "plugin_showhi.png", "plugin_showselect.png", "plugin_showdn.png", "plugin_showselecthi.png");
-
-  // Mixer
-       new_image_set("mixpatch_data", 5, "mixpatch_up.png", "mixpatch_hi.png", "mixpatch_checked.png", "mixpatch_dn.png", "mixpatch_checkedhi.png");
-
-// CWindow
+       new_image_set("plugin_on", 5,
+                                 "plugin_on.png",
+                                 "plugin_onhi.png",
+                                 "plugin_onselect.png",
+                                 "plugin_ondn.png",
+                                 "plugin_onselecthi.png");
+       new_image_set("plugin_show", 5,
+                                 "plugin_show.png",
+                                 "plugin_showhi.png",
+                                 "plugin_showselect.png",
+                                 "plugin_showdn.png",
+                                 "plugin_showselecthi.png");
+       
+       // Mixer
+       new_image_set("mixpatch_data", 5,
+                                 "mixpatch_up.png",
+                                 "mixpatch_hi.png",
+                                 "mixpatch_checked.png",
+                                 "mixpatch_dn.png",
+                                 "mixpatch_checkedhi.png");
+       
+       // CWindow
        new_image("cpanel_bg", "cpanel_bg.png");
        new_image("cbuttons_left", "cbuttons_left.png");
        new_image("cbuttons_right", "cbuttons_right.png");
        new_image("cmeter_bg", "cmeter_bg.png");
-
-// VWindow
+       
+       // VWindow
+       /* The red position indicator is currently only 5 px high.
+          The backgrounds were made according to this. */
        new_image("vbuttons_left", "vbuttons_left.png");
+       new_image("vbuttons_right", "vbuttons_right.png"); // unset = cbuttons_right
        new_image("vclock", "vclock.png");
-
+       //new_image("vmeter_bg", ".png"); // ! 
+  
        new_image("preferences_bg", "preferences_bg.png");
 
        new_image("new_bg", "new_bg.png");
@@ -606,7 +657,6 @@ void NEOPHYTETHEME::initialize()
        setformat_h = get_image("setformat_bg")->get_h();
        setformat_x1 = 15;
        setformat_x2 = 110;
-
        setformat_x3 = 315;
        setformat_x4 = 425;
        setformat_y1 = 20;
@@ -622,117 +672,115 @@ void NEOPHYTETHEME::initialize()
        browse_pad = 20;
 
        new_toggle("playpatch.png",
-               "playpatch_up.png",
-               "playpatch_hi.png",
-               "playpatch_checked.png",
-               "playpatch_dn.png",
-               "playpatch_checkedhi.png",
-               "playpatch_data");
-
+                          "playpatch_up.png",
+                          "playpatch_hi.png",
+                          "playpatch_checked.png",
+                          "playpatch_dn.png",
+                          "playpatch_checkedhi.png",
+                          "playpatch_data");
        new_toggle("recordpatch.png",
-               "recordpatch_up.png",
-               "recordpatch_hi.png",
-               "recordpatch_checked.png",
-               "recordpatch_dn.png",
-               "recordpatch_checkedhi.png",
-               "recordpatch_data");
-
+                          "recordpatch_up.png",
+                          "recordpatch_hi.png",
+                          "recordpatch_checked.png",
+                          "recordpatch_dn.png",
+                          "recordpatch_checkedhi.png",
+                          "recordpatch_data");
        new_toggle("gangpatch.png",
-               "patch_up.png",
-               "patch_hi.png",
-               "patch_checked.png",
-               "patch_dn.png",
-               "patch_checkedhi.png",
-               "gangpatch_data");
-
+                          "patch_up.png",
+                          "patch_hi.png",
+                          "patch_checked.png",
+                          "patch_dn.png",
+                          "patch_checkedhi.png",
+                          "gangpatch_data");
        new_toggle("drawpatch.png",
-               "patch_up.png",
-               "patch_hi.png",
-               "patch_checked.png",
-               "patch_dn.png",
-               "patch_checkedhi.png",
-               "drawpatch_data");
+                          "patch_up.png",
+                          "patch_hi.png",
+                          "patch_checked.png",
+                          "patch_dn.png",
+                          "patch_checkedhi.png",
+                          "drawpatch_data");
 
        new_image_set("mutepatch_data",
-               5,
-               "mutepatch_up.png",
-               "mutepatch_hi.png",
-               "mutepatch_checked.png",
-               "mutepatch_dn.png",
-               "mutepatch_checkedhi.png");
-
+                                 5,
+                                 "mutepatch_up.png",
+                                 "mutepatch_hi.png",
+                                 "mutepatch_checked.png",
+                                 "mutepatch_dn.png",
+                                 "mutepatch_checkedhi.png");
        new_image_set("expandpatch_data",
-               5,
-               "expandpatch_up.png",
-               "expandpatch_hi.png",
-               "expandpatch_checked.png",
-               "expandpatch_dn.png",
-               "expandpatch_checkedhi.png");
+                                 5,
+                                 "expandpatch_up.png",
+                                 "expandpatch_hi.png",
+                                 "expandpatch_checked.png",
+                                 "expandpatch_dn.png",
+                                 "expandpatch_checkedhi.png");
 
        build_bg_data();
        build_overlays();
 
-       out_point = new_image_set(5,
+       out_point = new_image_set(
+               5,
                "out_up.png",
                "out_hi.png",
                "out_checked.png",
                "out_dn.png",
                "out_checkedhi.png");
-       in_point = new_image_set(5,
+       in_point = new_image_set(
+               5,
                "in_up.png",
                "in_hi.png",
                "in_checked.png",
                "in_dn.png",
                "in_checkedhi.png");
-
-       label_toggle = new_image_set(5,
+       label_toggle = new_image_set(
+               5,
                "labeltoggle_up.png",
                "labeltoggle_uphi.png",
                "label_checked.png",
                "labeltoggle_dn.png",
                "label_checkedhi.png");
-
-       ffmpeg_toggle = new_image_set(5,
+       ffmpeg_toggle = new_image_set(
+               5,
                "ff_up.png",
                "ff_hi.png",
                "ff_checked.png",
                "ff_down.png",
                "ff_checkedhi.png");
-
-       proxy_p_toggle = new_image_set(5,
+       proxy_p_toggle = new_image_set(
+               5,
                "proxy_p_up.png",
                "proxy_p_hi.png",
                "proxy_p_chkd.png",
                "proxy_p_down.png",
                "proxy_p_chkdhi.png");
-
-       proxy_s_toggle = new_image_set(5, // proxy use ffmpeg scaler
+       proxy_s_toggle = new_image_set( // proxy use ffmpeg scaler
+               5,
                "proxy_s_up.png",
                "proxy_s_hi.png",
                "proxy_s_chkd.png",
                "proxy_s_down.png",
                "proxy_s_chkdhi.png");
-
-       shbtn_data = new_image_set(3,
+       shbtn_data = new_image_set(
+               3,
                "shbtn_up.png",
                "shbtn_hi.png",
                "shbtn_dn.png");
-
-       new_image_set("preset_edit",
+       new_image_set(
+               "preset_edit",
                3,
                "preset_edit0.png",
                "preset_edit1.png",
                "preset_edit2.png");
-
-       new_image_set("histogram_carrot",
+       new_image_set(
+               "histogram_carrot",
                5,
                "histogram_carrot_up.png",
                "histogram_carrot_hi.png",
                "histogram_carrot_checked.png",
                "histogram_carrot_dn.png",
                "histogram_carrot_checkedhi.png");
-
-       statusbar_cancel_data = new_image_set(3,
+       statusbar_cancel_data = new_image_set(
+               3,
                "statusbar_cancel_up.png",
                "statusbar_cancel_hi.png",
                "statusbar_cancel_dn.png");
@@ -744,127 +792,223 @@ void NEOPHYTETHEME::initialize()
        VFrame *editpanel_checkedhi = new_image("editpanel_checkedhi.png");
 
        new_image("panel_divider", "panel_divider.png");
-       new_button("bottom_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "bottom_justify");
-       new_button("center_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "center_justify");
-       new_button("channel.png", editpanel_up, editpanel_hi, editpanel_dn, "channel");
-
+       new_button("bottom_justify.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "bottom_justify");
+       new_button("center_justify.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "center_justify");
+       new_button("channel.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "channel");
        new_toggle("histogram_toggle.png",
-               editpanel_up,
-               editpanel_hi,
-               editpanel_checked,
-               editpanel_dn,
-               editpanel_checkedhi,
-               "histogram_toggle");
+                          editpanel_up,
+                          editpanel_hi,
+                          editpanel_checked,
+                          editpanel_dn,
+                          editpanel_checkedhi,
+                          "histogram_toggle");
        new_toggle("histogram_rgb.png",
-               editpanel_up,
-               editpanel_hi,
-               editpanel_checked,
-               editpanel_dn,
-               editpanel_checkedhi,
-               "histogram_rgb_toggle");
+                          editpanel_up,
+                          editpanel_hi,
+                          editpanel_checked,
+                          editpanel_dn,
+                          editpanel_checkedhi,
+                          "histogram_rgb_toggle");
        new_toggle("waveform.png",
-               editpanel_up,
-               editpanel_hi,
-               editpanel_checked,
-               editpanel_dn,
-               editpanel_checkedhi,
-               "waveform_toggle");
+                          editpanel_up,
+                          editpanel_hi,
+                          editpanel_checked,
+                          editpanel_dn,
+                          editpanel_checkedhi,
+                          "waveform_toggle");
        new_toggle("waveform_rgb.png",
-               editpanel_up,
-               editpanel_hi,
-               editpanel_checked,
-               editpanel_dn,
-               editpanel_checkedhi,
-               "waveform_rgb_toggle");
+                          editpanel_up,
+                          editpanel_hi,
+                          editpanel_checked,
+                          editpanel_dn,
+                          editpanel_checkedhi,
+                          "waveform_rgb_toggle");
        new_toggle("scope.png",
-               editpanel_up,
-               editpanel_hi,
-               editpanel_checked,
-               editpanel_dn,
-               editpanel_checkedhi,
-               "scope_toggle");
-
-       new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-       new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
-
-       new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
-       new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial"); // ?
-       new_button("cut.png", editpanel_up, editpanel_hi, editpanel_dn, "cut");
-       new_button("fit.png", editpanel_up, editpanel_hi, editpanel_dn, "fit");
-       new_button("fitautos.png", editpanel_up, editpanel_hi, editpanel_dn, "fitautos");
-       new_button("inpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "inbutton");
-       new_button("label.png", editpanel_up, editpanel_hi, editpanel_dn, "labelbutton");
-       new_button("left_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "left_justify");
-       new_button("magnify.png", editpanel_up, editpanel_hi, editpanel_dn, "magnify_button");
-       new_button("middle_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "middle_justify");
-       new_button("nextlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "nextlabel");
-       new_button("prevlabel.png", editpanel_up, editpanel_hi, editpanel_dn, "prevlabel");
-       new_button("nextedit.png", editpanel_up, editpanel_hi, editpanel_dn, "nextedit");
-       new_button("prevedit.png", editpanel_up, editpanel_hi, editpanel_dn, "prevedit");
-       new_button("outpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "outbutton");
-       over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn,"overbutton");
-       overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn,"overwritebutton");
-       new_button("paste.png", editpanel_up, editpanel_hi, editpanel_dn, "paste");
-       new_button("redo.png", editpanel_up, editpanel_hi, editpanel_dn, "redo");
-       new_button("right_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "right_justify");
-       splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn,"splicebutton");
-       new_button("toclip.png", editpanel_up, editpanel_hi, editpanel_dn, "toclip");
-       new_button("goto.png", editpanel_up, editpanel_hi, editpanel_dn, "goto");
-       new_button("top_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "top_justify");
-       new_button("undo.png", editpanel_up, editpanel_hi, editpanel_dn, "undo");
-       new_button("wrench.png", editpanel_up, editpanel_hi, editpanel_dn, "wrench");
+                          editpanel_up,
+                          editpanel_hi,
+                          editpanel_checked,
+                          editpanel_dn,
+                          editpanel_checkedhi,
+                          "scope_toggle");
+
+       new_button("picture.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "picture");
+       new_button("histogram_img.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "histogram_img");
+       new_button("copy.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "copy");
+       new_button("commercial.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "commercial"); // cdb
+       new_button("cut.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "cut");
+       new_button("fit.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "fit");
+       new_button("fitautos.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "fitautos");
+       new_button("inpoint.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "inbutton");
+       new_button("label.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "labelbutton");
+       new_button("left_justify.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "left_justify");
+       new_button("magnify.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "magnify_button");
+       new_button("middle_justify.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "middle_justify");
+       new_button("nextlabel.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "nextlabel");
+       new_button("prevlabel.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "prevlabel");
+       new_button("nextedit.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "nextedit");
+       new_button("prevedit.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "prevedit");
+       new_button("outpoint.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "outbutton");
+       over_button = new_button("over.png",
+                                                        editpanel_up, editpanel_hi, editpanel_dn,
+                                                        "overbutton");
+       overwrite_data = new_button("overwrite.png",
+                                                               editpanel_up, editpanel_hi, editpanel_dn,
+                                                               "overwritebutton");
+       new_button("paste.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "paste");
+       new_button("redo.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "redo");
+       new_button("right_justify.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "right_justify");
+       splice_data = new_button("splice.png",
+                                                        editpanel_up, editpanel_hi, editpanel_dn,
+                                                        "splicebutton");
+       new_button("toclip.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "toclip");
+       new_button("goto.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "goto");
+       new_button("top_justify.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "top_justify");
+       new_button("undo.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "undo");
+       new_button("wrench.png",
+                          editpanel_up, editpanel_hi, editpanel_dn,
+                          "wrench");
 
        VFrame *transport_up = new_image("transportup.png");
        VFrame *transport_hi = new_image("transporthi.png");
        VFrame *transport_dn = new_image("transportdn.png");
 
-       new_button("end.png", transport_up, transport_hi, transport_dn, "end");
-       new_button("fastfwd.png", transport_up, transport_hi, transport_dn, "fastfwd");
-       new_button("fastrev.png", transport_up, transport_hi, transport_dn, "fastrev");
-       new_button("play.png", transport_up, transport_hi, transport_dn, "play");
-       new_button("framefwd.png", transport_up, transport_hi, transport_dn, "framefwd");
-       new_button("framerev.png", transport_up, transport_hi, transport_dn, "framerev");
-       new_button("pause.png", transport_up, transport_hi, transport_dn, "pause");
-       new_button("record.png", transport_up, transport_hi, transport_dn, "record");
-       new_button("singleframe.png", transport_up, transport_hi, transport_dn, "recframe");
-       new_button("reverse.png", transport_up, transport_hi, transport_dn, "reverse");
-       new_button("rewind.png", transport_up, transport_hi, transport_dn, "rewind");
-       new_button("stop.png", transport_up, transport_hi, transport_dn, "stop");
-       new_button("stop.png", transport_up, transport_hi, transport_dn, "stoprec");
-
-// CWindow icons
+       new_button("end.png",
+                          transport_up, transport_hi, transport_dn,
+                          "end");
+       new_button("fastfwd.png",
+                          transport_up, transport_hi, transport_dn,
+                          "fastfwd");
+       new_button("fastrev.png",
+                          transport_up, transport_hi, transport_dn,
+                          "fastrev");
+       new_button("play.png",
+                          transport_up, transport_hi, transport_dn,
+                          "play");
+       new_button("framefwd.png",
+                          transport_up, transport_hi, transport_dn,
+                          "framefwd");
+       new_button("framerev.png",
+                          transport_up, transport_hi, transport_dn,
+                          "framerev");
+       new_button("pause.png",
+                          transport_up, transport_hi, transport_dn,
+                          "pause");
+       new_button("record.png",
+                          transport_up, transport_hi, transport_dn,
+                          "record");
+       new_button("singleframe.png",
+                          transport_up, transport_hi, transport_dn,
+                          "recframe");
+       new_button("reverse.png",
+                          transport_up, transport_hi, transport_dn,
+                          "reverse");
+       new_button("rewind.png",
+                          transport_up, transport_hi, transport_dn,
+                          "rewind");
+       new_button("stop.png",
+                          transport_up, transport_hi, transport_dn,
+                          "stop");
+       new_button("stop.png",
+                          transport_up, transport_hi, transport_dn,
+                          "stoprec");
+
+       // CWindow icons
        new_image("cwindow_inactive", "cwindow_inactive.png");
        new_image("cwindow_active", "cwindow_active.png");
 
        new_image_set("category_button",
-               3,
-               "preferencesbutton_dn.png",
-               "preferencesbutton_dnhi.png",
-               "preferencesbutton_dnlo.png");
-
+                                 3,
+                                 "preferencesbutton_dn.png",
+                                 "preferencesbutton_dnhi.png",
+                                 "preferencesbutton_dnlo.png");
        new_image_set("category_button_checked",
-               3,
-               "preferencesbutton_up.png",
-               "preferencesbutton_uphi.png",
-               "preferencesbutton_dnlo.png");
-
+                                 3,
+                                 "preferencesbutton_up.png",
+                                 "preferencesbutton_uphi.png",
+                                 "preferencesbutton_dnlo.png");
        new_image_set("color3way_point",
-               3,
-               "color3way_up.png",
-               "color3way_hi.png",
-               "color3way_dn.png");
-
-       new_toggle("arrow.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "arrow");
-       new_toggle("autokeyframe.png", transport_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "autokeyframe");
-       new_toggle("ibeam.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "ibeam");
-       new_toggle("show_meters.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "meters");
+                                 3,
+                                 "color3way_up.png",
+                                 "color3way_hi.png",
+                                 "color3way_dn.png");
+
+       new_toggle("arrow.png",
+                          editpanel_up, editpanel_hi, editpanel_checked,
+                          editpanel_dn, editpanel_checkedhi,
+                          "arrow");
+       new_toggle("autokeyframe.png",
+                          transport_up, editpanel_hi, editpanel_checked,
+                          editpanel_dn, editpanel_checkedhi,
+                          "autokeyframe");
+       new_toggle("ibeam.png",
+                          editpanel_up, editpanel_hi, editpanel_checked,
+                          editpanel_dn, editpanel_checkedhi,
+                          "ibeam");
+       new_toggle("show_meters.png",
+                          editpanel_up, editpanel_hi, editpanel_checked,
+                          editpanel_dn, editpanel_checkedhi,
+                          "meters");
        new_toggle("blank30x30.png",
-                  new_image("locklabels_locked.png"),
-                  new_image("locklabels_lockedhi.png"),
-                  new_image("locklabels_unlocked.png"),
-                  new_image("locklabels_dn.png"), // can't have seperate down for each!!??
-                  new_image("locklabels_unlockedhi.png"),
-                  "locklabels");
+                          new_image("locklabels_locked.png"),
+                          new_image("locklabels_lockedhi.png"),
+                          new_image("locklabels_unlocked.png"),
+                          new_image("locklabels_dn.png"), // can't have seperate down for each!!??
+                          new_image("locklabels_unlockedhi.png"),
+                          "locklabels");
 
        VFrame *cpanel_up = new_image("cpanel_up.png");
        VFrame *cpanel_hi = new_image("cpanel_hi.png");
@@ -872,35 +1016,137 @@ void NEOPHYTETHEME::initialize()
        VFrame *cpanel_checked = new_image("cpanel_checked.png");
        VFrame *cpanel_checkedhi = new_image("cpanel_checkedhi.png");
 
-       new_toggle("camera.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "camera");
-       new_toggle("crop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "crop");
-       new_toggle("eyedrop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "eyedrop");
-       new_toggle("magnify.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "magnify");
-       new_toggle("mask.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "mask");
-       new_toggle("ruler.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "ruler");
-       new_toggle("projector.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "projector");
-       new_toggle("protect.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "protect");
-       new_toggle("titlesafe.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "titlesafe");
-       new_toggle("toolwindow.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "tool");
-
+       new_toggle("camera.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "camera");
+       new_toggle("crop.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "crop");
+       new_toggle("eyedrop.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "eyedrop");
+       new_toggle("magnify.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "magnify");
+       new_toggle("mask.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "mask");
+       new_toggle("ruler.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "ruler");
+       new_toggle("projector.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "projector");
+       new_toggle("protect.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "protect");
+       new_toggle("titlesafe.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "titlesafe");
+       new_toggle("toolwindow.png",
+                          cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi,
+                          "tool");
        // toggle for tangent mode (compositor/tool window)
-       new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth");
-       new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear");
+       new_toggle("tan_smooth.png",
+                          editpanel_up, editpanel_hi, editpanel_checked,
+                          editpanel_dn, editpanel_checkedhi,
+                          "tan_smooth");
+       new_toggle("tan_linear.png",
+                          editpanel_up, editpanel_hi, editpanel_checked,
+                          editpanel_dn, editpanel_checkedhi,
+                          "tan_linear");
 
        flush_images();
-
 }
 
-// BD: CWINDOW is probalby ComposerWindow, V=ViewerWindow
-#define VWINDOW_METER_MARGIN 5
-//#define CWINDOW_METER_MARGIN 5
+// Re-align the Clock. theme.c:931 
+void NEOPHYTETHEME::get_vwindow_sizes(VWindowGUI *gui)
+{
+       int edit_w = EditPanel::calculate_w(mwindow, 0, 10);
+       int transport_w = PlayTransport::get_transport_width(mwindow) + toggle_margin;
+       vtimebar_h = 16;       // The height of the position indicator
+       int division_w = 30;
+       
+       /* For the deco, [150]-10. The remaining space should theoretically
+          suffice for 999,999:59:59.960 hours. Total size: 140 x 26, where
+          a height of 24 or 22 px would be nicer. */
+       vtime_w = 140;
+       
+       /* Indent, flat. Larger indentation also puts
+          the 35% view into the compact view. */
+       int vtime_border = 15; 
+  
+       vmeter_y = widget_border;
+       vmeter_h = mwindow->session->vwindow_h - cmeter_y - widget_border;
+
+       int buttons_h;
+       if (mwindow->edl->session->vwindow_meter) {
+               vmeter_x = mwindow->session->vwindow_w -
+                       MeterPanel::get_meters_width(this,
+                                                                                mwindow->edl->session->audio_channels,
+                                                                                mwindow->edl->session->vwindow_meter);
+       } else {
+               vmeter_x = mwindow->session->vwindow_w + widget_border;
+       }
+
+       vcanvas_x = 0;
+       vcanvas_y = 0;
+       vcanvas_w = vmeter_x - vcanvas_x - widget_border;
+
+       if (edit_w +
+               widget_border * 2 +
+               transport_w + widget_border +
+               vtime_w + division_w +
+               vtime_border > vmeter_x) {
+               buttons_h = get_image("vbuttons_left")->get_h();
+               vedit_x = widget_border;
+               vedit_y = mwindow->session->vwindow_h -
+                       buttons_h +
+                       vtimebar_h +
+                       widget_border;
+
+               vtransport_x = widget_border;
+               vtransport_y = mwindow->session->vwindow_h -
+                       get_image_set("autokeyframe")[0]->get_h() -
+                       widget_border;
+
+               vdivision_x = 280;      // field width, compact
+               vtime_x = vedit_x + 38; // concentric
+               vtime_y = vedit_y + 24; // vertical alignment
+       } else {
+               buttons_h = vtimebar_h +
+                       widget_border +
+                       EditPanel::calculate_h(mwindow) +
+                       widget_border;
+               vtransport_x = widget_border;
+               vtransport_y = mwindow->session->vwindow_h -
+                       buttons_h +
+                       vtimebar_h +
+                       widget_border;
+
+               vedit_x = vtransport_x + transport_w + widget_border;
+               vedit_y = vtransport_y;
+
+               vdivision_x = vedit_x + edit_w + division_w;
+               vtime_x = vdivision_x + vtime_border;
+               vtime_y = vedit_y + widget_border - 7; // vertical height concentric at button height
+       }
+
+       // vtimebar_x = vcanvas_x;
+       // vtimebar_y = vcanvas_y + vcanvas_h;
+       // vtimebar_w = vcanvas_w;
+
+       vcanvas_h = mwindow->session->vwindow_h - buttons_h;
+       vtimebar_x = 0;
+       vtimebar_y = vcanvas_y + vcanvas_h;
+       vtimebar_w = vmeter_x - widget_border;
+}
 
 void NEOPHYTETHEME::build_bg_data()
 {
-// Audio settings
+       // Audio settings
        channel_position_data = new VFramePng(get_image_data("channel_position.png"));
-
-// Track bitmaps
+       // Track bitmaps
        new_image("resource1024", "resource1024.png");
        new_image("resource512", "resource512.png");
        new_image("resource256", "resource256.png");
@@ -917,119 +1163,112 @@ void NEOPHYTETHEME::build_overlays()
        keyframe_data = new VFramePng(get_image_data("keyframe3.png"));
        camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
        maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
-  modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+       modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
        pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
        projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
 }
 
 void NEOPHYTETHEME::draw_rwindow_bg(RecordGUI *gui)
 {
-//     int y;
-//     int margin = 50;
-//     int margin2 = 80;
-//     gui->draw_9segment(recordgui_batch_x - margin,
-//             0,
-//             mwindow->session->rwindow_w - recordgui_status_x + margin,
-//             recordgui_buttons_y,
-//             rgui_batch);
-//     gui->draw_3segmenth(recordgui_options_x - margin2,
-//             recordgui_buttons_y - 5,
-//             mwindow->session->rwindow_w - recordgui_options_x + margin2,
-//             rgui_controls);
-//     y = recordgui_buttons_y - 5 + rgui_controls->get_h();
-//     gui->draw_9segment(0,
-//             y,
-//             mwindow->session->rwindow_w,
-//             mwindow->session->rwindow_h - y,
-//             rgui_list);
+       // int y;
+       // int margin = 50;
+       // int margin2 = 80;
+       // gui->draw_9segment(recordgui_batch_x - margin,
+       //      0,
+       //      mwindow->session->rwindow_w - recordgui_status_x + margin,
+       //      recordgui_buttons_y,
+       //      rgui_batch);
+       // gui->draw_3segmenth(recordgui_options_x - margin2,
+       //      recordgui_buttons_y - 5,
+       //      mwindow->session->rwindow_w - recordgui_options_x + margin2,
+       //      rgui_controls);
+       // y = recordgui_buttons_y - 5 + rgui_controls->get_h();
+       // gui->draw_9segment(0,
+       //      y,
+       //      mwindow->session->rwindow_w,
+       //      mwindow->session->rwindow_h - y,
+       //      rgui_list);
 }
 
 void NEOPHYTETHEME::draw_rmonitor_bg(RecordMonitorGUI *gui)
 {
-//     int margin = 45;
-//     int panel_w = 300;
-//     int x = rmonitor_meter_x - margin;
-//     int w = mwindow->session->rmonitor_w - x;
-//     if(w < rmonitor_meters->get_w()) w = rmonitor_meters->get_w();
-//     gui->clear_box(0,
-//             0,
-//             mwindow->session->rmonitor_w,
-//             mwindow->session->rmonitor_h);
-//     gui->draw_9segment(x,
-//             0,
-//             w,
-//             mwindow->session->rmonitor_h,
-//             rmonitor_meters);
+       // int margin = 45;
+       // int panel_w = 300;
+       // int x = rmonitor_meter_x - margin;
+       // int w = mwindow->session->rmonitor_w - x;
+       // if(w < rmonitor_meters->get_w()) w = rmonitor_meters->get_w();
+       // gui->clear_box(0,
+       //      0,
+       //      mwindow->session->rmonitor_w,
+       //      mwindow->session->rmonitor_h);
+       // gui->draw_9segment(x,
+       //      0,
+       //      w,
+       //      mwindow->session->rmonitor_h,
+       //      rmonitor_meters);
 }
 
 void NEOPHYTETHEME::draw_mwindow_bg(MWindowGUI *gui)
 {
-// Button bar
+       // Button bar
        gui->draw_3segmenth(mbuttons_x, mbuttons_y - 1,
-               gui->menu_w(), get_image("mbutton_bg"));
+                                               gui->menu_w(), get_image("mbutton_bg"));
 
        int pdw = get_image("panel_divider")->get_w();
        int x = mbuttons_x;
        x += 9 * get_image("play")->get_w();
-       x += mtransport_margin;                                       // the control buttons
+       x += mtransport_margin;                                     // the control buttons
 
        gui->draw_vframe(get_image("panel_divider"),
-               x - toggle_margin / 2 - pdw / 2 + 2,
-               mbuttons_y - 1);
-       x += 2 * get_image("arrow")->get_w() + toggle_margin;           // the mode buttons
+                                        x - toggle_margin / 2 - pdw / 2 + 2,
+                                        mbuttons_y - 1);
+       x += 2 * get_image("arrow")->get_w() + toggle_margin;       // the mode buttons
 
        gui->draw_vframe(get_image("panel_divider"),
-               x - toggle_margin / 2 - pdw / 2 + 2,
-               mbuttons_y - 1);
+                                        x - toggle_margin / 2 - pdw / 2 + 2,
+                                        mbuttons_y - 1);
 
-       x += 2 * get_image("autokeyframe")->get_w() + toggle_margin;    // the state toggle buttons
+       x += 2 * get_image("autokeyframe")->get_w() + toggle_margin; // the state toggle buttons
        gui->draw_vframe(get_image("panel_divider"),
-               x - toggle_margin / 2 - pdw / 2 + 2,
-               mbuttons_y - 1);
-
-// Clock
+                                        x - toggle_margin / 2 - pdw / 2 + 2,
+                                        mbuttons_y - 1);
+       // Clock
        gui->draw_3segmenth(0,
-               mbuttons_y - 1 + get_image("mbutton_bg")->get_h(),
-               get_image("patchbay_bg")->get_w(),
-               get_image("clock_bg"));
-
-// Patchbay
+                                               mbuttons_y - 1 + get_image("mbutton_bg")->get_h(),
+                                               get_image("patchbay_bg")->get_w(),
+                                               get_image("clock_bg"));
+       // Patchbay
        gui->draw_3segmentv(patchbay_x,
-               patchbay_y,
-               patchbay_h,
-               get_image("patchbay_bg"));
-
-// Track canvas
+                                               patchbay_y,
+                                               patchbay_h,
+                                               get_image("patchbay_bg"));
+       // Track canvas
        gui->set_color(BLACK);
        gui->draw_box(mcanvas_x + get_image("patchbay_bg")->get_w(),
-               mcanvas_y + mtimebar_h,
-               mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT),
-               mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ) - mtimebar_h);
-
-// Timebar
+                                 mcanvas_y + mtimebar_h,
+                                 mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT),
+                                 mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ) - mtimebar_h);
+       // Timebar
        gui->draw_3segmenth(mtimebar_x,
-               mtimebar_y,
-               mtimebar_w,
-               get_image("timebar_bg"));
-
-// Zoombar
+                                               mtimebar_y,
+                                               mtimebar_w,
+                                               get_image("timebar_bg"));
+       // Zoombar
        gui->set_color(BlackNineTwo);
        gui->draw_box(mzoom_x,
-               mzoom_y,
-               mwindow->session->mwindow_w,
-               25);
-
-// Scrollbar filler
-//     gui->draw_vframe(get_image("mscroll_filler"),
-//             mcanvas_x + mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT),
-//             mcanvas_y + mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ));
-
-// Status
+                                 mzoom_y,
+                                 mwindow->session->mwindow_w,
+                                 25);
+       // Scrollbar filler
+       // gui->draw_vframe(get_image("mscroll_filler"),
+       //                  mcanvas_x + mcanvas_w - BC_ScrollBar::get_span(SCROLL_VERT),
+       //                  mcanvas_y + mcanvas_h - BC_ScrollBar::get_span(SCROLL_HORIZ));
+
+       // Status
        gui->draw_3segmenth(mzoom_x,
-               mzoom_y,
-               mzoom_w,
-               get_image("statusbar"));
-
+                                               mzoom_y,
+                                               mzoom_w,
+                                               get_image("statusbar"));
 }
 
 void NEOPHYTETHEME::draw_cwindow_bg(CWindowGUI *gui)
@@ -1041,57 +1280,54 @@ void NEOPHYTETHEME::draw_cwindow_bg(CWindowGUI *gui)
        if(mwindow->edl->session->cwindow_meter)
        {
                gui->draw_3segmenth(cstatus_x,
-                       ccomposite_h,
-                       cmeter_x - widget_border - cstatus_x,
-                       get_image("cbuttons_right"));
+                                                       ccomposite_h,
+                                                       cmeter_x - widget_border - cstatus_x,
+                                                       get_image("cbuttons_right"));
                gui->draw_9segment(cmeter_x - widget_border,
-                       0,
-                       mwindow->session->cwindow_w - cmeter_x + widget_border,
-                       mwindow->session->cwindow_h,
-                       get_image("cmeter_bg"));
-       }
-       else
-       {
+                                                  0,
+                                                  mwindow->session->cwindow_w - cmeter_x + widget_border,
+                                                  mwindow->session->cwindow_h,
+                                                  get_image("cmeter_bg"));
+       } else {
                gui->draw_3segmenth(cstatus_x,
-                       ccomposite_h,
-                       cmeter_x - widget_border - cstatus_x + 100,
-                       get_image("cbuttons_right"));
+                                                       ccomposite_h,
+                                                       cmeter_x - widget_border - cstatus_x + 100,
+                                                       get_image("cbuttons_right"));
        }
 }
 
 void NEOPHYTETHEME::draw_vwindow_bg(VWindowGUI *gui)
 {
        gui->draw_3segmenth(0,
-               vcanvas_h,
-               vdivision_x,
-               get_image("vbuttons_left"));
+                                               vcanvas_h,
+                                               vdivision_x,
+                                               get_image("vbuttons_left"));
        if(mwindow->edl->session->vwindow_meter)
        {
                gui->draw_3segmenth(vdivision_x,
-                       vcanvas_h,
-                       vmeter_x - widget_border - vdivision_x,
-                       get_image("cbuttons_right"));
+                                                       vcanvas_h,
+                                                       vmeter_x - widget_border - vdivision_x,
+                                                       get_image("vbuttons_right"));
                gui->draw_9segment(vmeter_x - widget_border,
-                       0,
-                       mwindow->session->vwindow_w - vmeter_x + widget_border,
-                       mwindow->session->vwindow_h,
-                       get_image("cmeter_bg"));
-       }
-       else
-       {
+                                                  0,
+                                                  mwindow->session->vwindow_w - vmeter_x + widget_border,
+                                                  mwindow->session->vwindow_h,
+                                                  get_image("cmeter_bg"));
+       } else {
                gui->draw_3segmenth(vdivision_x,
-                       vcanvas_h,
-                       vmeter_x - widget_border - vdivision_x + 100,
-                       get_image("cbuttons_right"));
+                                                       vcanvas_h,
+                                                       vmeter_x - widget_border - vdivision_x + 100,
+                                                       get_image("vbuttons_right"));
        }
 
-// Clock border
-       gui->draw_3segmenth(vtime_x - 20,
-               vtime_y - 1,
-               vtime_w + 40,
+       // Clock deco
+       gui->draw_3segmenth(
+               vtime_x - 5,  // -left, +right 
+               vtime_y + 0,  // -up, +down. Careful, move some of the buttons as well.
+               vtime_w + 10, // protruded l/r x*2
                get_image("vclock"));
-}
 
+}
 
 void NEOPHYTETHEME::draw_preferences_bg(PreferencesWindow *gui)
 {
@@ -1107,5 +1343,3 @@ void NEOPHYTETHEME::draw_setformat_bg(SetFormatWindow *gui)
 {
        gui->draw_vframe(get_image("setformat_bg"), 0, 0);
 }
-
-