diff --git a/.gitignore b/.gitignore
index 10a6663fbb47..8b8ec9d4ae0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,24 @@
 bsddialog
+.depend*
 *.o
-*~
+*.so*
 *.a
-examples_library/buildlist
+*.gz
+*.core
+*~
+BSDDIALOG.geany
+BSDDIALOG.tags
+examples_library/calendar
 examples_library/checklist
 examples_library/datebox
 examples_library/form
-examples_library/formw
-examples_library/margin
+examples_library/infobox
 examples_library/menu
 examples_library/mixedlist
-examples_library/radiolist
-examples_library/theme
-examples_library/treeview
-examples_library/infobox
 examples_library/msgbox
 examples_library/pause
+examples_library/radiolist
 examples_library/rangebox
-examples_library/sade
+examples_library/theme
 examples_library/timebox
 examples_library/yesno
-examples_library/u_msgbox
-*.gz
-lib/libbsddialog.so*
-BSDDIALOG.geany
-BSDDIALOG.tags
-*.core
-freebsd-lab/
diff --git a/CHANGELOG b/CHANGELOG
index d6de6928c111..883fe1016d01 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,134 +1,184 @@
+2022-09-24 Version 0.4
+
+	Utility:
+	* add: --normal-screen to set normal mode.
+	* add: --alternate-screen to set alternate mode.
+	* add: --keep-tite as --alternate-screen alias.
+	* add: --and-dialog to build other dialogs.
+	* add: --and-widget as --and-dialog alias.
+	* add: --no-names (--no-tags becames its alias).
+	* add: --no-descriptions (--no-items becames its alias).
+	* add: --help-print-name (--help-tags becames its alias).
+	* add: --item-bottom-desc (--item-help becames its alias).
+	* add: --cr-wrap (was partially implemented) to keep '\n' with "\n".
+	* add: --text-unchanged to avoid default modification.
+	* add: --tab-escape enables "\t" in text.
+	* add: --clear-screen to clear the screen.
+	* add: --clear-dialog to clear the dialog (was --clear).
+	* add: --calendar dialog to select a date.
+	* add: DIAGNOSTICS messages for bad arguments number.
+	* add: DIAGNOSTICS messages for missing and unexpected options.
+	* change: --clear becames alias for --clear-screen.
+	* change: --print-maxsize format output.
+	* change: --menu, --radiolist, --checklist and --treeview output.
+	    - no printed items with Cancel or ESC.
+	    - --separator prints <sepstr> before each item except HELP.
+	    - --separator and --separate-output print <sepstr> after each item.
+	    - quoted item name/desc only when needed.
+	    - --menu avoids to print selected item after focused HELP item.
+	* change: text default modification.
+	    - without a "\n": '\t' -> space, '\n' -> '\n', trim spaces.
+	    - with a "\n": '\t' -> space, '\n' -> space, "\n" -> '\n', no trim.
+	    - delete '\n' after "\n" (also with --cr-wrap).
+	* change: --datebox input and output format yy/mm/dd -> dd/mm/yy.
+	* delete: --no-collapse (partially implemented).
+	* delete: --no-nl-expand (partially implemented).
+	* delete: --trim (partially implemented).
+
+	Library:
+	* add: bsddialog_msgbox() HOME, END, PPAGE and NPAGE keys.
+	* add: bsddialog_yesno() HOME, END, PPAGE and NPAGE keys.
+	* add: bsddialog_menu() SPACE key (equivalent to ENTER).
+	* add: bsddialog_calendar() to select a date.
+	* change: rename enum bsddialog_grouptype -> enum bsddialog_menutype.
+	* change: fixed-menurows becames at most menurows (depending on text).
+	* change: fixed-rows becames at most rows, min(rows, screenH - shadow).
+	* change: fixed-cols becames at most cols, min(cols, screenW - shadow).
+	* delete: undocumented internal bsddialog_menuitem.depth factor (was 2).
+
+
 2022-08-29 Version 0.3
 
 	Utility:
 	* add: --textbox accepts options for the first button.
-	* add: --columns-per-row option for text autosizing.
-	* add: --load-theme option to read and set a custom theme at runtime.
-	* add: --save-theme option to save current theme.
-	* add: --bikeshed option for random settings.
+	* add: --columns-per-row for text autosizing.
+	* add: --load-theme to read and set a custom theme at runtime.
+	* add: --save-theme to save current theme.
+	* add: --bikeshed for random settings.
 	* add: --switch-buttons enables focus switching: buttons / input
 	       components. Available for: --form, --inputbox, --mixedform,
 	       --passwordform, --passwordbox, --timebox and --datebox.
 	* change: rename --esc-cancelvalue to --esc-return-cancel.
 	* change: form field value is printed like multibyte charachter string,
 	          previously widechar string.
+	* change: --timebox output with zero padding.
+	* change: --datebox output mm and dd with zero padding.
 	* fix: --hline with empty string.
 	* fix: avoid to overlay the backtitle by setting a top margin.
 	* fix: avoid to overlay down shadow with menus and forms bottomdesc
 	       by setting a down margin.
 	* fix: --form read-only flag with multiple fields.
 
 	Library:
 	* add: conf.auto_topmargin and conf.auto_downmargin.
 	* add: bsddialog_textbox() accepts conf.button.* for the first button.
 	* add: bsddialog_textbox() arrows and percentage.
 	* add: conf.text.cols_per_row to set a ratio for text autosizing.
 	* add: timebox and datebox arrows and focus background for boxes.
 	* add: timebox and datebox UP key to switch focus.
-	* add: bsddialog_init_notheme() in bsddialo_theme.h.
-	* add: bsddialog_hascolors() in bsddialo_theme.h.
+	* add: bsddialog_init_notheme() in bsddialog.h.
+	* add: bsddialog_hascolors() in bsddialog_theme.h.
 	* add: theme.form.bottomdesccolor and theme.menu.bottomdesccolor.
 	* add: conf.button.always_active to disable buttons/input-boxes switch.
 	* add: dynamic buttons margin.
 	    - add: theme.button.minmargin and theme.button.maxmargin.
 	    - delete: theme.button.hmargin.
 	* add: Unicode.
 	    - UI handles multicolumn charachters: backtitle, title,
 	      text (word wrapping, autosizing), menus (shortcuts, name, desc),
 	      forms (label, field), textbox, mixedgauge (minilabel),
 	      buttons (label, shortcuts), bottomtitle.
 	    - API handles char* arguments like multibyte charachter string,
 	      depending on the current locale.
 	    - Internally wide charachters are used to get input from keyboard
 	      and to adapt word wrapping and dynamic text autosizing to
 	      muticolumn charachters.
 	* refactoring: (rewrite) form.c.
 	    - delete: libformw dep implementing its features from scratch.
 	    - delete: maxvaluelen >= valuelen constraint.
 	    - delete: conf.form.enable_wchar, get always unicode (wchar) input.
 	    - add: KEY_HOME, KEY_END, KEY_PPAGE, KEY_NPAGE keys in field.
 	    - add: KEY_UP can move focus from buttons to fields.
 	    - add: KEY_DOWN can move focus from item to buttons, if nitem is 1.
 	    - add: conf.form.securembch secure multibyte charachter.
 	    - add: BSDDIALOG_FIELDNOCOLOR for formitem.flags.
 	    - add: BSDDIALOG_FIELDCURSOREND for formitem.flags.
 	    - add: BSDDIALOG_FIELDEXTEND for formitem.flags.
 	    - add: BSDDIALOG_FIELDSINGLEBYTE for formitem.flags.
 	    - add: resizing and refresh after KEY_RESIZE (SIGWINCH).
 	    - add: items scrolling.
 	    - add: conf.form.value_wchar, value is wchar_t* instead of MB-char*.
 	    - add: formheight autosizing.
 	    - add: dynamic item position.
 	* fix: bsddialog_gauge() with fd < 0.
-	* fix: internal segmentation fault with disabled shadow.
 	* fix: bsddialog_gauge() refresh new text.
+	* fix: internal segmentation fault with disabled shadow.
 	* fix: center position without shadow.
 	* fix: bsddialog_infobox() with zero text length.
 	* fix: text wrapping with more than 1024 words.
 	* fix: rename theme.shadow.h to theme.shadow.y.
 	* fix: rename theme.shadow.w to theme.shadow.x.
 	* fix: menurows autosize with fixed rows improving text_size().
 	* fix: messagebox.c scrolling and checksize without text.
 
 
 2022-03-02 Version 0.2
 
 	Utility:
 	* add: (this) CHANGELOG.
 	* add: "menus" print item with focus (except with OK and ERROR).
 	* add: pause.sh example.
 	* add: timebox.sh example.
 	* change: --theme name "default" -> "flat".
 	* delete: treeview.sh example.
 	* fix: --separate-output does not quote (except with --quoted).
 	* fix: --datebox and --date-format month in output.
 	* improve: examples handle exit status.
 
 	Library:
 	* add: conf.form.enable_wchar for wide characters in bsddialog_form().
 	* add: theme.menu.f_selectorcolor.
 	* add: formw.c example.
 	* change: move conf.f1_file and conf.f1_message in conf.key.
 	* change: theme.button.[left|right]ch -> theme.button.[left|right]delim.
 	* change: theme.button.space -> theme.button.hmargin.
 	* change: theme.menu.arrowcolor -> theme.dialog.arrowcolor.
-	* change: default menu item depth 4 -> 2.
+	* change: internal bsddialog_menuitem.depth factor 4 -> 2.
 	* fix: disable HOME, PPAGE, END and NPAGE keys in bsddialog_form().
 	* fix: visible cursor for timebox.c and form.c in VM VirtualBox.
 	* fix: mixedlist, center position of separator with big pad.
 	* fix: timebox and datebox set values only with BSDDIALOG_OK.
 	* fix: menurows autosize with fullscreen.
 	* fix: bar color with 0%.
 	* fix: bar label position.
 	* improve: timebox and datebox navigation (keys, buttons and shortcuts).
 	* improve: "menus" colors for accessibility.
 
 
 2022-01-27 Version 0.1
 
-	* Common-Options: --ascii-lines, --backtitle <backtitle>, --begin-x <x>,
+	* Options: --ascii-lines, --backtitle <backtitle>, --begin-x <x>,
 	  --begin-y <y>, --cancel-label <label>, --clear, --colors, --cr-wrap,
 	  --date-format <format>, --defaultno, --default-button <label>,
 	  --default-no, --default-item <name>, --disable-esc,
 	  --esc-cancelvalue, --exit-label <label>, --extra-button,
 	  --extra-label <label>, --generic-button1 <label>,
 	  --generic-button2 <label>, --help, --help-button,
 	  --help-label <label>, --help-status, --help-tags,
 	  --hfile <filename>, --hline <string>, --hmsg <string>, --ignore,
 	  --insecure, --item-depth, --item-help, --items-prefix,
 	  --max-input <size>, --no-cancel, --nocancel, --no-collapse,
 	  --no-items, --no-label <label>, --no-lines, --no-nl-expand,
 	  --no-ok, --nook, --no-shadow, --no-tags, --ok-label <label>,
 	  --output-fd <fd>, --output-separator <sep>, --print-maxsize,
 	  --print-size, --print-version, --quoted, --separate-output,
 	  --separator <sep>, --shadow, --single-quoted, --sleep <secs>,
 	  --stderr, --stdout, --tab-len <spaces>,
 	  --theme <blackwhite|bsddialog|default|dialog>,
 	  --time-format <format>, --title <title>, --trim, --version,
 	  --yes-label <label>.
 	* Dialogs: --checklist, --datebox, --form, --gauge, --infobox,
 	  --inputbox, --menu, --mixedform, --mixedgauge, --msgbox,
 	  --passwordbox, --passwordform, --pause, --radiolist, --rangebox,
 	  --textbox, --timebox, --treeview, --yesno.
 	* Manuals: bsddialog.1, bsddialog.3.
-
diff --git a/GNUMakefile b/GNUMakefile
index d57c6248d02d..7da4d64deecf 100644
--- a/GNUMakefile
+++ b/GNUMakefile
@@ -1,28 +1,28 @@
 # PUBLIC DOMAIN - NO WARRANTY, see:
 #     <http://creativecommons.org/publicdomain/zero/1.0/>
 #
 # Written in 2021 by Alfonso Sabato Siciliano
 
 OUTPUT=  bsddialog
 SOURCES= bsddialog.c util_theme.c
 OBJECTS= $(SOURCES:.c=.o)
 LIBPATH= ./lib
 LIBBSDDIALOG= $(LIBPATH)/libbsddialog.so
-CFLAGS= -Wall -Wextra -Wno-unused-parameter -I$(LIBPATH)
-LDFLAGS= -Wl,-rpath=$(LIBPATH) -L$(LIBPATH) -lbsddialog
+CFLAGS= -Wall -Wextra -I$(LIBPATH)
+LDFLAGS= -ltinfo -Wl,-rpath=$(LIBPATH) -L$(LIBPATH) -lbsddialog
 RM = rm -f
 
 all : $(OUTPUT)
 
 $(OUTPUT): $(LIBBSDDIALOG) $(OBJECTS)
 	$(CC) $^ -o $@ $(LDFLAGS)
 
 ${LIBBSDDIALOG}:
 	make -C ${LIBPATH} -f GNUMakefile
 
 %.o: %.c $(LIBBSDDIALOG)
 	$(CC) $(CFLAGS) -c $<
 
 clean:
 	make -C ${LIBPATH} -f GNUMakefile clean
 	$(RM) $(OUTPUT) *.o *~
diff --git a/Makefile b/Makefile
index 344233581d30..28162c5e90b3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,50 +1,50 @@
 # PUBLIC DOMAIN - NO WARRANTY, see:
 #     <http://creativecommons.org/publicdomain/zero/1.0/>
 #
 # Written in 2021 by Alfonso Sabato Siciliano
 
 OUTPUT=  bsddialog
 SOURCES= bsddialog.c util_theme.c
 OBJECTS= ${SOURCES:.c=.o}
 LIBPATH= ${.CURDIR}/lib
 LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so
 
-CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra -Werror -Wno-unused-parameter
+CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra -Werror
 # `make -DDEBUG`
 .if defined(DEBUG)
 CFLAGS= -g -Wall -I${LIBPATH}
 LIBDEBUG= -DDEBUG
 .endif
-LDFLAGS+= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
+LDFLAGS+= -ltinfow -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
 
 BINDIR= /usr/local/bin
 MAN= ${OUTPUT}.1
 GZIP= gzip -cn
 MANDIR= /usr/local/share/man/man1
 
 INSTALL= install
 RM= rm -f
 
 all : ${OUTPUT}
 
 ${OUTPUT}: ${LIBBSDDIALOG} ${OBJECTS}
 	${CC} ${LDFLAGS} ${OBJECTS} -o ${.PREFIX}
 
 ${LIBBSDDIALOG}:
 	make -C ${LIBPATH} ${LIBDEBUG}
 
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 install:
 	${INSTALL} -s -m 555 ${OUTPUT} ${BINDIR}
 	${GZIP} ${MAN} > ${MAN}.gz
 	${INSTALL} -m 444 ${MAN}.gz ${MANDIR}
 
 unistall:
 	${RM} ${BINDIR}/${OUTPUT}
 	${RM} ${MANDIR}/${MAN}.gz
 
 clean:
 	make -C ${LIBPATH} clean
 	${RM} ${OUTPUT} *.o *~ *.core ${MAN}.gz
diff --git a/README.md b/README.md
index 016995b232ae..59af7072e7f5 100644
--- a/README.md
+++ b/README.md
@@ -1,132 +1,120 @@
-# BSDDialog 0.3
+# BSDDialog 0.4
 
 This project provides **bsddialog** and **libbsddialog**, an utility
 and a library to build scripts and tools with TUI dialogs and widgets.
-
-
-## Intro
-
-Briefly:
-<https://www.freebsd.org/status/report-2021-04-2021-06/bsddialog/>
-
-Utility:
-<https://alfonsosiciliano.gitlab.io/posts/2021-12-07-bsddialog.html>
-
-Library:
-<https://alfonsosiciliano.gitlab.io/posts/2022-01-16-libbsddialog.html>
-
-Screenshots:
-<https://www.flickr.com/photos/alfonsosiciliano/albums/72157720215006074>
+[Screenshots](https://www.flickr.com/photos/alfonsosiciliano/albums/72157720215006074).
 
 
 ## Getting Started
 
 FreeBSD:
 
 ```
 % git clone https://gitlab.com/alfix/bsddialog.git
 % cd bsddialog
 % make
 % ./bsddialog --msgbox "Hello World!" 8 20
 ```
 
 Linux:
 
 ```
 % git clone https://gitlab.com/alfix/bsddialog.git
 % cd bsddialog
 % make -f GNUMakefile
 % ./bsddialog --msgbox "Hello World!" 8 20
 ```
 
 Output:
 
 ![screenshot](screenshot.png)
 
 
 ## Utility
 
 **Dialogs:**
 
---checklist, --datebox, --form, --gauge, --inputbox, --menu, --mixedform,
---mixedgauge, --msgbox, --passwordbox, --passwordform, --pause, --radiolist,
---rangebox, --textbox, --timebox, --treeview, --yesno.
+--calendar, --checklist, --datebox, --form, --gauge, --infobox, --inputbox,
+--menu, --mixedform, --mixedgauge, --msgbox, --passwordbox, --passwordform,
+--pause, --radiolist, --rangebox, --textbox, --timebox, --treeview, --yesno.
 
 **Manual**
 
  - [bsddialog(1)](https://alfonsosiciliano.gitlab.io/posts/2022-01-26-manual-bsddialog.html)
 
 
 **Examples**:
 
 ```
 % ./bsddialog --backtitle "TITLE" --title msgbox --msgbox "Hello World!" 5 30
 % ./bsddialog --theme blackwhite --title msgbox --msgbox "Hello World!" 5 30
 % ./bsddialog --begin-y 2 --default-no --title yesno --yesno "Hello World!" 5 30
 % ./bsddialog --ascii-lines --pause "Hello World!" 8 50 10
 % ./bsddialog --checklist "Space to select" 0 0 0 Name1 Desc1 off Name2 Desc2 on
 % ./bsddialog --title yesno --hline "bsddialog" --yesno "Hello World!" 5 25
 % ./bsddialog --extra-button --help-button --yesno "Hello World!" 0 0
 ```
 
 and [Examples](https://gitlab.com/alfix/bsddialog/-/tree/main/examples_utility)
 in the _Public Domain_ to build new projects:
 ```
+% sh ./examples_utility/calendar.sh
 % sh ./examples_utility/checklist.sh
 % sh ./examples_utility/form.sh
 % sh ./examples_utility/gauge.sh
 % sh ./examples_utility/infobox.sh
 % sh ./examples_utility/inputbox.sh
 % sh ./examples_utility/menu.sh
 % sh ./examples_utility/mixedform.sh
 % sh ./examples_utility/mixedgauge.sh
 % sh ./examples_utility/msgbox.sh
 % sh ./examples_utility/passwordbox.sh
 % sh ./examples_utility/passwordform.sh
 % sh ./examples_utility/pause.sh
 % sh ./examples_utility/radiolist.sh
 % sh ./examples_utility/timebox.sh
 % sh ./examples_utility/yesno.sh
 ```
 
 ## Library
 
 **API**
 
  - [bsddialog.h](https://gitlab.com/alfix/bsddialog/-/blob/main/lib/bsddialog.h)
  - [bsddialog\_theme.h](https://gitlab.com/alfix/bsddialog/-/blob/main/lib/bsddialog_theme.h)
 
 
 **Manual**
 
  - [bsddialog(3)](https://alfonsosiciliano.gitlab.io/posts/2022-01-15-manual-libbsddialog.html)
 
 
 **Examples**:
 
 [Examples](https://gitlab.com/alfix/bsddialog/-/tree/main/examples_library)
 in the _Public Domain_ to build new projects:
 ```
 % cd examples_library
 % sh compile
+% ./calendar
 % ./checklist
 % ./datebox
 % ./form
 % ./infobox
 % ./menu
 % ./mixedlist
 % ./msgbox
 % ./pause
 % ./radiolist
 % ./rangebox
 % ./theme
 % ./timebox
 % ./yesno
 ```
 
 
 ## TODO and Ideas
  
  - menubar feature
  - key callback
  - Right-To-Left text
diff --git a/bsddialog.1 b/bsddialog.1
index 0bf8dd9dc3af..759fe6dc3fff 100644
--- a/bsddialog.1
+++ b/bsddialog.1
@@ -1,722 +1,764 @@
 .\"
+.\"
 .\" Copyright (c) 2021-2022 Alfonso Sabato Siciliano
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 29, 2022
+.Dd September 23, 2022
 .Dt BSDDIALOG 1
 .Os
 .Sh NAME
 .Nm bsddialog
 .Nd TUI dialogs
 .Sh SYNOPSIS
 .Nm
 .Fl Fl help
 .Nm
 .Fl Fl version
 .Nm
-.Op Fl Fl common-option
+.Op Fl Fl option
 .Fl Fl dialog
 .Ar text
 .Ar rows
 .Ar cols
-.Op Ar dialog-parameter
+.Op Ar dialog-argument
+.Nm
+.Fl Fl dialog1
+.Ar ...
+.Oo Fl Fl and-dialog
+.Fl Fl dialog2
+.Ar ...
+.Oc ...
 .Sh DESCRIPTION
 The
 .Nm bsddialog
 utility builds Text User Interface dialogs and widgets: to display messages,
 to get input and to inform about a computation status.
 .Pp
 The options
 .Fl Fl help
 and
 .Fl Fl version
 print the list of options and the version, respectively, then exit.
+.Fl Fl and-dialog
+builds another dialog unless the previous one returns Error, ESC or Cancel.
 .Pp
-The following options are available for each dialog.
 .Ar text
-is a message printed inside the dialog, except for
-.Fl Fl textbox
-described later.
+is a message printed inside the dialog.
 .Ar rows
 and
 .Ar cols
 are the height and width, 0 for autosize and -1 for fullscreen.
+.Pp
 The possible input got from the user interface is printed to standard error.
-.Ss Common options
+.Ss Options
 The following options can change the default behavior of the utility and are
 common to some dialog.
 .Bl -tag -width Ds
+.It Fl Fl alternate-screen
+If available set alternate screen mode, see
+.Xr terminfo 5 .
 .It Fl Fl ascii-lines
 Ascii characters to draw lines.
 .It Fl Fl backtitle Ar backtitle
 Title on the top side of the screen.
 .It Fl Fl begin-x Ar x
 Dialog horizontal position, 0 is the left screen side, -1 center.
 .It Fl Fl begin-y Ar y
 Dialog vertical position, 0 is the top screen side, -1 center.
 .It Fl Fl bikeshed
 Random settings.
 Colors.
 Delimiter and margins around the title.
 Buttons always active or TAB to switch focus with input components, see
 .Fl Fl switch-buttons .
 Zero padding with time or date output.
 .It Fl Fl cancel-label Ar label
 Label for the
 .Dq Cancel
 button.
-.It Fl Fl clear
+.It Fl Fl clear-dialog
 Hide the dialog at exit.
+.It Fl Fl clear-screen
+Clear the screen, after the dialog exit if a dialog is built.
 .It Fl Fl colors
 Enable highlights for text, the following sequences are considered escapes:
 .Bl -column -compact
 .It Dq \eZ0
 black.
 .It Dq \eZ1
 red.
 .It Dq \eZ2
 green.
 .It Dq \eZ3
 yellow.
 .It Dq \eZ4
 blue.
 .It Dq \eZ5
 magenta.
 .It Dq \eZ6
 cyan.
 .It Dq \eZ7
 white.
 .It Dq \eZr
 reverse foreground and background.
 .It Dq \eZR
 disable reverse.
 .It Dq \eZb
 bold.
 .It Dq \eZB
 disable bold.
 .It Dq \eZu
 underline.
 .It Dq \eZU
 disable underline.
 .It Dq \eZn
 restore normal text.
 .El
 .It Fl Fl columns-per-row Ar columns
 Try to set the number of columns for a row of text with autosizing; default
 .Dv 10 .
 .It Fl Fl cr-wrap
-Replace new line with a space in
-.Ar text .
+Keep new line in
+.Ar text
+also if it constains a
+.Dq \en ,
+see
+.Fl Fl text-unchanged .
 .It Fl Fl date-format Ar format
 String accepted by
 .Xr strftime 3
 to customize the output of
-.Fl Fl datebox .
+.Fl Fl datebox
+and
+.Fl Fl calendar
 .It Fl Fl default-button Ar label
 Focus on the button with
 .Ar label
 on startup.
 .It Fl Fl default-item Ar name
 Focus on the item with
 .Ar name ,
 for Checklist, Menu, Radiolist and Treeview.
 .It Fl Fl default-no
 Focus on
 .Dq Cancel
 or
 .Dq \&No
 button on startup.
-.It Fl Fl defaultno
-Equivalent to
-.Fl Fl default-no .
 .It Fl Fl disable-esc
 Disable ESC key to quit.
 .It Fl Fl esc-return-cancel
-Exits with the
+ESC key returns
 .Dq Cancel
-button value if the ESC key is pressed.
-.It Fl Fl exit-label Ar label
-Equivalent to
-.Fl Fl ok-label .
+button value.
 .It Fl Fl extra-button
 Add a button with
 .Dq Extra
 label.
 .It Fl Fl extra-label Ar label
 Set
 .Ar label
 for the
 .Dq Extra
 button.
 .It Fl Fl generic-button1 Ar label
 Add a button with
 .Ar label .
 .It Fl Fl generic-button2 Ar label
 Add a button with
 .Ar label .
 .It Fl Fl help-button
 Add a button with
 .Dq Help
 label.
 .It Fl Fl help-label Ar label
 Set
 .Ar label
 for
 .Dq Help
 button.
+.It Fl Fl help-print-name
+Print the name of the focused item if the Help button is pressed also
+with
+.Fl Fl item-bottom-desc .
 .It Fl Fl help-status
 Print also the selected items if the
 .Dq Help
 button is pressed.
-.It Fl Fl help-tags
-Print the name of the focused item if the Help button is pressed also
-with
-.Fl Fl item-help .
 .It Fl Fl hfile Ar filename
 Open
 .Ar filename
 in a Textbox if F1 key is pressed,
 .It Fl Fl hline Ar string
 Dialog subtitle.
 .It Fl Fl hmsg Ar string
 Open a Msgbox with
 .Ar string
 if the F1 key is pressed.
 .It Fl Fl ignore
 Do not exit with unknown options.
 .It Fl Fl insecure
 Print
 .Sq *
 to hide passwords while typing; whitespace otherwise.
+.It Fl Fl item-bottom-desc
+Set a help string for each item of a Checklist, Form, Menu, Mixedform,
+Passwordform, Radiolist and Treeview to display at the bottom screen side.
 .It Fl Fl item-depth
 Specify a margin for items, available for Checklist, Menu and Radiolist.
-.It Fl Fl item-help
-Set a help string for each element of a Checklist, Form, Menu, Mixedform,
-Passwordform, Radiolist and Treeview to display at the bottom screen side.
 .It Fl Fl item-prefix
 Set a string to prefix each item of a Checklist, Menu, Radiolist or Treeview.
 .It Fl Fl load-theme Ar file
 Load theme from
 .Ar file .
 .It Fl Fl max-input Ar size
 Maximum length of the input for
 .Fl Fl inputbox
 ans
 .Fl Fl passwordbox ,
 default 2048.
 .It Fl Fl no-cancel
 Do not show
 .Dq Cancel
 button.
-.It Fl Fl no-collapse
-Do not replace a TAB character with a space in
-.Ar text .
-.It Fl Fl no-items
+.It Fl Fl no-descriptions
 Do not display items desciption, for Checklist, Menu, Radiolist or Treeview.
-.It Fl Fl no-label Ar label
-Equivalent to
-.Fl Fl cancel-label .
 .It Fl Fl no-lines
 Do not draw borders and lines.
-.It Fl Fl no-nl-expand
-do not consider the sequence
-.Dq \en
-like new line.
+.It Fl Fl no-names
+Do not display items name, for Checklist, Menu and Radiolist.
 .It Fl Fl no-ok
 Do not draw
 .Dq OK
 button.
 .It Fl Fl no-shadow
 No not draw the shadow of the dialog.
-.It Fl Fl no-tags
-Do not display items name, for Checklist, Menu and Radiolist.
-.It Fl Fl nocancel
-Equivalent to
-.Fl Fl no-cancel .
-.It Fl Fl nook
-Equivalent to
-.Fl Fl no-ok .
 .It Fl Fl ok-label Ar label
 Set
 .Ar label
 for
 .Dq OK
 button.
+.It Fl Fl normal-screen
+If available set normal screen mode, see
+.Xr terminfo 5 .
 .It Fl Fl output-fd Ar fd
 Print input from user interface to the specified file descriptor.
 .It Fl Fl output-separator Ar sep
 Set a sepator for the items in output, default whitespace.
 .It Fl Fl print-maxsize
 Screen size.
+This option can be used without a dialog.
 .It Fl Fl print-size
 Print Dialog height and widget at exit.
 .It Fl Fl print-version
 Print version.
+This option can be used without a dialog.
 .It Fl Fl quoted
 Quote items in output, default only when necessary.
 .It Fl Fl save-theme Ar file
 Save the current theme.
+This option can be used without a dialog.
 .It Fl Fl separate-output
 Separate selected items with a new line and avoid to quote.
-.It Fl Fl separator Ar sep
-Equivalent to
-.Fl Fl output-separator .
 .It Fl Fl shadow
 Show a pseudo shadow for the dialog, enabled by default.
 .It Fl Fl single-quoted
 Use single quote for items in output.
 .It Fl Fl sleep Ar secs
 Wait
 .Ar secs
 seconds to close the dialog.
 .It Fl Fl stderr
 Print input from user interface to standand error, default.
 .It Fl Fl stdout
 Print input from user interface to standard output.
 .It Fl Fl switch-buttons
 enables focus switching between buttons and input components pressing TAB,
 otherwise buttons are always active and ENTER key closes the dialog.
 Suitable for:
 .Fl Fl form ,
 .Fl Fl inputbox ,
 .Fl Fl mixedform ,
 .Fl Fl passwordbox ,
 .Fl Fl passwordform ,
-.Fl Fl timebox
+.Fl Fl timebox ,
+.Fl Fl calendar
 and
 .Fl Fl datebox .
+.It Fl Fl tab-escape
+Replace
+.Dq \et
+with a tab in
+.Ar text .
 .It Fl Fl tab-len Ar spaces
 Number of spaces to print a TAB in
 .Ar text .
+.It Fl Fl text-unchanged
+By default the
+.Ar text
+is changed before to be printed.
+If it contains at least a
+.Dq \en
+each new line and TAB is converted to a space, subsequent spaces are merged.
+Otherwise new line characters are preserved and a TAB becomes a space.
+This option disable the
+.Ar text
+modification.
 .It Fl Fl theme Ar theme
 Set a graphical style: blackwhite, bsddialog, flat or dialog.
 .It Fl Fl time-format Ar format
 String accepted by
 .Xr strftime 3
 to customize the output of
 .Fl Fl timebox .
 .It Fl Fl title Ar title
 Dialog title.
-.It Fl Fl trim
-remove consecutive spaces in
-.Ar text .
-.It Fl Fl yes-label Ar label
-Equivalent to
-.Fl Fl ok-label .
 .El
 .Ss Dialogs
 The following dialogs are available:
 .Bl -tag -width Ds
+.It Fl Fl calendar Ar text Ar rows Ar cols Op Ar day Ar month Ar year
+Dialog to select a date.
 .It Fl Fl checklist Ar text Ar rows Ar cols Ar menurows Oo Ar name Ar desc \
 Ar status Oc ...
 Checklist to select some item from a list via the SPACE key.
 An item has a
 .Ar name ,
 .Ar desc
 and a default
 .Ar status
 specified by
 .Dq on
 or
 .Dq off .
 The names of the selected items are printed to standard error.
 .Ar menurows
 is the graphical height of the list, 0 for autosize.
-.It Fl Fl datebox Ar text Ar rows Ar cols Op Ar year Ar month Ar day
+.It Fl Fl datebox Ar text Ar rows Ar cols Op Ar day Ar month Ar year
 Dialog to select a date.
 .It Fl Fl form Ar text Ar rows Ar cols Ar formrows Oo Ar label Ar ylabel \
 Ar xlabel Ar init Ar yfield Ar xfield Ar fieldlen Ar maxletters Oc ...
 Dialog to get a list of strings via forms.
 A form has a
 .Ar label
 at the position
 .Ar ylabel
 and
 .Ar xlabel ,
 a field to get the input at the position
 .Ar yfield
 and
 .Ar xfield
 with graphical length
 .Ar fieldlen ,
 .Ar maxletters
 is the maximum input length.
 The field can be customized, if
 .Ar fieldlen
 is negative the field is read only and its absolute value is the field length.
 If
 .Ar maxletters
 is 0 it is the absolute value of
 .Ar fieldlen .
 .Ar init
 is a default value.
 .Ar formrows
 is the graphical height of the list,
 .Dv 0
 for autosize.
 .It Fl Fl gauge Ar text Ar rows Ar cols Op Ar percentage
 Dialog with a bar to shows
 .Ar percentage ,
 then it waits to read
 .Dq XXX
 from the standard input, then the first string replaces percentage and the
 following strings replace
 .Ar text
 until the next
 .Dq XXX ,
 the loop ends reading
 .Dv EOF .
 .It Fl Fl infobox Ar text Ar rows Ar cols
 Dialog without buttons to display a message and to exit immediately.
 .It Fl Fl inputbox Ar text Ar rows Ar cols Op Ar init
 Dialog to get a string in input,
 .Ar init
 is the default value.
 .It Fl Fl menu Ar text Ar rows Ar cols Ar menurows Oo Ar name desc Oc ...
-Builds a menu to select an item from a list.
+Builds a menu to select an item from a list, Space key is equivalent to Enter.
 An item has a
 .Ar name
 and a
 .Ar desc .
 The name of the selected item is printed to standard error.
 .Ar menurows
 is the graphical height of the list, 0 for autosize.
 .It Fl Fl mixedform Ar text Ar rows Ar cols Ar formrows Oo Ar label Ar ylabel \
 Ar xlabel Ar init Ar yfield Ar xfield Ar fieldlen Ar maxletters Ar flag Oc ...
 Dialog to get a list of strings via forms.
 A form has a
 .Ar label
 at the position
 .Ar ylabel
 and
 .Ar xlabel ,
 a field to get the input with graphical length
 .Ar fieldlen
 at the position
 .Ar yfield
 and
 .Ar xfield ,
 .Ar maxletters
 is the maximum input length,
 .Ar init
 is a default value,
 .Ar flag
 can be 0 for normal field, 1 to hide the typed characters and 2 to set the
 field read only.
 .Ar formrows
 is the graphical height of the list,
 .Dv 0
 for autosize.
 .It Fl Fl mixedgauge Ar text Ar rows Ar cols Ar mainperc Oo Ar minilabel \
 Ar miniperc Oc ...
 Dialog to show a main bar to represent
 .Ar mainperc
 from 0 to 100 and some mini bar with a
 .Ar minilabel
 string and a
 .Ar miniperc
 with value from 0 and 100 or negative to print a descriptive string: -1
 .Dq Succeeded ,
 -2
 .Dq Failed ,
 -3
 .Dq Passed ,
 -4
 .Dq Completed ,
 -5
 .Dq Checked ,
 -6
 .Dq Done ,
 -7
 .Dq Skipped ,
 -8
 .Dq \&In Progress ,
 -9
 a blank line,
 -10
 .Dq N/A ,
 -11
 .Dq Pending .
 .It Fl Fl msgbox Ar text Ar rows Ar cols
 Dialog to diplay a message without the
 .Dq Cancel
 button.
+UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to navigate the text.
 .It Fl Fl passwordbox Ar text Ar rows Ar cols Op Ar init
 Dialog to get a password,
 .Ar init
 is the default value.
 .It Fl Fl passwordform Ar text Ar rows Ar cols Ar formrows Oo Ar label \
 Ar ylabel Ar xlabel Ar init Ar yfield Ar xfield  Ar fieldlen Ar maxletters \
 Oc ...
 Dialog to get a list of passwords, equivalent to
 .Fl Fl form
 except typed characters are hidden.
 .It Fl Fl pause Ar text Ar rows Ar cols Ar seconds
 Dialog runs until the timeout in
 .Ar seconds
 expires or a button is pressed.
 .It Fl Fl radiolist Ar text Ar rows Ar cols Ar menurows Oo Ar name Ar desc \
 Ar status Oc ...
 Radiolist to select at most an item from a list via the SPACE key.
 An item has a
 .Ar name ,
 .Ar desc
 and a default
 .Ar status
 specified by
 .Dq on
 or
 .Dq off .
 The name of the selected item is printed to standard error.
 .Ar menurows
 is the graphical height of the list, 0 for autosize.
 .It Fl Fl rangebox Ar text Ar rows Ar cols Ar min Ar max Op Ar init
 Dialog to select a value between
 .Ar min
 and
 .Ar max ,
 .Ar init
 is the default value, the keys UP, DOWN, HOME, END, PAGEUP and PAGEDOWN can
 change it.
 .It Fl Fl textbox Ar file Ar rows Ar cols
 Opens and prints
 .Ar file
 the UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to navigate;
 .Dq OK
 button is renamed
 .Dq EXIT .
 .It Fl Fl timebox Ar text Ar rows Ar cols Op Ar hour Ar min Ar sec
 Dialog to select a time.
 .It Fl Fl treeview Ar text Ar rows Ar cols Ar menurows Oo Ar depth Ar name \
 Ar desc Ar status Oc ...
 Equivalent to Radiolist with
 .Fl Fl  item-depth
 and
 .Fl Fl no-name .
 .It Fl Fl yesno Ar text Ar rows Ar cols
 .Dq Yes-No Question ,
 .Dq OK
 and
 .Dq Cancel
 buttons are renamed
 .Dq Yes
 and
 .Dq \&No .
+UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to navigate the text.
 .El
 .Sh EXIT STATUS
 The
 .Nm
 utility exits 255 on unsuccessful, otherwise depending on the button or key
 pressed the following values can be returned:
 .Bl -column -compact
 .It 0
 .Dq OK ,
 .Dq Yes
 or
 .Dq Exit
 button.
 .It 1
 .Dq Cancel
 or
 .Dq \&No
 button.
 .It 2
 .Dq Help
 button.
 .It 3
 .Dq Extra
 button.
 .It 4
 Timeout.
 .It 5
 ESC key.
 .It 6
 Generic 1 button.
 .It 7
 Generic 2 button.
 .El
 .Sh EXAMPLES
 Backtitle, title and message:
 .Dl bsddialog --backtitle MESSAGE --title Msgbox --msgbox Message 0 0
 .Pp
 Yes-No Question and theme:
 .Dl bsddialog --theme blackwhite --yesno Question 10 30
 .Pp
 Save a custom theme:
 .Dl bsddialog --save-theme mytheme.txt --infobox \*qSaving theme...\*q 0 0
 .Pp
 Load a custom theme:
 .Dl bsddialog --load-theme mytheme.txt --infobox \*qCustom theme\*q 0 0
 .Pp
 Checklist:
 .Dl bsddialog --checklist Checklist 0 0 3 N1 \&D1 off N2 D2 on N3 D3 off
 .Pp
 Form:
 .Dl bsddialog --form Form 0 0 0 L1: 0 0 X 0 4 20 25 L2: 1 0 Y 1 4 20 25
 .Pp
+Multi-dialog:
+.Dl bsddialog --normal-screen --begin-y 1 --yesno Continue? 0 0  \e \
+--and-dialog --begin-y 10 --infobox Yes 0 0
+.Pp
 Bikeshed:
 .Dl bsddialog --bikeshed --inputbox Example 0 0
 .Pp
 Mixedgauge:
 .Dl bsddialog --sleep 3 --mixedgauge Example 10 30 60 L1 \*q -1\*q L2 30
 .Pp
 Mixedgauge script:
 .Bd -literal -offset indent -compact
 perc=0
 while [ $perc -le 100 ]
 do
 	bsddialog --sleep 1 --title Mixedgauge          \e
 		--mixedgauge "\enExample...\en" 0 0 $perc \e
 		"Hidden"   " -9"                        \e
 		"Label 1"  " -4"                        \e
 		"Label 2"  " -4"                        \e
 		"Label 3"  $perc
 
 	perc=`expr $perc + 20`
 done
 .Ed
 .Pp
 Gauge script:
 .Bd -literal -offset indent -compact
 i=1
 for c in A B C D E F G H
 do
 	sleep 1
 	echo XXX
 	echo "$(expr $(expr $i "*" 100) "/" 8)"
 	echo "[$i/8] Char: $c"
 	echo XXX
 	if [ $i -eq 8 ]
 	then
 		sleep 1
 		echo EOF
 	fi
 	i=`expr $i + 1`
 done | bsddialog --title Gauge --gauge "Starting..." 10 70
 .Ed
+.Sh COMPATIBILITY
+Outdated options are retained for compatibility, properly equivalent options are
+used:
+.Bd -literal -offset indent -compact
+Obsolete                     Equivalent
+--and-widget                 --and-dialog
+--calendar <text> 2 <cols>   --calendar <text> 0 <cols>
+--clear                      --clear-screen
+--defaultno                  --default-no
+--exit-label                 --ok-label
+--help-tags                  --help-print-name
+--item-help                  --item-bottom-desc
+--keep-tite                  --alternate-screen
+--no-items                   --no-descriptions
+--no-label                   --cancel-label
+--no-tags                    --no-names
+--nocancel                   --no-cancel
+--nook                       --no-ok
+--separator                  --output-separator
+--yes-label                  --ok-label
+.Ed
 .Sh SEE ALSO
 .Xr bsddialog 3
 .Sh HISTORY
 The
 .Nm bsddialog
 utility first appeared in
 .Fx 14.0 .
 .Sh AUTHORS
 .Nm bsddialog
 was written by
 .An Alfonso Sabato Siciliano
 .Aq Mt asiciliano@FreeBSD.org .
 .Pp
 .Nm bsddialog
 provides a subset of the functionality described in the
 .Nm dialog
 manual.
 The following features were reimplemented:
 .Pp
-Common options:
+Options:
+.Fl Fl and-widget ,
 .Fl Fl ascii-lines ,
 .Fl Fl backtitle ,
 .Fl Fl cancel-label ,
 .Fl Fl clear ,
 .Fl Fl colors ,
 .Fl Fl cr-wrap ,
 .Fl Fl date-format ,
 .Fl Fl defaultno ,
 .Fl Fl default-button ,
 .Fl Fl default-no ,
 .Fl Fl default-item ,
 .Fl Fl exit-label ,
 .Fl Fl extra-button ,
 .Fl Fl extra-label ,
 .Fl Fl help ,
 .Fl Fl help-button ,
 .Fl Fl help-label ,
 .Fl Fl help-status ,
 .Fl Fl help-tags ,
 .Fl Fl hfile ,
 .Fl Fl hline ,
 .Fl Fl ignore ,
 .Fl Fl insecure ,
 .Fl Fl item-help ,
+.Fl Fl keep-tite ,
 .Fl Fl max-input ,
 .Fl Fl no-cancel ,
 .Fl Fl nocancel ,
-.Fl Fl no-collapse ,
 .Fl Fl no-items ,
 .Fl Fl no-label ,
 .Fl Fl no-lines ,
-.Fl Fl no-nl-expand ,
 .Fl Fl no-ok ,
 .Fl Fl nook ,
 .Fl Fl no-shadow ,
 .Fl Fl no-tags ,
 .Fl Fl ok-label ,
 .Fl Fl output-fd ,
 .Fl Fl output-separator ,
 .Fl Fl print-maxsize ,
 .Fl Fl print-size ,
 .Fl Fl print-version ,
 .Fl Fl quoted ,
 .Fl Fl separate-output ,
 .Fl Fl separator ,
 .Fl Fl shadow ,
 .Fl Fl single-quoted ,
 .Fl Fl sleep ,
 .Fl Fl stderr ,
 .Fl Fl stdout ,
 .Fl Fl tab-len ,
 .Fl Fl time-format ,
 .Fl Fl title ,
-.Fl Fl trim ,
 .Fl Fl version ,
 .Fl Fl yes-label .
 .Pp
 Dialogs:
+.Fl Fl calendar ,
 .Fl Fl checklist ,
 .Fl Fl form ,
 .Fl Fl gauge ,
 .Fl Fl infobox ,
 .Fl Fl inputbox ,
 .Fl Fl menu ,
 .Fl Fl mixedform ,
 .Fl Fl mixedgauge ,
 .Fl Fl msgbox ,
 .Fl Fl passwordbox ,
 .Fl Fl passwordform ,
 .Fl Fl pause ,
 .Fl Fl radiolist ,
 .Fl Fl rangebox ,
 .Fl Fl textbox ,
 .Fl Fl timebox ,
 .Fl Fl treeview ,
 .Fl Fl yesno .
 .Pp
 Some feature differs in input, output, or behavior.
 Compatibility is not a priority for future development.
 .Sh THANKS TO
 .An Baptiste Daroussin
-.Aq Mt bapt@FreeBSD.org
-and
+.Aq Mt bapt@FreeBSD.org ,
 .An \&Ed Maste
 .Aq Mt emaste@FreeBSD.org
+and
+.An Juraj Lutter
+.Aq Mt otis@FreeBSD.org
 for suggestions, help, and testing.
diff --git a/bsddialog.c b/bsddialog.c
index bfd6d8dbc5b7..b9b2810dc62f 100644
--- a/bsddialog.c
+++ b/bsddialog.c
@@ -1,1506 +1,1687 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/ioctl.h>
 
 #include <getopt.h>
 #include <locale.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <term.h>
 #include <time.h>
 #include <unistd.h>
 
 #include <bsddialog.h>
 #include <bsddialog_theme.h>
 
 #include "util_theme.h"
 
-#define BSDDIALOG_VERSION "0.3"
-
 enum OPTS {
-	/* Common options */
-	ASCII_LINES = '?' + 1,
+	/* Options */
+	ALTERNATE_SCREEN = '?' + 1,
+	AND_DIALOG,
+	ASCII_LINES,
 	BACKTITLE,
 	BEGIN_X,
 	BEGIN_Y,
 	BIKESHED,
 	CANCEL_LABEL,
-	CLEAR,
+	CLEAR_DIALOG,
+	CLEAR_SCREEN,
 	COLORS,
 	COLUMNS_PER_ROW,
 	CR_WRAP,
 	DATE_FORMAT,
 	DEFAULT_BUTTON,
 	DEFAULT_ITEM,
 	DEFAULT_NO,
 	DISABLE_ESC,
 	ESC_RETURNCANCEL,
 	EXIT_LABEL,
 	EXTRA_BUTTON,
 	EXTRA_LABEL,
 	GENERIC_BUTTON1,
 	GENERIC_BUTTON2,
-	HELP,
 	HELP_BUTTON,
 	HELP_LABEL,
+	HELP_PRINT_NAME,
 	HELP_STATUS,
-	HELP_TAGS,
 	HFILE,
 	HLINE,
 	HMSG,
 	IGNORE,
 	INSECURE,
+	ITEM_BOTTOM_DESC,
 	ITEM_DEPTH,
-	ITEM_HELP,
 	ITEM_PREFIX,
 	LOAD_THEME,
 	MAX_INPUT,
 	NO_CANCEL,
-	NO_COLLAPSE,
-	NO_ITEMS,
+	NO_DESCRIPTIONS,
 	NO_LINES,
-	NO_NL_EXPAND,
+	NO_NAMES,
 	NO_OK,
 	NO_SHADOW,
-	NO_TAGS,
+	NORMAL_SCREEN,
 	OK_LABEL,
 	OUTPUT_FD,
 	OUTPUT_SEPARATOR,
 	PRINT_MAXSIZE,
 	PRINT_SIZE,
 	PRINT_VERSION,
 	QUOTED,
 	SAVE_THEME,
 	SEPARATE_OUTPUT,
 	SHADOW,
 	SINGLE_QUOTED,
 	SLEEP,
 	STDERR,
 	STDOUT,
 	SWITCH_BUTTONS,
+	TAB_ESCAPE,
 	TAB_LEN,
+	TEXT_UNCHANGED,
 	THEME,
 	TIME_FORMAT,
 	TITLE,
-	TRIM,
-	VERSION,
 	/* Dialogs */
+	CALENDAR,
 	CHECKLIST,
 	DATEBOX,
 	FORM,
 	GAUGE,
 	INFOBOX,
 	INPUTBOX,
 	MENU,
 	MIXEDFORM,
 	MIXEDGAUGE,
 	MSGBOX,
 	PASSWORDBOX,
 	PASSWORDFORM,
 	PAUSE,
 	RADIOLIST,
 	RANGEBOX,
 	TEXTBOX,
 	TIMEBOX,
 	TREEVIEW,
 	YESNO
 };
 
+/* options descriptor */
+static struct option longopts[] = {
+	/* Options */
+	{"alternate-screen",  no_argument,       NULL, ALTERNATE_SCREEN},
+	{"and-dialog",        no_argument,       NULL, AND_DIALOG},
+	{"and-widget",        no_argument,       NULL, AND_DIALOG},
+	{"ascii-lines",       no_argument,       NULL, ASCII_LINES},
+	{"backtitle",         required_argument, NULL, BACKTITLE},
+	{"begin-x",           required_argument, NULL, BEGIN_X},
+	{"begin-y",           required_argument, NULL, BEGIN_Y},
+	{"bikeshed",          no_argument,       NULL, BIKESHED},
+	{"cancel-label",      required_argument, NULL, CANCEL_LABEL},
+	{"clear",             no_argument,       NULL, CLEAR_SCREEN},
+	{"clear-dialog",      no_argument,       NULL, CLEAR_DIALOG},
+	{"clear-screen",      no_argument,       NULL, CLEAR_SCREEN},
+	{"colors",            no_argument,       NULL, COLORS},
+	{"columns-per-row",   required_argument, NULL, COLUMNS_PER_ROW},
+	{"cr-wrap",           no_argument,       NULL, CR_WRAP},
+	{"date-format",       required_argument, NULL, DATE_FORMAT},
+	{"defaultno",         no_argument,       NULL, DEFAULT_NO},
+	{"default-button",    required_argument, NULL, DEFAULT_BUTTON},
+	{"default-item",      required_argument, NULL, DEFAULT_ITEM},
+	{"default-no",        no_argument,       NULL, DEFAULT_NO},
+	{"disable-esc",       no_argument,       NULL, DISABLE_ESC},
+	{"esc-return-cancel", no_argument,       NULL, ESC_RETURNCANCEL},
+	{"exit-label",        required_argument, NULL, EXIT_LABEL},
+	{"extra-button",      no_argument,       NULL, EXTRA_BUTTON},
+	{"extra-label",       required_argument, NULL, EXTRA_LABEL},
+	{"generic-button1",   required_argument, NULL, GENERIC_BUTTON1},
+	{"generic-button2",   required_argument, NULL, GENERIC_BUTTON2},
+	{"help-button",       no_argument,       NULL, HELP_BUTTON},
+	{"help-label",        required_argument, NULL, HELP_LABEL},
+	{"help-print-name",   no_argument,       NULL, HELP_PRINT_NAME},
+	{"help-status",       no_argument,       NULL, HELP_STATUS},
+	{"help-tags",         no_argument,       NULL, HELP_PRINT_NAME},
+	{"hfile",             required_argument, NULL, HFILE},
+	{"hline",             required_argument, NULL, HLINE},
+	{"hmsg",              required_argument, NULL, HMSG},
+	{"ignore",            no_argument,       NULL, IGNORE},
+	{"insecure",          no_argument,       NULL, INSECURE},
+	{"item-bottom-desc",  no_argument,       NULL, ITEM_BOTTOM_DESC},
+	{"item-depth",        no_argument,       NULL, ITEM_DEPTH},
+	{"item-help",         no_argument,       NULL, ITEM_BOTTOM_DESC},
+	{"item-prefix",       no_argument,       NULL, ITEM_PREFIX},
+	{"keep-tite",         no_argument,       NULL, ALTERNATE_SCREEN},
+	{"load-theme",        required_argument, NULL, LOAD_THEME},
+	{"max-input",         required_argument, NULL, MAX_INPUT},
+	{"no-cancel",         no_argument,       NULL, NO_CANCEL},
+	{"nocancel",          no_argument,       NULL, NO_CANCEL},
+	{"no-descriptions",   no_argument,       NULL, NO_DESCRIPTIONS},
+	{"no-items",          no_argument,       NULL, NO_DESCRIPTIONS},
+	{"no-label",          required_argument, NULL, CANCEL_LABEL},
+	{"no-lines",          no_argument,       NULL, NO_LINES},
+	{"no-names",          no_argument,       NULL, NO_NAMES},
+	{"no-ok",             no_argument,       NULL, NO_OK},
+	{"nook ",             no_argument,       NULL, NO_OK},
+	{"no-shadow",         no_argument,       NULL, NO_SHADOW},
+	{"no-tags",           no_argument,       NULL, NO_NAMES},
+	{"normal-screen",     no_argument,       NULL, NORMAL_SCREEN},
+	{"ok-label",          required_argument, NULL, OK_LABEL},
+	{"output-fd",         required_argument, NULL, OUTPUT_FD},
+	{"output-separator",  required_argument, NULL, OUTPUT_SEPARATOR},
+	{"print-maxsize",     no_argument,       NULL, PRINT_MAXSIZE},
+	{"print-size",        no_argument,       NULL, PRINT_SIZE},
+	{"print-version",     no_argument,       NULL, PRINT_VERSION},
+	{"quoted",            no_argument,       NULL, QUOTED},
+	{"save-theme",        required_argument, NULL, SAVE_THEME},
+	{"separate-output",   no_argument,       NULL, SEPARATE_OUTPUT},
+	{"separator",         required_argument, NULL, OUTPUT_SEPARATOR},
+	{"shadow",            no_argument,       NULL, SHADOW},
+	{"single-quoted",     no_argument,       NULL, SINGLE_QUOTED},
+	{"sleep",             required_argument, NULL, SLEEP},
+	{"stderr",            no_argument,       NULL, STDERR},
+	{"stdout",            no_argument,       NULL, STDOUT},
+	{"switch-buttons",    no_argument,       NULL, SWITCH_BUTTONS},
+	{"tab-escape",        no_argument,       NULL, TAB_ESCAPE},
+	{"tab-len",           required_argument, NULL, TAB_LEN},
+	{"text-unchanged",    no_argument,       NULL, TEXT_UNCHANGED},
+	{"theme",             required_argument, NULL, THEME},
+	{"time-format",       required_argument, NULL, TIME_FORMAT},
+	{"title",             required_argument, NULL, TITLE},
+	{"yes-label",         required_argument, NULL, OK_LABEL},
+	/* Dialogs */
+	{"calendar",     no_argument, NULL, CALENDAR},
+	{"checklist",    no_argument, NULL, CHECKLIST},
+	{"datebox",      no_argument, NULL, DATEBOX},
+	{"form",         no_argument, NULL, FORM},
+	{"gauge",        no_argument, NULL, GAUGE},
+	{"infobox",      no_argument, NULL, INFOBOX},
+	{"inputbox",     no_argument, NULL, INPUTBOX},
+	{"menu",         no_argument, NULL, MENU},
+	{"mixedform",    no_argument, NULL, MIXEDFORM},
+	{"mixedgauge",   no_argument, NULL, MIXEDGAUGE},
+	{"msgbox",       no_argument, NULL, MSGBOX},
+	{"passwordbox",  no_argument, NULL, PASSWORDBOX},
+	{"passwordform", no_argument, NULL, PASSWORDFORM},
+	{"pause",        no_argument, NULL, PAUSE},
+	{"radiolist",    no_argument, NULL, RADIOLIST},
+	{"rangebox",     no_argument, NULL, RANGEBOX},
+	{"textbox",      no_argument, NULL, TEXTBOX},
+	{"timebox",      no_argument, NULL, TIMEBOX},
+	{"treeview",     no_argument, NULL, TREEVIEW},
+	{"yesno",        no_argument, NULL, YESNO},
+	/* END */
+	{ NULL, 0, NULL, 0}
+};
+
 /* Menus options */
-static bool item_prefix_opt, item_bottomdesc_opt, item_output_sepnl_opt;
-static bool item_singlequote_opt, list_items_on_opt, item_tag_help_opt;
-static bool item_always_quote_opt, item_depth_opt;
-static char *item_output_sep_opt, *item_default_opt;
+static bool item_prefix_opt;
+static bool item_bottomdesc_opt;
+static bool item_output_sepnl_opt;
+static bool item_singlequote_opt;
+static bool list_items_on_opt;
+static bool item_help_print_name_opt;
+static bool item_always_quote_opt;
+static bool item_depth_opt;
+static char *item_output_sep_opt;
+static char *item_default_opt;
 /* Date and Time options */
-static char *date_fmt_opt, *time_fmt_opt;
+static char *date_fmt_opt;
+static char *time_fmt_opt;
 /* Forms options */
 static int unsigned max_input_form_opt;
 /* General options */
+static bool esc_return_cancel_opt;
+static bool ignore_opt;
 static int output_fd_opt;
-bool bikeshed_opt;
+static int getH_opt;
+static int getW_opt;
+/* Text option */
+static bool cr_wrap_opt;
+static bool tab_escape_opt;
+static bool text_unchanged_opt;
+/* Theme and Screen options*/
+static bool bikeshed_opt;
+static enum bsddialog_default_theme theme_opt;
+static char *backtitle_opt;
+static bool clear_screen_opt;
+static char *loadthemefile;
+static char *savethemefile;
+static const char *screen_mode_opt;
 
 /* Functions */
-static void sigint_handler(int sig);
-static void
-custom_text(bool cr_wrap, bool no_collapse, bool no_nl_expand, bool trim,
-    char *text, char *buf);
-static void errorexit(char *errbuf);
+#define UNUSED_PAR(x) UNUSED_ ## x __attribute__((__unused__))
+static void custom_text(char *text, char *buf);
+static void usage(void);
 /* Dialogs */
 #define BUILDER_ARGS struct bsddialog_conf *conf, char* text, int rows,        \
-	int cols, int argc, char **argv, char *errbuf
+	int cols, int argc, char **argv
+static int calendar_builder(BUILDER_ARGS);
 static int checklist_builder(BUILDER_ARGS);
 static int datebox_builder(BUILDER_ARGS);
 static int form_builder(BUILDER_ARGS);
 static int gauge_builder(BUILDER_ARGS);
 static int infobox_builder(BUILDER_ARGS);
 static int inputbox_builder(BUILDER_ARGS);
 static int menu_builder(BUILDER_ARGS);
 static int mixedform_builder(BUILDER_ARGS);
 static int mixedgauge_builder(BUILDER_ARGS);
 static int msgbox_builder(BUILDER_ARGS);
 static int passwordbox_builder(BUILDER_ARGS);
 static int passwordform_builder(BUILDER_ARGS);
 static int pause_builder(BUILDER_ARGS);
 static int radiolist_builder(BUILDER_ARGS);
 static int rangebox_builder(BUILDER_ARGS);
 static int textbox_builder(BUILDER_ARGS);
 static int timebox_builder(BUILDER_ARGS);
 static int treeview_builder(BUILDER_ARGS);
 static int yesno_builder(BUILDER_ARGS);
 
+/* init, exit and internals */
+static bool in_bsddialog_mode;
+static bool mandatory_dialog;
+static int (*dialogbuilder)(BUILDER_ARGS);
+
+static void exit_error(const char *errstr, bool with_usage)
+{
+	if (in_bsddialog_mode)
+		bsddialog_end();
+
+	printf("Error: %s.\n\n", errstr);
+	if (with_usage) {
+		printf("See \'bsddialog --help\' or \'man 1 bsddialog\' ");
+		printf("for more information.\n");
+	}
+
+	exit (255);
+}
+
+static void sigint_handler(int UNUSED_PAR(sig))
+{
+	bsddialog_end();
+
+	exit(255);
+}
+
+static void start_bsddialog_mode(void)
+{
+	if (in_bsddialog_mode)
+		return;
+
+	if (bsddialog_init() != BSDDIALOG_OK)
+		exit_error(bsddialog_geterror(), false);
+
+	in_bsddialog_mode = true;
+	signal(SIGINT, sigint_handler);
+}
+
+static void error_args(const char *dialog, int argc, char **argv)
+{
+	int i;
+
+	if (in_bsddialog_mode)
+		bsddialog_end();
+
+	printf("Error: %s unexpected argument%s:", dialog,
+	    argc > 1 ? "s" : "");
+	for (i = 0; i < argc; i++)
+		printf(" \"%s\"", argv[i]);
+	printf(".\n\n");
+	printf("See \'bsddialog --help\' or \'man 1 bsddialog\' ");
+	printf("for more information.\n");
+
+	exit (255);
+}
+
 static void usage(void)
 {
 	printf("usage: bsddialog --help\n");
 	printf("       bsddialog --version\n");
-	printf("       bsddialog [--<common-opts>] --<dialog> <text> <rows> "
-	    "<cols> [--<dialog-opts>]\n");
+	printf("       bsddialog [--<opt>] --<dialog> <text> <rows> <cols> "
+	    "[<arg>]\n");
+	printf("       bsddialog --<dialog1> ... [--and-dialog --<dialog2> "
+	    "...] ...\n");
 	printf("\n");
 
-	printf("Common Options:\n");
-	printf("--ascii-lines, --backtitle <backtitle>, --begin-x <x>, "
-	    "--begin-y <y>, --bikeshed, --cancel-label <label>, --clear, "
-	    "--colors, --columns-per-row <columns>, --cr-wrap, "
-	    "--date-format <format>, --default-button <label>, "
-	    "--default-item <name>, --default-no, --disable-esc, "
-	    "--esc-return-cancel, --exit-label <label>, --extra-button, "
-	    "--extra-label <label>, --generic-button1 <label>, "
-	    "--generic-button2 <label>, --help, --help-button, "
-	    "--help-label <label>, --help-status, --help-tags, --hfile <file>, "
-	    "--hline <string>, --hmsg <string>, --ignore, --insecure, "
-	    "--item-depth, --item-help, --item-prefix, --load-theme <file>, "
-	    "--max-input <size>, --no-cancel, --no-collapse, --no-items, "
-	    "--no-label <label>, --no-lines, --no-nl-expand, --no-ok, "
-	    "--no-shadow, --no-tags, --ok-label <label>, --output-fd <fd>, "
-	    "--output-separator <sep>, --print-maxsize, --print-size, "
-	    "--print-version, --quoted, --save-theme <file>, "
-	    "--separate-output, --separator <sep>, --shadow, --single-quoted, "
-	    "--sleep <secs>, --stderr, --stdout, --tab-len <spaces>, "
-	    "--switch-buttons, --theme <blackwhite|bsddialog|flat|dialog>, "
-	    "--time-format <format>, --title <title>, --trim, --version, "
-	    "--yes-label <label>.\n");
+	printf("Options:\n");
+	printf(" --alternate-screen, --ascii-lines, --backtitle <backtitle>,"
+	    " --begin-x <x>,\n --begin-y <y>, --bikeshed, --calendar,"
+	    " --cancel-label <label>, --clear-dialog,\n --clear-screen,"
+	    " --colors, --columns-per-row <columns>, --cr-wrap,\n"
+	    " --date-format <format>, --default-button <label>,"
+	    " --default-item <name>,\n --default-no, --disable-esc,"
+	    " --esc-return-cancel, --exit-label <label>,\n --extra-button,"
+	    " --extra-label <label>, --generic-button1 <label>,\n"
+	    " --generic-button2 <label>, --help-button, --help-label <label>,\n"
+	    " --help-print-name, --help-status, --hfile <file>,"
+	    " --hline <string>,\n --hmsg <string>, --ignore, --insecure,"
+	    " --item-bottom-desc, --item-depth,\n --item-prefix,"
+	    " --load-theme <file>, --max-input <size>, --no-cancel,\n"
+	    " --no-descriptions, --no-label <label>, --no-lines, --no-names,"
+	    " --no-ok,\n --no-shadow, --normal-screen, --ok-label <label>,"
+	    " --output-fd <fd>,\n --output-separator <sep>, --print-maxsize,"
+	    " --print-size, --print-version,\n --quoted, --save-theme <file>,"
+	    " --separate-output, --separator <sep>, --shadow,\n"
+	    " --single-quoted, --sleep <secs>, --stderr, --stdout,"
+	    " --tab-escape,\n --tab-len <spaces>, --text-unchanged,"
+	    " --switch-buttons,\n --theme <blackwhite|bsddialog|flat|dialog>,"
+	    " --time-format <format>,\n --title <title>,"
+	    " --yes-label <label>.\n");
 	printf("\n");
 
 	printf("Dialogs:\n");
-	printf("--checklist <text> <rows> <cols> <menurows> [<name> <desc> "
+	printf(" --calendar <text> <rows> <cols> [<dd> <mm> <yy>]\n");
+	printf(" --checklist <text> <rows> <cols> <menurows> [<name> <desc> "
 	    "<on|off>] ...\n");
-	printf("--datebox <text> <rows> <cols> [<yy> <mm> <dd>]\n");
-	printf("--form <text> <rows> <cols> <formrows> [<label> <ylabel> "
+	printf(" --datebox <text> <rows> <cols> [<dd> <mm> <yy>]\n");
+	printf(" --form <text> <rows> <cols> <formrows> [<label> <ylabel> "
 	    "<xlabel> <init> <yfield> <xfield> <fieldlen> <maxletters>] "
 	    "...\n");
-	printf("--gauge <text> <rows> <cols> [<perc>]\n");
-	printf("--infobox <text> <rows> <cols>\n");
-	printf("--inputbox <text> <rows> <cols> [init]\n");
-	printf("--menu <text> <rows> <cols> <menurows> [<name> <desc>] ...\n");
-	printf("--mixedform <text> <rows> <cols> <formrows> [<label> <ylabel> "
+	printf(" --gauge <text> <rows> <cols> [<perc>]\n");
+	printf(" --infobox <text> <rows> <cols>\n");
+	printf(" --inputbox <text> <rows> <cols> [init]\n");
+	printf(" --menu <text> <rows> <cols> <menurows> [<name> <desc>] ...\n");
+	printf(" --mixedform <text> <rows> <cols> <formrows> [<label> <ylabel> "
 	    "<xlabel> <init> <yfield> <xfield> <fieldlen> <maxletters> "
 	    "<0|1|2>] ...\n");
-	printf("--mixedgauge <text> <rows> <cols> <mainperc> [<minilabel> "
+	printf(" --mixedgauge <text> <rows> <cols> <mainperc> [<minilabel> "
 	    "<miniperc>] ...\n");
-	printf("--msgbox <text> <rows> <cols>\n");
-	printf("--passwordbox <text> <rows> <cols> [init]\n");
-	printf("--passwordform <text> <rows> <cols> <formrows> [<label> "
+	printf(" --msgbox <text> <rows> <cols>\n");
+	printf(" --passwordbox <text> <rows> <cols> [init]\n");
+	printf(" --passwordform <text> <rows> <cols> <formrows> [<label> "
 	    "<ylabel> <xlabel> <init> <yfield> <xfield> <fieldlen> "
 	    "<maxletters>] ...\n");
-	printf("--pause <text> <rows> <cols> <secs>\n");
-	printf("--radiolist <text> <rows> <cols> <menurows> [<name> <desc> "
+	printf(" --pause <text> <rows> <cols> <secs>\n");
+	printf(" --radiolist <text> <rows> <cols> <menurows> [<name> <desc> "
 	    "<on|off>] ...\n");
-	printf("--rangebox <text> <rows> <cols> <min> <max> [<init>]\n");
-	printf("--textbox <file> <rows> <cols>\n");
-	printf("--timebox <text> <rows> <cols> [<hh> <mm> <ss>]\n");
-	printf("--treeview <text> <rows> <cols> <menurows> [<depth> <name> "
+	printf(" --rangebox <text> <rows> <cols> <min> <max> [<init>]\n");
+	printf(" --textbox <file> <rows> <cols>\n");
+	printf(" --timebox <text> <rows> <cols> [<hh> <mm> <ss>]\n");
+	printf(" --treeview <text> <rows> <cols> <menurows> [<depth> <name> "
 	    "<desc> <on|off>] ...\n");
-	printf("--yesno <text> <rows> <cols>\n");
+	printf(" --yesno <text> <rows> <cols>\n");
 	printf("\n");
 
 	printf("See 'man 1 bsddialog' for more information.\n");
 }
 
-int main(int argc, char *argv[argc])
+static int parseargs(int argc, char **argv, struct bsddialog_conf *conf)
 {
-	bool cr_wrap_opt, no_collapse_opt, no_nl_expand_opt, trim_opt;
-	bool esc_return_cancel_opt, ignore_opt, print_maxsize_opt;
-	bool textfromfile;
-	int input, rows, cols, retval, getH, getW;
-	int (*dialogbuilder)(BUILDER_ARGS) = NULL;
-	enum bsddialog_default_theme theme_opt;
-	char *text, *backtitle_opt, *loadthemefile, *savethemefile;
-	char errorbuilder[1024];
+	int arg, parsed, i;
 	struct winsize ws;
-	struct bsddialog_conf conf;
 
-	setlocale(LC_ALL, "");
+	bsddialog_initconf(conf);
+	conf->key.enable_esc = true;
+	conf->menu.on_without_ok = true;
+	conf->form.value_without_ok = true;
+	conf->button.always_active = true;
 
-	bsddialog_initconf(&conf);
-	conf.key.enable_esc = true;
-	conf.menu.on_without_ok = true;
-	conf.form.value_without_ok = true;
-	conf.button.always_active = true;
+	dialogbuilder = NULL;
 
 	backtitle_opt = NULL;
-	theme_opt = BSDDIALOG_THEME_FLAT;
+	theme_opt = -1;
 	output_fd_opt = STDERR_FILENO;
-	print_maxsize_opt = false;
 	ignore_opt = false;
-	cr_wrap_opt = no_collapse_opt = no_nl_expand_opt = trim_opt = false;
+	cr_wrap_opt = false;
+	tab_escape_opt = false;
+	text_unchanged_opt = false;
 	esc_return_cancel_opt = false;
-	textfromfile = false;
 	bikeshed_opt = false;
-	errorbuilder[0] = '\0';
 	savethemefile = NULL;
 	loadthemefile = NULL;
-
-	item_output_sepnl_opt = item_singlequote_opt = false;
-	item_prefix_opt = item_bottomdesc_opt = item_depth_opt = false;
-	list_items_on_opt = item_tag_help_opt = false;
+	clear_screen_opt = false;
+	screen_mode_opt = NULL;
+
+	item_output_sepnl_opt = false;
+	item_singlequote_opt = false;
+	item_prefix_opt = false;
+	item_bottomdesc_opt = false;
+	item_depth_opt = false;
+	list_items_on_opt = false;
+	item_help_print_name_opt = false;
 	item_always_quote_opt = false;
 	item_output_sep_opt = NULL;
 	item_default_opt = NULL;
 
-	date_fmt_opt = time_fmt_opt = NULL;
-
-	max_input_form_opt = 0;
-
-	/* options descriptor */
-	struct option longopts[] = {
-		/* common options */
-		{"ascii-lines",      no_argument,       NULL, ASCII_LINES},
-		{"backtitle",        required_argument, NULL, BACKTITLE},
-		{"begin-x",          required_argument, NULL, BEGIN_X},
-		{"begin-y",          required_argument, NULL, BEGIN_Y},
-		{"bikeshed",         no_argument,       NULL, BIKESHED},
-		{"cancel-label",     required_argument, NULL, CANCEL_LABEL},
-		{"clear",            no_argument,       NULL, CLEAR},
-		{"colors",           no_argument,       NULL, COLORS},
-		{"cr-wrap",          no_argument,       NULL, CR_WRAP},
-		{"date-format",      required_argument, NULL, DATE_FORMAT},
-		{"defaultno",        no_argument,       NULL, DEFAULT_NO},
-		{"default-button",   required_argument, NULL, DEFAULT_BUTTON},
-		{"default-item",     required_argument, NULL, DEFAULT_ITEM},
-		{"default-no",       no_argument,       NULL, DEFAULT_NO},
-		{"disable-esc",      no_argument,       NULL, DISABLE_ESC},
-		{"esc-return-cancel",no_argument,       NULL, ESC_RETURNCANCEL},
-		{"exit-label",       required_argument, NULL, EXIT_LABEL},
-		{"extra-button",     no_argument,       NULL, EXTRA_BUTTON},
-		{"extra-label",      required_argument, NULL, EXTRA_LABEL},
-		{"generic-button1",  required_argument, NULL, GENERIC_BUTTON1},
-		{"generic-button2",  required_argument, NULL, GENERIC_BUTTON2},
-		{"help",             no_argument,       NULL, HELP},
-		{"help-button",      no_argument,       NULL, HELP_BUTTON},
-		{"help-label",       required_argument, NULL, HELP_LABEL},
-		{"help-status",      no_argument,       NULL, HELP_STATUS},
-		{"help-tags",        no_argument,       NULL, HELP_TAGS},
-		{"hfile",            required_argument, NULL, HFILE},
-		{"hline",            required_argument, NULL, HLINE},
-		{"hmsg",             required_argument, NULL, HMSG},
-		{"ignore",           no_argument,       NULL, IGNORE},
-		{"insecure",         no_argument,       NULL, INSECURE},
-		{"item-depth",       no_argument,       NULL, ITEM_DEPTH},
-		{"item-help",        no_argument,       NULL, ITEM_HELP},
-		{"item-prefix",      no_argument,       NULL, ITEM_PREFIX},
-		{"load-theme",       required_argument, NULL, LOAD_THEME},
-		{"max-input",        required_argument, NULL, MAX_INPUT},
-		{"no-cancel",        no_argument,       NULL, NO_CANCEL},
-		{"nocancel",         no_argument,       NULL, NO_CANCEL},
-		{"no-collapse",      no_argument,       NULL, NO_COLLAPSE},
-		{"no-items",         no_argument,       NULL, NO_ITEMS},
-		{"no-label",         required_argument, NULL, CANCEL_LABEL},
-		{"no-lines",         no_argument,       NULL, NO_LINES},
-		{"no-nl-expand",     no_argument,       NULL, NO_NL_EXPAND},
-		{"no-ok",            no_argument,       NULL, NO_OK},
-		{"nook ",            no_argument,       NULL, NO_OK},
-		{"no-shadow",        no_argument,       NULL, NO_SHADOW},
-		{"no-tags",          no_argument,       NULL, NO_TAGS},
-		{"ok-label",         required_argument, NULL, OK_LABEL},
-		{"output-fd",        required_argument, NULL, OUTPUT_FD},
-		{"output-separator", required_argument, NULL, OUTPUT_SEPARATOR},
-		{"print-maxsize",    no_argument,       NULL, PRINT_MAXSIZE},
-		{"print-size",       no_argument,       NULL, PRINT_SIZE},
-		{"print-version",    no_argument,       NULL, PRINT_VERSION},
-		{"quoted",           no_argument,       NULL, QUOTED},
-		{"columns-per-row",  required_argument, NULL, COLUMNS_PER_ROW},
-		{"save-theme",       required_argument, NULL, SAVE_THEME},
-		{"separate-output",  no_argument,       NULL, SEPARATE_OUTPUT},
-		{"separator",        required_argument, NULL, OUTPUT_SEPARATOR},
-		{"shadow",           no_argument,       NULL, SHADOW},
-		{"single-quoted",    no_argument,       NULL, SINGLE_QUOTED},
-		{"sleep",            required_argument, NULL, SLEEP},
-		{"stderr",           no_argument,       NULL, STDERR},
-		{"stdout",           no_argument,       NULL, STDOUT},
-		{"switch-buttons",   no_argument,       NULL, SWITCH_BUTTONS},
-		{"tab-len",          required_argument, NULL, TAB_LEN},
-		{"theme",            required_argument, NULL, THEME},
-		{"time-format",      required_argument, NULL, TIME_FORMAT},
-		{"title",            required_argument, NULL, TITLE},
-		{"trim",             no_argument,       NULL, TRIM},
-		{"version",          no_argument,       NULL, VERSION},
-		{"yes-label",        required_argument, NULL, OK_LABEL},
-		/* Dialogs */
-		{"checklist",    no_argument, NULL, CHECKLIST},
-		{"datebox",      no_argument, NULL, DATEBOX},
-		{"form",         no_argument, NULL, FORM},
-		{"gauge",        no_argument, NULL, GAUGE},
-		{"infobox",      no_argument, NULL, INFOBOX},
-		{"inputbox",     no_argument, NULL, INPUTBOX},
-		{"menu",         no_argument, NULL, MENU},
-		{"mixedform",    no_argument, NULL, MIXEDFORM},
-		{"mixedgauge",   no_argument, NULL, MIXEDGAUGE},
-		{"msgbox",       no_argument, NULL, MSGBOX},
-		{"passwordbox",  no_argument, NULL, PASSWORDBOX},
-		{"passwordform", no_argument, NULL, PASSWORDFORM},
-		{"pause",        no_argument, NULL, PAUSE},
-		{"radiolist",    no_argument, NULL, RADIOLIST},
-		{"rangebox",     no_argument, NULL, RANGEBOX},
-		{"textbox",      no_argument, NULL, TEXTBOX},
-		{"timebox",      no_argument, NULL, TIMEBOX},
-		{"treeview",     no_argument, NULL, TREEVIEW},
-		{"yesno",        no_argument, NULL, YESNO},
-		/* END */
-		{ NULL, 0, NULL, 0}
-	};
-
-	while ((input = getopt_long(argc, argv, "", longopts, NULL)) != -1) {
-		switch (input) {
-		/* Common options */
+	date_fmt_opt = NULL;
+	time_fmt_opt = NULL;
+
+	max_input_form_opt = 2048;
+
+	for (i = 0; i < argc; i++) {
+		if (strcmp(argv[i], "--and-dialog") == 0 ||
+		    strcmp(argv[i], "--and-widget") == 0) {
+			argc = i + 1;
+			break;
+		}
+	}
+	parsed = argc;
+	while ((arg = getopt_long(argc, argv, "", longopts, NULL)) != -1) {
+		switch (arg) {
+		/* Options */
+		case ALTERNATE_SCREEN:
+			screen_mode_opt = "smcup";
+			break;
+		case AND_DIALOG:
+			if (dialogbuilder == NULL)
+				exit_error("--and-dialog without previous "
+				    "--<dialog>", true);
+			break;
 		case ASCII_LINES:
-			conf.ascii_lines = true;
+			conf->ascii_lines = true;
 			break;
 		case BACKTITLE:
 			backtitle_opt = optarg;
-			if (conf.y == BSDDIALOG_CENTER)
-				conf.auto_topmargin = 2;
+			if (conf->y == BSDDIALOG_CENTER)
+				conf->auto_topmargin = 2;
 			break;
 		case BEGIN_X:
-			conf.x = (int)strtol(optarg, NULL, 10);
-			if (conf.x < BSDDIALOG_CENTER) {
-				printf("Error: --begin-x %d < %d",
-				    conf.x, BSDDIALOG_CENTER);
-				return (255);
-			}
+			conf->x = (int)strtol(optarg, NULL, 10);
+			if (conf->x < BSDDIALOG_CENTER)
+				exit_error("--begin-x < -1", false);
 			break;
 		case BEGIN_Y:
-			conf.y = (int)strtol(optarg, NULL, 10);
-			if (conf.y < BSDDIALOG_CENTER) {
-				printf("Error: --begin-y %d < %d",
-				    conf.y, BSDDIALOG_CENTER);
-				return (255);
-			}
-			conf.auto_topmargin = 0;
+			conf->y = (int)strtol(optarg, NULL, 10);
+			if (conf->y < BSDDIALOG_CENTER)
+				exit_error("--begin-y < -1", false);
+			conf->auto_topmargin = 0;
 			break;
 		case BIKESHED:
 			bikeshed_opt = true;
 			break;
 		case CANCEL_LABEL:
-			conf.button.cancel_label = optarg;
+			conf->button.cancel_label = optarg;
 			break;
-		case CLEAR:
-			conf.clear = true;
+		case CLEAR_DIALOG:
+			conf->clear = true;
+			break;
+		case CLEAR_SCREEN:
+			mandatory_dialog = false;
+			clear_screen_opt = true;
 			break;
 		case COLORS:
-			conf.text.highlight = true;
+			conf->text.highlight = true;
 			break;
 		case COLUMNS_PER_ROW:
-			conf.text.cols_per_row =
+			conf->text.cols_per_row =
 			    (u_int)strtoul(optarg, NULL, 10);
 			break;
 		case CR_WRAP:
 			cr_wrap_opt = true;
 			break;
 		case DATE_FORMAT:
 			date_fmt_opt = optarg;
 			break;
 		case DEFAULT_BUTTON:
-			conf.button.default_label = optarg;
+			conf->button.default_label = optarg;
 			break;
 		case DEFAULT_ITEM:
 			item_default_opt = optarg;
 			break;
 		case DEFAULT_NO:
-			conf.button.default_cancel = true;
+			conf->button.default_cancel = true;
 			break;
 		case DISABLE_ESC:
-			conf.key.enable_esc = false;
+			conf->key.enable_esc = false;
 			break;
 		case ESC_RETURNCANCEL:
 			esc_return_cancel_opt = true;
 			break;
 		case EXIT_LABEL:
-			conf.button.ok_label = optarg;
+			conf->button.ok_label = optarg;
 			break;
 		case EXTRA_BUTTON:
-			conf.button.with_extra = true;
+			conf->button.with_extra = true;
 			break;
 		case EXTRA_LABEL:
-			conf.button.extra_label = optarg;
+			conf->button.extra_label = optarg;
 			break;
 		case GENERIC_BUTTON1:
-			conf.button.generic1_label = optarg;
+			conf->button.generic1_label = optarg;
 			break;
 		case GENERIC_BUTTON2:
-			conf.button.generic2_label = optarg;
+			conf->button.generic2_label = optarg;
 			break;
-		case HELP:
-			usage();
-			return (BSDDIALOG_OK);
 		case HELP_BUTTON:
-			conf.button.with_help = true;
+			conf->button.with_help = true;
 			break;
 		case HELP_LABEL:
-			conf.button.help_label = optarg;
+			conf->button.help_label = optarg;
+			break;
+		case HELP_PRINT_NAME:
+			item_help_print_name_opt = true;
 			break;
 		case HELP_STATUS:
 			list_items_on_opt = true;
 			break;
-		case HELP_TAGS:
-			item_tag_help_opt = true;
-			break;
 		case HFILE:
-			conf.key.f1_file = optarg;
+			conf->key.f1_file = optarg;
 			break;
 		case HLINE:
 			if (optarg[0] != '\0')
-				conf.bottomtitle = optarg;
+				conf->bottomtitle = optarg;
 			break;
 		case HMSG:
-			conf.key.f1_message = optarg;
+			conf->key.f1_message = optarg;
 			break;
 		case IGNORE:
 			ignore_opt = true;
 			break;
 		case INSECURE:
-			conf.form.securech = '*';
+			conf->form.securech = '*';
+			break;
+		case ITEM_BOTTOM_DESC:
+			item_bottomdesc_opt = true;
 			break;
 		case ITEM_DEPTH:
 			item_depth_opt = true;
 			break;
-		case ITEM_HELP:
-			item_bottomdesc_opt = true;
-			break;
 		case ITEM_PREFIX:
 			item_prefix_opt = true;
 			break;
 		case LOAD_THEME:
 			loadthemefile = optarg;
 			break;
 		case MAX_INPUT:
 			max_input_form_opt = (u_int)strtoul(optarg, NULL, 10);
 			break;
-		case NO_ITEMS:
-			conf.menu.no_desc = true;
-			break;
 		case NO_CANCEL:
-			conf.button.without_cancel = true;
+			conf->button.without_cancel = true;
 			break;
-		case NO_COLLAPSE:
-			no_collapse_opt = true;
+		case NO_DESCRIPTIONS:
+			conf->menu.no_desc = true;
 			break;
 		case NO_LINES:
-			conf.no_lines = true;
+			conf->no_lines = true;
 			break;
-		case NO_NL_EXPAND:
-			no_nl_expand_opt = true;
+		case NO_NAMES:
+			conf->menu.no_name = true;
 			break;
 		case NO_OK:
-			conf.button.without_ok = true;
-			break;
-		case NO_TAGS:
-			conf.menu.no_name = true;
+			conf->button.without_ok = true;
 			break;
 		case NO_SHADOW:
-			conf.shadow = false;
+			conf->shadow = false;
+			break;
+		case NORMAL_SCREEN:
+			screen_mode_opt = "rmcup";
 			break;
 		case OK_LABEL:
-			conf.button.ok_label = optarg;
+			conf->button.ok_label = optarg;
 			break;
 		case OUTPUT_FD:
 			output_fd_opt = (int)strtol(optarg, NULL, 10);
 			break;
 		case OUTPUT_SEPARATOR:
 			item_output_sep_opt = optarg;
 			break;
 		case QUOTED:
 			item_always_quote_opt = true;
 			break;
 		case PRINT_MAXSIZE:
-			print_maxsize_opt = true;
+			mandatory_dialog = false;
+			ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws);
+			dprintf(output_fd_opt, "MaxSize: %d, %d\n",
+			    ws.ws_row, ws.ws_col);
 			break;
 		case PRINT_SIZE:
-			conf.get_height = &getH;
-			conf.get_width = &getW;
+			conf->get_height = &getH_opt;
+			conf->get_width = &getW_opt;
 			break;
 		case PRINT_VERSION:
-			printf("bsddialog version %s\n", BSDDIALOG_VERSION);
+			mandatory_dialog = false;
+			dprintf(output_fd_opt, "Version: %s\n",
+			    LIBBSDDIALOG_VERSION);
 			break;
 		case SAVE_THEME:
+			mandatory_dialog = false;
 			savethemefile = optarg;
 			break;
 		case SEPARATE_OUTPUT:
 			item_output_sepnl_opt = true;
 			break;
 		case SHADOW:
-			conf.shadow = true;
+			conf->shadow = true;
 			break;
 		case SINGLE_QUOTED:
 			item_singlequote_opt = true;
 			break;
 		case SLEEP:
-			conf.sleep = (u_int)strtoul(optarg, NULL, 10);
+			conf->sleep = (u_int)strtoul(optarg, NULL, 10);
 			break;
 		case STDERR:
 			output_fd_opt = STDERR_FILENO;
 			break;
 		case STDOUT:
 			output_fd_opt = STDOUT_FILENO;
 			break;
 		case SWITCH_BUTTONS:
-			conf.button.always_active = false;
+			conf->button.always_active = false;
+			break;
+		case TAB_ESCAPE:
+			tab_escape_opt = true;
 			break;
 		case TAB_LEN:
-			conf.text.tablen = (u_int)strtoul(optarg, NULL, 10);
+			conf->text.tablen = (u_int)strtoul(optarg, NULL, 10);
+			break;
+		case TEXT_UNCHANGED:
+			text_unchanged_opt = true;
 			break;
 		case THEME:
 			if (strcasecmp(optarg, "bsddialog") == 0)
 				theme_opt = BSDDIALOG_THEME_BSDDIALOG;
 			else if (strcasecmp(optarg, "blackwhite") == 0)
 				theme_opt = BSDDIALOG_THEME_BLACKWHITE;
 			else if (strcasecmp(optarg, "flat") == 0)
 				theme_opt = BSDDIALOG_THEME_FLAT;
 			else if (strcasecmp(optarg, "dialog") == 0)
 				theme_opt = BSDDIALOG_THEME_DIALOG;
-			else {
-				printf("Error: unknown theme\n");
-				return (255);
-			}
+			else
+				exit_error("--theme: <unknown> theme", false);
 			break;
 		case TIME_FORMAT:
 			time_fmt_opt = optarg;
 			break;
 		case TITLE:
-			conf.title = optarg;
-			break;
-		case TRIM:
-			trim_opt = true;
+			conf->title = optarg;
 			break;
-		case VERSION:
-			printf("bsddialog %s (libbsddialog %s)\n",
-			    BSDDIALOG_VERSION, LIBBSDDIALOG_VERSION);
-			return (BSDDIALOG_OK);
 		/* Dialogs */
+		case CALENDAR:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --calendar", true);
+			dialogbuilder = calendar_builder;
+			break;
 		case CHECKLIST:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --checklist", true);
 			dialogbuilder = checklist_builder;
-			conf.auto_downmargin = 1;
+			conf->auto_downmargin = 1;
 			break;
 		case DATEBOX:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --datebox", true);
 			dialogbuilder = datebox_builder;
 			break;
 		case FORM:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --form", true);
 			dialogbuilder = form_builder;
-			conf.auto_downmargin = 1;
+			conf->auto_downmargin = 1;
 			break;
 		case GAUGE:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --gauge", true);
 			dialogbuilder = gauge_builder;
 			break;
 		case INFOBOX:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --infobox", true);
 			dialogbuilder = infobox_builder;
 			break;
 		case INPUTBOX:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --inputbox", true);
 			dialogbuilder = inputbox_builder;
-			conf.auto_downmargin = 1;
+			conf->auto_downmargin = 1;
 			break;
 		case MENU:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --menu", true);
 			dialogbuilder = menu_builder;
-			conf.auto_downmargin = 1;
+			conf->auto_downmargin = 1;
 			break;
 		case MIXEDFORM:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --mixedform", true);
 			dialogbuilder = mixedform_builder;
-			conf.auto_downmargin = 1;
+			conf->auto_downmargin = 1;
 			break;
 		case MIXEDGAUGE:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --mixedgauge", true);
 			dialogbuilder = mixedgauge_builder;
 			break;
 		case MSGBOX:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --msgbox", true);
 			dialogbuilder = msgbox_builder;
 			break;
 		case PAUSE:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --pause", true);
 			dialogbuilder = pause_builder;
 			break;
 		case PASSWORDBOX:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --passwordbox", true);
 			dialogbuilder = passwordbox_builder;
-			conf.auto_downmargin = 1;
+			conf->auto_downmargin = 1;
 			break;
 		case PASSWORDFORM:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --passwordform", true);
 			dialogbuilder = passwordform_builder;
-			conf.auto_downmargin = 1;
+			conf->auto_downmargin = 1;
 			break;
 		case RADIOLIST:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --radiolist", true);
 			dialogbuilder = radiolist_builder;
-			conf.auto_downmargin = 1;
+			conf->auto_downmargin = 1;
 			break;
 		case RANGEBOX:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --rangebox", true);
 			dialogbuilder = rangebox_builder;
 			break;
 		case TEXTBOX:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --textbox", true);
 			dialogbuilder = textbox_builder;
-			textfromfile = true;
 			break;
 		case TIMEBOX:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --timebox", true);
 			dialogbuilder = timebox_builder;
 			break;
 		case TREEVIEW:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --treeview", true);
 			dialogbuilder = treeview_builder;
-			conf.auto_downmargin = 1;
+			conf->auto_downmargin = 1;
 			break;
 		case YESNO:
+			if (dialogbuilder != NULL)
+				exit_error("unexpected --yesno", true);
 			dialogbuilder = yesno_builder;
 			break;
-		/* Error */
-		default:
+		default: /* Error */
 			if (ignore_opt == true)
 				break;
-			usage();
-			return (255);
+			exit_error("--ignore to continue", true);
 		}
 	}
-	argc -= optind;
-	argv += optind;
-
-	if (print_maxsize_opt) {
-		ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws);
-		dprintf(output_fd_opt, "Screen size: (%d - %d)\n",
-		    ws.ws_row, ws.ws_col);
-		if (argc == 0)
-			return (BSDDIALOG_OK);
-	}
 
-	if (argc < 3) {
-		usage();
-		return (255);
-	}
-	if (textfromfile) /* textbox */
-		text = argv[0];
-	else {
-		if ((text = malloc(strlen(argv[0]) + 1)) == NULL) {
-			printf("Error: cannot allocate memory for text\n");
-			return (255);
-		}
-		custom_text(cr_wrap_opt, no_collapse_opt, no_nl_expand_opt,
-		    trim_opt, argv[0], text);
-	}
-	rows = (int)strtol(argv[1], NULL, 10);
-	cols = (int)strtol(argv[2], NULL, 10);
-	argc -= 3;
-	argv += 3;
-
-	/* bsddialog terminal mode */
-	if (bsddialog_init() != 0) {
-		printf("Error: %s\n", bsddialog_geterror());
-		return (255);
-	}
+	return (parsed);
+}
 
-	signal(SIGINT, sigint_handler);
+int main(int argc, char *argv[argc])
+{
+	int i, rows, cols, retval, parsed, nargc, firstoptind;
+	char *text, **nargv, *pn;
+	struct bsddialog_conf conf;
 
-	if (theme_opt != BSDDIALOG_THEME_FLAT)
-		if (bsddialog_set_default_theme(theme_opt) != BSDDIALOG_OK)
-			errorexit(NULL);
-	if (loadthemefile != NULL)
-		if (loadtheme(loadthemefile, errorbuilder) != BSDDIALOG_OK)
-			errorexit(errorbuilder);
-	if (bikeshed_opt)
-		if (bikeshed(&conf, errorbuilder) != BSDDIALOG_OK)
-			errorexit(errorbuilder);
-
-	if (backtitle_opt != NULL)
-		if( bsddialog_backtitle(&conf, backtitle_opt))
-			errorexit(NULL);
-
-	if (dialogbuilder != NULL) {
-		retval = dialogbuilder(&conf, text, rows, cols, argc, argv,
-		    errorbuilder);
-		if (retval == BSDDIALOG_ERROR)
-			errorexit(errorbuilder);
-	} else
-		retval = BSDDIALOG_OK;
+	setlocale(LC_ALL, "");
 
-	if (savethemefile != NULL)
-		if (savetheme(savethemefile, errorbuilder, BSDDIALOG_VERSION) !=
-		    BSDDIALOG_OK)
-			errorexit(errorbuilder);
+	in_bsddialog_mode = false;
+	mandatory_dialog = true;
+	firstoptind = optind;
+	pn = argv[0];
+	retval = BSDDIALOG_OK;
 
-	bsddialog_end();
-	/* end bsddialog terminal mode */
+	for (i = 0; i < argc; i++) {
+		if (strcmp(argv[i], "--version") == 0) {
+			printf("Version: %s\n", LIBBSDDIALOG_VERSION);
+			return (BSDDIALOG_OK);
+		}
+		if (strcmp(argv[i], "--help") == 0) {
+			usage();
+			return (BSDDIALOG_OK);
+		}
+	}
 
-	if (textfromfile == false)
-		free(text);
+	while (true) {
+		parsed = parseargs(argc, argv, &conf);
+		nargc = argc - parsed;
+		nargv = argv + parsed;
+		argc = parsed - optind;
+		argv += optind;
 
-	if (conf.get_height != NULL && conf.get_width != NULL)
-		dprintf(output_fd_opt, "Dialog size: (%d - %d)\n",
-		    *conf.get_height, *conf.get_width);
+		if (mandatory_dialog && dialogbuilder == NULL)
+			exit_error("expected a --<dialog>", true);
 
-	if (retval == BSDDIALOG_ESC && esc_return_cancel_opt)
-		retval = BSDDIALOG_CANCEL;
+		if (dialogbuilder == NULL && argc > 0)
+			error_args("(no --<dialog>)", argc, argv);
 
-	return (retval);
-}
+		/* --print-maxsize or --print-version */
+		if (mandatory_dialog == false && savethemefile == NULL &&
+		    clear_screen_opt == false)
+			return (BSDDIALOG_OK);
 
-void sigint_handler(int sig)
-{
-	bsddialog_end();
+		/* --<dialog>, --save-theme or clear-screen */
+		if (dialogbuilder != NULL) {
+			if (argc < 3)
+				exit_error("expected <text> <rows> <cols>",
+				    true);
+			if ((text = strdup(argv[0])) == NULL)
+				exit_error("cannot allocate text", false);
+			if (dialogbuilder != textbox_builder)
+				custom_text(argv[0], text);
+			rows = (int)strtol(argv[1], NULL, 10);
+			cols = (int)strtol(argv[2], NULL, 10);
+			argc -= 3;
+			argv += 3;
+		}
 
-	exit(255);
-}
+		/* bsddialog terminal mode (first iteration) */
+		start_bsddialog_mode();
+
+		if (screen_mode_opt != NULL) {
+			screen_mode_opt = tigetstr(screen_mode_opt);
+			if (screen_mode_opt != NULL &&
+			    screen_mode_opt != (char*)-1) {
+				tputs(screen_mode_opt, 1, putchar);
+				fflush(stdout);
+				 /* only to refresh, useless in the library */
+				bsddialog_clearterminal();
+			}
+		}
 
-void errorexit(char *errbuf)
-{
-	bsddialog_end();
+		/* theme */
+		if (theme_opt >= 0)
+			bsddialog_set_default_theme(theme_opt);
+		if (loadthemefile != NULL)
+			loadtheme(loadthemefile);
+		if (bikeshed_opt)
+			bikeshed(&conf);
+		if (savethemefile != NULL)
+			savetheme(savethemefile, LIBBSDDIALOG_VERSION);
+
+		/* backtitle and dialog */
+		if (dialogbuilder == NULL)
+			break;
+		if (backtitle_opt != NULL)
+			if(bsddialog_backtitle(&conf, backtitle_opt))
+				exit_error(bsddialog_geterror(), false);
+		retval = dialogbuilder(&conf, text, rows, cols, argc, argv);
+		free(text);
+		if (retval == BSDDIALOG_ERROR)
+			exit_error(bsddialog_geterror(), false);
+		if (retval == BSDDIALOG_ESC && esc_return_cancel_opt)
+			retval = BSDDIALOG_CANCEL;
+		if (conf.get_height != NULL && conf.get_width != NULL)
+			dprintf(output_fd_opt, "DialogSize: %d, %d\n",
+			    *conf.get_height, *conf.get_width);
+		if (clear_screen_opt)
+			bsddialog_clearterminal();
+		clear_screen_opt = false;
+		/* --and-dialog ends loop with Cancel or ESC */
+		if (retval == BSDDIALOG_CANCEL || retval == BSDDIALOG_ESC)
+			break;
+		argc = nargc;
+		argv = nargv;
+		if (argc <= 0)
+			break;
+		/* prepare next parseargs() call */
+		argc++;
+		argv--;
+		argv[0] = pn;
+		optind = firstoptind;
+	}
 
-	if (errbuf != NULL && errbuf[0] != '\0')
-		printf("Error: %s\n", errbuf);
-	else
-		printf("Error: %s\n", bsddialog_geterror());
+	if (in_bsddialog_mode) {
+		/* --clear-screen can be a single option */
+		if (clear_screen_opt)
+			bsddialog_clearterminal();
+		bsddialog_end();
+	}
+	/* end bsddialog terminal mode */
 
-	exit(255);
+	return (retval);
 }
 
-void
-custom_text(bool cr_wrap, bool no_collapse, bool no_nl_expand, bool trim,
-    char *text, char *buf)
+void custom_text(char *text, char *buf)
 {
+	bool trim, crwrap;
 	int i, j;
 
+	if (strstr(text, "\\n") == NULL) {
+		/* "hasnl" mode */
+		trim = true;
+		crwrap = true;
+	} else {
+		trim = false;
+		crwrap = cr_wrap_opt;
+	}
+	if (text_unchanged_opt) {
+		trim = false;
+		crwrap = true;
+	}
+
 	i = j = 0;
 	while (text[i] != '\0') {
 		switch (text[i]) {
 		case '\\':
 			buf[j] = '\\';
 			switch (text[i+1]) {
-			case '\\':
-				i++;
-				break;
-			case 'n':
-				if (no_nl_expand) {
-					j++;
-					buf[j] = 'n';
-				} else
-					buf[j] = '\n';
+			case 'n': /* implicitly in "hasnl" mode */
+				buf[j] = '\n';
 				i++;
+				if (text[i+1] == '\n')
+					i++;
 				break;
 			case 't':
-				if (no_collapse) {
+				if (tab_escape_opt) {
+					buf[j] = '\t';
+				} else {
 					j++;
 					buf[j] = 't';
-				} else
-					buf[j] = '\t';
+				}
 				i++;
 				break;
 			}
 			break;
 		case '\n':
-			buf[j] = cr_wrap ? ' ' : '\n';
+			buf[j] = crwrap ? '\n' : ' ';
 			break;
 		case '\t':
-			buf[j] = no_collapse ? '\t' : ' ';
+			buf[j] = text_unchanged_opt ? '\t' : ' ';
 			break;
 		default:
 			buf[j] = text[i];
 		}
 		i++;
-		j += (buf[j] == ' ' && trim && j > 0 && buf[j-1] == ' ') ?
-		    0 : 1;
+		if (!trim || buf[j] != ' ' || j == 0 || buf[j-1] != ' ')
+			j++;
 	}
 	buf[j] = '\0';
 }
 
 /* Dialogs */
 int gauge_builder(BUILDER_ARGS)
 {
 	int output;
 	unsigned int perc;
 
-	if (argc > 0) {
-		perc = argc > 0 ? (u_int)strtoul(argv[0], NULL, 10) : 0;
+	perc = 0;
+	if (argc == 1) {
+		perc = (u_int)strtoul(argv[0], NULL, 10);
 		perc = perc > 100 ? 100 : perc;
+	} else if (argc > 1) {
+		error_args("--gauge", argc - 1, argv + 1);
 	}
-	else
-		perc = 0;
 
 	output = bsddialog_gauge(conf, text, rows, cols, perc, STDIN_FILENO,
 	    "XXX");
 
 	return (output);
 }
 
 int infobox_builder(BUILDER_ARGS)
 {
-	int output;
-
-	output = bsddialog_infobox(conf, text, rows, cols);
+	if (argc > 0)
+		error_args("--infobox", argc, argv);
 
-	return (output);
+	return (bsddialog_infobox(conf, text, rows, cols));
 }
 
 int mixedgauge_builder(BUILDER_ARGS)
 {
 	int output, *minipercs;
 	unsigned int i, mainperc, nminibars;
 	const char **minilabels;
 
-	if (argc < 1 || (((argc-1) % 2) != 0) ) {
-		strcpy(errbuf, "bad --mixedgauge arguments\n");
-		return (BSDDIALOG_ERROR);
-	}
+	if (argc < 1 || (((argc-1) % 2) != 0) )
+		exit_error("bad --mixedgauge arguments", true);
 
 	mainperc = (u_int)strtoul(argv[0], NULL, 10);
 	mainperc = mainperc > 100 ? 100 : mainperc;
 	argc--;
 	argv++;
 
 	nminibars  = argc / 2;
-	if ((minilabels = calloc(nminibars, sizeof(char*))) == NULL) {
-		strcpy(errbuf, "Cannot allocate memory for minilabels\n");
-		return BSDDIALOG_ERROR;
-	}
-	if ((minipercs = calloc(nminibars, sizeof(int))) == NULL) {
-		strcpy(errbuf, "Cannot allocate memory for minipercs\n");
-		return BSDDIALOG_ERROR;
-	}
+	if ((minilabels = calloc(nminibars, sizeof(char*))) == NULL)
+		exit_error("Cannot allocate memory for minilabels", false);
+	if ((minipercs = calloc(nminibars, sizeof(int))) == NULL)
+		exit_error("Cannot allocate memory for minipercs", false);
 
 	for (i = 0; i < nminibars; i++) {
 		minilabels[i] = argv[i * 2];
 		minipercs[i] = (int)strtol(argv[i * 2 + 1], NULL, 10);
 	}
 
 	output = bsddialog_mixedgauge(conf, text, rows, cols, mainperc,
 	    nminibars, minilabels, minipercs);
 
 	return (output);
 }
 
 int msgbox_builder(BUILDER_ARGS)
 {
-	int output;
+	if (argc > 0)
+		error_args("--msgbox", argc, argv);
 
-	output = bsddialog_msgbox(conf, text, rows, cols);
-
-	return (output);
+	return (bsddialog_msgbox(conf, text, rows, cols));
 }
 
 int pause_builder(BUILDER_ARGS)
 {
 	int output;
 	unsigned int secs;
 
-	if (argc < 1) {
-		strcpy(errbuf, "missing <seconds> for --pause\n");
-		return (BSDDIALOG_ERROR);
-	}
+	if (argc == 0)
+		exit_error("--pause missing <seconds>", true);
+	if (argc > 1)
+		error_args("--pause", argc - 1, argv + 1);
 
 	secs = (u_int)strtoul(argv[0], NULL, 10);
 	output = bsddialog_pause(conf, text, rows, cols, secs);
 
 	return (output);
 }
 
 int rangebox_builder(BUILDER_ARGS)
 {
 	int output, min, max, value;
 
-	if (argc < 2) {
-		strcpy(errbuf, "usage --rangebox <text> <rows> <cols> "
-		    "<min> <max> [<init>]\n");
-		return (BSDDIALOG_ERROR);
-	}
+	if (argc < 2)
+		exit_error("--rangebox missing <min> <max> [<init>]", true);
+	if (argc > 3)
+		error_args("--rangebox", argc - 3, argv + 3);
 
 	min = (int)strtol(argv[0], NULL, 10);
 	max = (int)strtol(argv[1], NULL, 10);
 
-	if (argc > 2) {
+	if (argc == 3) {
 		value = (int)strtol(argv[2], NULL, 10);
 		value = value < min ? min : value;
 		value = value > max ? max : value;
-	}
-	else
+	} else
 		value = min;
 
 	output = bsddialog_rangebox(conf, text, rows, cols, min, max, &value);
-
 	dprintf(output_fd_opt, "%d", value);
 
 	return (output);
 }
 
 int textbox_builder(BUILDER_ARGS)
 {
-	int output;
-
-	output = bsddialog_textbox(conf, text, rows, cols);
+	if (argc > 0)
+		error_args("--textbox", argc, argv);
 
-	return (output);
+	return (bsddialog_textbox(conf, text, rows, cols));
 }
 
 int yesno_builder(BUILDER_ARGS)
 {
-	int output;
+	if (argc > 0)
+		error_args("--yesno", argc, argv);
 
-	output = bsddialog_yesno(conf, text, rows, cols);
-
-	return (output);
+	return (bsddialog_yesno(conf, text, rows, cols));
 }
 
-/* DATE and TIME */
-int datebox_builder(BUILDER_ARGS)
+/* CALENDAR, DATE and TIME */
+static int date(BUILDER_ARGS, bool is_datebox)
 {
-	int output;
+	int ret;
 	unsigned int yy, mm, dd;
 	time_t cal;
 	struct tm *localtm;
 	char stringdate[1024];
+	const char *name;
 
+	name = is_datebox ? "--datebox" : "--calendar";
 	time(&cal);
 	localtm = localtime(&cal);
 	yy = localtm->tm_year + 1900;
 	mm = localtm->tm_mon + 1;
 	dd = localtm->tm_mday;
 
-	if (argc == 3) {
-		yy = (u_int)strtoul(argv[0], NULL, 10);
+	if (argc > 3) {
+		error_args(name, argc - 3, argv + 3);
+	} else if (argc == 3) {
+		dd = (u_int)strtoul(argv[0], NULL, 10);
 		mm = (u_int)strtoul(argv[1], NULL, 10);
-		dd = (u_int)strtoul(argv[2], NULL, 10);
+		yy = (u_int)strtoul(argv[2], NULL, 10);
+		if (yy < 1900)
+			yy = 1900;
+		/* max yy check is in lib */
 	}
 
-	output = bsddialog_datebox(conf, text, rows, cols, &yy, &mm, &dd);
-	if (output != BSDDIALOG_OK)
-		return (output);
+	if (is_datebox)
+		ret = bsddialog_datebox(conf, text, rows, cols, &yy, &mm, &dd);
+	else
+		ret = bsddialog_calendar(conf, text, rows, cols, &yy, &mm, &dd);
+	if (ret != BSDDIALOG_OK)
+		return (ret);
 
 	if (date_fmt_opt != NULL) {
 		time(&cal);
 		localtm = localtime(&cal);
 		localtm->tm_year = yy - 1900;
 		localtm->tm_mon = mm - 1;
 		localtm->tm_mday = dd;
 		strftime(stringdate, 1024, date_fmt_opt, localtm);
 		dprintf(output_fd_opt, "%s", stringdate);
 	} else if (bikeshed_opt && (dd % 2 == 0)) {
-		dprintf(output_fd_opt, "%u/%u/%u", yy, mm, dd);
+		dprintf(output_fd_opt, "%u/%u/%u", dd, mm, yy);
 	} else {
-		dprintf(output_fd_opt, "%u/%02u/%02u", yy, mm, dd);
+		dprintf(output_fd_opt, "%02u/%02u/%u", dd, mm, yy);
 	}
 
-	return (output);
+	return (ret);
+}
+
+int calendar_builder(BUILDER_ARGS)
+{
+	if (rows == 2) {
+		/*
+		 * (bsdconfig/share/dialog.subr:1352) f_dialog_calendar_size()
+		 * computes height 2 for `dialog --calendar' in
+		 * (bsdconfig/usermgmt/share/user_input.subr:517)
+		 * f_dialog_input_expire_password() and
+		 * (bsdconfig/usermgmt/share/user_input.subr:660)
+		 * f_dialog_input_expire_account().
+		 * Use height auto-sizing that is min height like dialog,
+		 * documented in bsddialog(1).
+		 */
+		rows = 0;
+	}
+
+	return (date(conf, text, rows, cols, argc, argv, false));
+}
+
+int datebox_builder(BUILDER_ARGS)
+{
+	return (date(conf, text, rows, cols, argc, argv, true));
 }
 
 int timebox_builder(BUILDER_ARGS)
 {
 	int output;
 	unsigned int hh, mm, ss;
 	time_t clock;
 	struct tm *localtm;
 	char stringtime[1024];
 
 	time(&clock);
 	localtm = localtime(&clock);
 	hh = localtm->tm_hour;
 	mm = localtm->tm_min;
 	ss = localtm->tm_sec;
 
-	if (argc == 3) {
+	if (argc > 3) {
+		error_args("--timebox", argc - 3, argv + 3);
+	} else if (argc == 3) {
 		hh = (u_int)strtoul(argv[0], NULL, 10);
 		mm = (u_int)strtoul(argv[1], NULL, 10);
 		ss = (u_int)strtoul(argv[2], NULL, 10);
 	}
 
 	output = bsddialog_timebox(conf, text, rows, cols, &hh, &mm, &ss);
 	if (output != BSDDIALOG_OK)
 		return (output);
 
 	if (time_fmt_opt != NULL) {
 		time(&clock);
 		localtm = localtime(&clock);
 		localtm->tm_hour = hh;
 		localtm->tm_min = mm;
 		localtm->tm_sec = ss;
 		strftime(stringtime, 1024, time_fmt_opt, localtm);
 		dprintf(output_fd_opt, "%s", stringtime);
 	} else if (bikeshed_opt && (ss % 2 == 0)) {
 		dprintf(output_fd_opt, "%u:%u:%u", hh, mm, ss);
 	} else {
 		dprintf(output_fd_opt, "%02u:%02u:%02u", hh, mm, ss);
 	}
 
 	return (output);
 }
 
 /* MENU */
-static int
-get_menu_items(char *errbuf, int argc, char **argv, bool setprefix,
-    bool setdepth, bool setname, bool setdesc, bool setstatus, bool sethelp,
+static void
+get_menu_items(int argc, char **argv, bool setprefix, bool setdepth,
+    bool setname, bool setdesc, bool setstatus, bool sethelp,
     unsigned int *nitems, struct bsddialog_menuitem **items, int *focusitem)
 {
 	unsigned int i, j, sizeitem;
 
 	*focusitem = -1;
 
 	sizeitem = 0;
 	sizeitem += setprefix ? 1 : 0;
 	sizeitem += setdepth  ? 1 : 0;
 	sizeitem += setname   ? 1 : 0;
 	sizeitem += setdesc   ? 1 : 0;
 	sizeitem += setstatus ? 1 : 0;
 	sizeitem += sethelp   ? 1 : 0;
-	if ((argc % sizeitem) != 0) {
-		strcpy(errbuf, "bad number of arguments for this menu\n");
-		return (BSDDIALOG_ERROR);
-	}
+	if ((argc % sizeitem) != 0)
+		exit_error("\"menu\" bad arguments items number", true);
+
 	*nitems = argc / sizeitem;
 
 	*items = calloc(*nitems, sizeof(struct bsddialog_menuitem));
-	if (items == NULL) {
-		strcpy(errbuf, "cannot allocate memory menu items\n");
-		return (BSDDIALOG_ERROR);
-	}
+	if (items == NULL)
+		exit_error("cannot allocate memory \"menu\" items", false);
 
 	j = 0;
 	for (i = 0; i < *nitems; i++) {
 		(*items)[i].prefix = setprefix ? argv[j++] : "";
 		(*items)[i].depth = setdepth ?
 		    (u_int)strtoul(argv[j++], NULL, 0) : 0;
 		(*items)[i].name = setname ? argv[j++] : "";
 		(*items)[i].desc = setdesc ? argv[j++] : "";
 		if (setstatus)
 			(*items)[i].on = strcmp(argv[j++], "on") == 0 ?
 			    true : false;
 		else
 			(*items)[i].on = false;
 		(*items)[i].bottomdesc = sethelp ? argv[j++] : "";
 
 		if (item_default_opt != NULL && *focusitem == -1)
 			if (strcmp((*items)[i].name, item_default_opt) == 0)
 				*focusitem = i;
 	}
-
-	return (BSDDIALOG_OK);
 }
 
 static void
 print_menu_items(int output, int nitems, struct bsddialog_menuitem *items,
-    int focusitem)
+    int focusitem, bool ismenu)
 {
-	bool sep, toquote;
+	bool sep, sepfirst, seplast, toquote;
 	int i;
-	char *sepstr, quotech;
-	const char *focusname;
+	char quotech;
+	const char *focusname, *sepstr;
 
 	sep = false;
 	quotech = item_singlequote_opt ? '\'' : '"';
-	sepstr = item_output_sep_opt != NULL ? item_output_sep_opt : " ";
 
-	if (output != BSDDIALOG_OK && output != BSDDIALOG_ERROR &&
-	    focusitem >= 0) {
-		focusname = items[focusitem].name;
+	if (output == BSDDIALOG_ERROR || output == BSDDIALOG_CANCEL ||
+	    output == BSDDIALOG_ESC)
+		return;
 
-		if (output == BSDDIALOG_HELP) {
-			dprintf(output_fd_opt, "HELP ");
+	if (output == BSDDIALOG_HELP) {
+		dprintf(output_fd_opt, "HELP ");
 
-			if (item_bottomdesc_opt && item_tag_help_opt == false)
+		if (focusitem >= 0) {
+			focusname = items[focusitem].name;
+			if (item_bottomdesc_opt &&
+			    item_help_print_name_opt == false)
 				focusname = items[focusitem].bottomdesc;
-		}
-
-		toquote = item_always_quote_opt ||
-		    (item_output_sepnl_opt == false &&
-		     strchr(focusname, ' ') != NULL);
 
-		if (toquote)
-			dprintf(output_fd_opt, "%c", quotech);
-		dprintf(output_fd_opt, "%s", focusname);
-		if (toquote)
-			dprintf(output_fd_opt, "%c", quotech);
+			toquote = false;
+			if (strchr(focusname, ' ') != NULL) {
+				toquote = item_always_quote_opt;
+				if (ismenu == false &&
+				    item_output_sepnl_opt == false)
+					toquote = true;
+			}
+			if (toquote) {
+				dprintf(output_fd_opt, "%c%s%c",
+				    quotech, focusname, quotech);
+			} else
+				dprintf(output_fd_opt, "%s", focusname);
+		}
 
+		if (ismenu || list_items_on_opt == false)
+			return;
 		sep = true;
 	}
 
-	if (output != BSDDIALOG_OK &&
-	    !(output == BSDDIALOG_HELP && list_items_on_opt))
-		return;
+	sepfirst = false;
+	if ((sepstr = item_output_sep_opt) == NULL)
+		sepstr = item_output_sepnl_opt ? "\n" : " ";
+	else
+		sepfirst = true;
+
+	seplast = false;
+	if (item_output_sepnl_opt) {
+		sepfirst = false;
+		seplast = true;
+	}
 
 	for (i = 0; i < nitems; i++) {
 		if (items[i].on == false)
 			continue;
 
-		if (sep == true) {
+		if (sep || sepfirst)
 			dprintf(output_fd_opt, "%s", sepstr);
-			if (item_output_sepnl_opt)
-				dprintf(output_fd_opt, "\n");
-		}
-		sep = true;
+		sep = false;
 
-		toquote = item_always_quote_opt ||
-		    (item_output_sepnl_opt == false &&
-		     strchr(items[i].name, ' ') != NULL);
-
-		if (toquote)
-			dprintf(output_fd_opt, "%c", quotech);
-		dprintf(output_fd_opt, "%s", items[i].name);
+		toquote = false;
+		if (strchr(items[i].name, ' ') != NULL) {
+			toquote = item_always_quote_opt;
+			if (ismenu == false && item_output_sepnl_opt == false)
+				toquote = true;
+		}
 		if (toquote)
-			dprintf(output_fd_opt, "%c", quotech);
+			dprintf(output_fd_opt, "%c%s%c",
+			    quotech, items[i].name, quotech);
+		else
+			dprintf(output_fd_opt, "%s", items[i].name);
+
+		if (seplast)
+			dprintf(output_fd_opt, "%s", sepstr);
 	}
 }
 
 int checklist_builder(BUILDER_ARGS)
 {
 	int output, focusitem;
 	unsigned int menurows, nitems;
 	struct bsddialog_menuitem *items;
 
-	if (argc < 1) {
-		strcpy(errbuf, "<menurows> not provided");
-		return (BSDDIALOG_ERROR);
-	}
-
+	if (argc < 1)
+		exit_error("--checklist missing <menurows>", true);
 	menurows = (u_int)strtoul(argv[0], NULL, 10);
 
-	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_opt,
-	    item_depth_opt, true, true, true, item_bottomdesc_opt, &nitems,
-	    &items, &focusitem);
-	if (output != 0)
-		return (output);
+	get_menu_items(argc-1, argv+1, item_prefix_opt, item_depth_opt, true,
+	    true, true, item_bottomdesc_opt, &nitems, &items, &focusitem);
 
 	output = bsddialog_checklist(conf, text, rows, cols, menurows, nitems,
 	    items, &focusitem);
 
-	print_menu_items(output, nitems, items, focusitem);
+	print_menu_items(output, nitems, items, focusitem, false);
 
 	free(items);
 
 	return (output);
 }
 
 int menu_builder(BUILDER_ARGS)
 {
 	int output, focusitem;
 	unsigned int menurows, nitems;
 	struct bsddialog_menuitem *items;
 
-	if (argc < 1) {
-		strcpy(errbuf, "<menurows> not provided");
-		return (BSDDIALOG_ERROR);
-	}
-
+	if (argc < 1)
+		exit_error("--menu missing <menurows>", true);
 	menurows = (u_int)strtoul(argv[0], NULL, 10);
 
-	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_opt,
-	    item_depth_opt, true, true, false, item_bottomdesc_opt, &nitems,
-	    &items, &focusitem);
-	if (output != 0)
-		return (output);
+	get_menu_items(argc-1, argv+1, item_prefix_opt, item_depth_opt, true,
+	    true, false, item_bottomdesc_opt, &nitems, &items, &focusitem);
 
 	output = bsddialog_menu(conf, text, rows, cols, menurows, nitems,
 	    items, &focusitem);
 
-	print_menu_items(output, nitems, items, focusitem);
+	print_menu_items(output, nitems, items, focusitem, true);
 
 	free(items);
 
 	return (output);
 }
 
 int radiolist_builder(BUILDER_ARGS)
 {
 	int output, focusitem;
 	unsigned int menurows, nitems;
 	struct bsddialog_menuitem *items;
 
-	if (argc < 1) {
-		strcpy(errbuf, "<menurows> not provided");
-		return (BSDDIALOG_ERROR);
-	}
-
+	if (argc < 1)
+		exit_error("--radiolist missing <menurows>", true);
 	menurows = (u_int)strtoul(argv[0], NULL, 10);
 
-	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_opt,
-	    item_depth_opt, true, true, true, item_bottomdesc_opt, &nitems,
-	    &items, &focusitem);
-	if (output != 0)
-		return (output);
+	get_menu_items(argc-1, argv+1, item_prefix_opt, item_depth_opt, true,
+	    true, true, item_bottomdesc_opt, &nitems, &items, &focusitem);
 
 	output = bsddialog_radiolist(conf, text, rows, cols, menurows, nitems,
 	    items, &focusitem);
 
-	print_menu_items(output, nitems, items, focusitem);
+	print_menu_items(output, nitems, items, focusitem, false);
 
 	free(items);
 
 	return (output);
 }
 
 int treeview_builder(BUILDER_ARGS)
 {
 	int output, focusitem;
 	unsigned int menurows, nitems;
 	struct bsddialog_menuitem *items;
 
-	if (argc < 1) {
-		strcpy(errbuf, "<menurows> not provided");
-		return (BSDDIALOG_ERROR);
-	}
-
+	if (argc < 1)
+		exit_error("--treeview missing <menurows>", true);
 	menurows = (u_int)strtoul(argv[0], NULL, 10);
 
-	output = get_menu_items(errbuf, argc-1, argv+1, item_prefix_opt,
-	    true, true, true, true, item_bottomdesc_opt, &nitems, &items,
-	    &focusitem);
-	if (output != 0)
-		return (output);
+	get_menu_items(argc-1, argv+1, item_prefix_opt, true, true, true, true,
+	    item_bottomdesc_opt, &nitems, &items, &focusitem);
 
 	conf->menu.no_name = true;
 	conf->menu.align_left = true;
 
 	output = bsddialog_radiolist(conf, text, rows, cols, menurows, nitems,
 	    items, &focusitem);
 
-	print_menu_items(output, nitems, items, focusitem);
+	print_menu_items(output, nitems, items, focusitem, false);
 
 	free(items);
 
 	return (output);
 }
 
 /* FORM */
-static int
-alloc_formitems(int nitems, struct bsddialog_formitem **items, char *errbuf)
-{
-	*items = calloc(nitems, sizeof(struct bsddialog_formitem));
-	if (items == NULL) {
-		strcpy(errbuf, "cannot allocate memory for form items\n");
-		return (BSDDIALOG_ERROR);
-	}
-
-	return (BSDDIALOG_OK);
-}
-
 static void
 print_form_items(int output, int nitems, struct bsddialog_formitem *items)
 {
 	int i;
 
 	if (output == BSDDIALOG_ERROR)
 		return;
 
 	for (i = 0; i < nitems; i++) {
 		dprintf(output_fd_opt, "%s\n", items[i].value);
 		free(items[i].value);
 	}
 }
 
 int form_builder(BUILDER_ARGS)
 {
 	int output, fieldlen, valuelen;
 	unsigned int i, j, flags, formheight, nitems, sizeitem;
 	struct bsddialog_formitem *items;
 
-	sizeitem = item_bottomdesc_opt ? 9 : 8;
-	if (argc < 1 || (argc - 1) % sizeitem != 0) {
-		strcpy(errbuf, "bad number of arguments for this form\n");
-		return (BSDDIALOG_ERROR);
-	}
-
+	if (argc < 1)
+		exit_error("--form missing <formheight>", true);
 	formheight = (u_int)strtoul(argv[0], NULL, 10);
 
 	argc--;
 	argv++;
+	sizeitem = item_bottomdesc_opt ? 9 : 8;
+	if (argc % sizeitem != 0)
+		exit_error("--form bad number of arguments items", true);
 
 	nitems = argc / sizeitem;
-	if (alloc_formitems(nitems, &items, errbuf) != BSDDIALOG_OK)
-		return (BSDDIALOG_ERROR);
+	if ((items = calloc(nitems, sizeof(struct bsddialog_formitem))) == NULL)
+		exit_error("cannot allocate memory for form items", false);
 	j = 0;
 	for (i = 0; i < nitems; i++) {
 		items[i].label	= argv[j++];
 		items[i].ylabel = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].xlabel = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].init	= argv[j++];
 		items[i].yfield	= (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].xfield	= (u_int)strtoul(argv[j++], NULL, 10);
 
 		fieldlen = (int)strtol(argv[j++], NULL, 10);
 		items[i].fieldlen = abs(fieldlen);
 
 		valuelen = (int)strtol(argv[j++], NULL, 10);
 		items[i].maxvaluelen = valuelen == 0 ? abs(fieldlen) : valuelen;
 
 		flags = (fieldlen < 0 ? BSDDIALOG_FIELDREADONLY : 0);
 		items[i].flags = flags;
 
 		items[i].bottomdesc = item_bottomdesc_opt ? argv[j++] : "";
 	}
 
 	output = bsddialog_form(conf, text, rows, cols, formheight, nitems,
 	    items);
 	print_form_items(output, nitems, items);
 	free(items);
 
 	return (output);
 }
 
 int inputbox_builder(BUILDER_ARGS)
 {
 	int output;
 	struct bsddialog_formitem item;
 
+	if (argc > 1)
+		error_args("--inputbox", argc - 1, argv + 1);
+
 	item.label	 = "";
 	item.ylabel	 = 0;
 	item.xlabel	 = 0;
 	item.init	 = argc > 0 ? argv[0] : "";
 	item.yfield	 = 0;
 	item.xfield	 = 0;
 	item.fieldlen    = 1;
-	item.maxvaluelen = max_input_form_opt > 0 ? max_input_form_opt : 2048;
+	item.maxvaluelen = max_input_form_opt;
 	item.flags	 = BSDDIALOG_FIELDNOCOLOR;
 	item.flags      |= BSDDIALOG_FIELDCURSOREND;
 	item.flags      |= BSDDIALOG_FIELDEXTEND;
 	item.bottomdesc  = "";
 
 	output = bsddialog_form(conf, text, rows, cols, 1, 1, &item);
 	print_form_items(output, 1, &item);
 
 	return (output);
 }
 
 int mixedform_builder(BUILDER_ARGS)
 {
 	int output;
 	unsigned int i, j, formheight, nitems, sizeitem;
 	struct bsddialog_formitem *items;
 
-	sizeitem = item_bottomdesc_opt ? 10 : 9;
-	if (argc < 1 || (argc-1) % sizeitem != 0) {
-		strcpy(errbuf, "bad number of arguments for this form\n");
-		return (BSDDIALOG_ERROR);
-	}
-
+	if (argc < 1)
+		exit_error("--mixedform missing <formheight>", true);
 	formheight = (u_int)strtoul(argv[0], NULL, 10);
 
 	argc--;
 	argv++;
+	sizeitem = item_bottomdesc_opt ? 10 : 9;
+	if (argc % sizeitem != 0)
+		exit_error("--mixedform bad number of arguments items", true);
 
 	nitems = argc / sizeitem;
-	if (alloc_formitems(nitems, &items, errbuf) != BSDDIALOG_OK)
-		return (BSDDIALOG_ERROR);
+	if ((items = calloc(nitems, sizeof(struct bsddialog_formitem))) == NULL)
+		exit_error("cannot allocate memory for form items", false);
 	j = 0;
 	for (i = 0; i < nitems; i++) {
 		items[i].label	     = argv[j++];
 		items[i].ylabel      = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].xlabel      = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].init	     = argv[j++];
 		items[i].yfield	     = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].xfield	     = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].fieldlen    = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].maxvaluelen = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].flags       = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].bottomdesc  = item_bottomdesc_opt ? argv[j++] : "";
 	}
 
 	output = bsddialog_form(conf, text, rows, cols, formheight, nitems,
 	    items);
 	print_form_items(output, nitems, items);
 	free(items);
 
 	return (output);
 }
 
 int passwordbox_builder(BUILDER_ARGS)
 {
 	int output;
 	struct bsddialog_formitem item;
 
+	if (argc > 1)
+		error_args("--passwordbox", argc - 1, argv + 1);
+
 	item.label	 = "";
 	item.ylabel	 = 0;
 	item.xlabel	 = 0;
 	item.init	 = argc > 0 ? argv[0] : "";
 	item.yfield	 = 0;
 	item.xfield	 = 0;
 	item.fieldlen	 = 1;
-	item.maxvaluelen = max_input_form_opt > 0 ? max_input_form_opt : 2048;
+	item.maxvaluelen = max_input_form_opt;
 	item.flags       = BSDDIALOG_FIELDHIDDEN;
 	item.flags      |= BSDDIALOG_FIELDNOCOLOR;
 	item.flags      |= BSDDIALOG_FIELDCURSOREND;
 	item.flags      |= BSDDIALOG_FIELDEXTEND;
 	item.bottomdesc  = "";
 
 	output = bsddialog_form(conf, text, rows, cols, 1, 1, &item);
 	print_form_items(output, 1, &item);
 
 	return (output);
 }
 
 int passwordform_builder(BUILDER_ARGS)
 {
 	int output, fieldlen, valuelen;
 	unsigned int i, j, flags, formheight, nitems, sizeitem;
 	struct bsddialog_formitem *items;
 
-	sizeitem = item_bottomdesc_opt ? 9 : 8;
-	if (argc < 1 || (argc - 1) % sizeitem != 0) {
-		strcpy(errbuf, "bad number of arguments for this form\n");
-		return (BSDDIALOG_ERROR);
-	}
-
+	if (argc < 1)
+		exit_error("--passwordform missing <formheight>", true);
 	formheight = (u_int)strtoul(argv[0], NULL, 10);
-	flags = BSDDIALOG_FIELDHIDDEN;
 
 	argc--;
 	argv++;
+	sizeitem = item_bottomdesc_opt ? 9 : 8;
+	if (argc % sizeitem != 0)
+		exit_error("--passwordform bad arguments items number", true);
 
+	flags = BSDDIALOG_FIELDHIDDEN;
 	nitems = argc / sizeitem;
-	if (alloc_formitems(nitems, &items, errbuf) != BSDDIALOG_OK)
-		return (BSDDIALOG_ERROR);
+	if ((items = calloc(nitems, sizeof(struct bsddialog_formitem))) == NULL)
+		exit_error("cannot allocate memory for form items", false);
 	j = 0;
 	for (i = 0; i < nitems; i++) {
 		items[i].label	= argv[j++];
 		items[i].ylabel = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].xlabel = (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].init	= argv[j++];
 		items[i].yfield	= (u_int)strtoul(argv[j++], NULL, 10);
 		items[i].xfield	= (u_int)strtoul(argv[j++], NULL, 10);
 
 		fieldlen = (int)strtol(argv[j++], NULL, 10);
 		items[i].fieldlen = abs(fieldlen);
 
 		valuelen = (int)strtol(argv[j++], NULL, 10);
 		items[i].maxvaluelen = valuelen == 0 ? abs(fieldlen) : valuelen;
 
 		flags |= (fieldlen < 0 ? BSDDIALOG_FIELDREADONLY : 0);
 		items[i].flags = flags;
 
 		items[i].bottomdesc  = item_bottomdesc_opt ? argv[j++] : "";
 	}
 
 	output = bsddialog_form(conf, text, rows, cols, formheight, nitems,
 	    items);
 	print_form_items(output, nitems, items);
 	free(items);
 
 	return (output);
 }
diff --git a/examples_library/calendar.c b/examples_library/calendar.c
new file mode 100644
index 000000000000..33e38c69a81b
--- /dev/null
+++ b/examples_library/calendar.c
@@ -0,0 +1,55 @@
+/*-
+ * SPDX-License-Identifier: CC0-1.0
+ *
+ * Written in 2022 by Alfonso Sabato Siciliano.
+ * To the extent possible under law, the author has dedicated all copyright
+ * and related and neighboring rights to this software to the public domain
+ * worldwide. This software is distributed without any warranty, see:
+ *   <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+#include <bsddialog.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+int main()
+{
+	int output;
+	unsigned int yy, mm, dd;
+	struct bsddialog_conf conf;
+	time_t cal;
+	struct tm *localtm;
+
+	time(&cal);
+	localtm = localtime(&cal);
+	yy = localtm->tm_year + 1900;
+	mm = localtm->tm_mon + 1;
+	dd = localtm->tm_mday;
+
+	if (bsddialog_init() == BSDDIALOG_ERROR) {
+		printf("Error: %s\n", bsddialog_geterror());
+		return (1);
+	}
+
+	bsddialog_initconf(&conf);
+	conf.title = "calendar";
+	output = bsddialog_calendar(&conf, "Example", 18, 40, &yy, &mm, &dd);
+
+	bsddialog_end();
+
+	switch (output) {
+	case BSDDIALOG_OK:
+		printf("Date: %u/%u/%u", yy, mm, dd);
+		break;
+	case BSDDIALOG_CANCEL:
+		printf("Cancel");
+		break;
+	case BSDDIALOG_ERROR:
+		printf("Error: %s", bsddialog_geterror());
+		break;
+	}
+	printf("\n");
+
+	return (output);
+}
\ No newline at end of file
diff --git a/examples_library/compile b/examples_library/compile
index 6f2c23b8ca75..4cb6d23bd6a6 100755
--- a/examples_library/compile
+++ b/examples_library/compile
@@ -1,21 +1,21 @@
 #!/bin/sh
 #-
 # SPDX-License-Identifier: CC0-1.0
 #
 # Written in 2021 by Alfonso Sabato Siciliano.
 # To the extent possible under law, the author has dedicated all copyright
 # and related and neighboring rights to this software to the public domain
 # worldwide. This software is distributed without any warranty, see:
 #     <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 libpath=../lib
 examples="menu checklist radiolist mixedlist theme infobox yesno msgbox \
-	datebox form timebox rangebox pause"
+	datebox form timebox rangebox pause calendar"
 
 rm -f $examples
 
 for e in $examples
 do
 	cc -g -Wall -Wextra -I$libpath ${e}.c -o $e -L$libpath -lbsddialog \
 	-Wl,-rpath=$libpath
 done
diff --git a/examples_library/form.c b/examples_library/form.c
index 56d8a8052a72..4780fb68d121 100644
--- a/examples_library/form.c
+++ b/examples_library/form.c
@@ -1,59 +1,59 @@
 /*-
  * SPDX-License-Identifier: CC0-1.0
  *
  * Written in 2021 by Alfonso Sabato Siciliano.
  * To the extent possible under law, the author has dedicated all copyright
  * and related and neighboring rights to this software to the public domain
  * worldwide. This software is distributed without any warranty, see:
  *   <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
 #include <bsddialog.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #define H   BSDDIALOG_FIELDHIDDEN
 #define RO  BSDDIALOG_FIELDREADONLY
 
 int main()
 {
 	int i, output;
 	struct bsddialog_conf conf;
 	struct bsddialog_formitem items[3] = {
 	    {"Input:",    0, 0, "value",     0, 10, 30, 50, NULL, 0,  "desc 1"},
 	    {"Input:",    1, 0, "read only", 1, 10, 30, 50, NULL, RO, "desc 2"},
 	    {"Password:", 2, 0, "",          2, 10, 30, 50, NULL, H,  "desc 3"}
 	};
 
-	/* Optional, unless for unicode/multicolum charachters */
+	/* Optional, unless for unicode/multi-column characters */
 	setlocale(LC_ALL, "");
 
 	if (bsddialog_init() == BSDDIALOG_ERROR) {
 		printf("Error: %s\n", bsddialog_geterror());
 		return (1);
 	}
 	bsddialog_initconf(&conf);
 	conf.title = "form";
 	conf.form.securech = '*';
 	output = bsddialog_form(&conf, "Example", 10, 50, 3, 3, items);
 	bsddialog_end();
 
 	if (output == BSDDIALOG_ERROR) {
 		printf("Error: %s", bsddialog_geterror());
 		return (1);
 	}
 
 	if (output == BSDDIALOG_CANCEL) {
 		printf("Cancel\n");
 		return (0);
 	}
 
 	for (i = 0; i < 3; i++) {
 		printf("%s \"%s\"\n", items[i].label, items[i].value);
 		free(items[i].value);
 	}
 
 	return (output);
-}
\ No newline at end of file
+}
diff --git a/examples_utility/timebox.sh b/examples_utility/calendar.sh
old mode 100755
new mode 100644
similarity index 76%
copy from examples_utility/timebox.sh
copy to examples_utility/calendar.sh
index 81d24d558dc9..a7ce4f1bb1d5
--- a/examples_utility/timebox.sh
+++ b/examples_utility/calendar.sh
@@ -1,34 +1,34 @@
 #!/bin/sh
 #-
 # SPDX-License-Identifier: CC0-1.0
 #
-# Written in 2021 by Alfonso Sabato Siciliano.
+# Written in 2022 by Alfonso Sabato Siciliano.
 #
 # To the extent possible under law, the author has dedicated all copyright
 # and related and neighboring rights to this software to the public domain
 # worldwide. This software is distributed without any warranty, see:
 #	<http://creativecommons.org/publicdomain/zero/1.0/>.
 
 : ${BSDDIALOG_ERROR=255}
 : ${BSDDIALOG_OK=0}
 : ${BSDDIALOG_CANCEL=1}
 : ${BSDDIALOG_ESC=5}
 
-TIME=$(./bsddialog --title " timebox " \
-	--timebox "Tab / Left / Right to move\nUp / Down to select" 10 40 \
+DATE=$(./bsddialog --title " calendar " --date-format "%x" \
+	--calendar "Hello World!" 20 40 \
 3>&1 1>&2 2>&3 3>&-)
 
 case $? in
 	$BSDDIALOG_ERROR )
 		exit 1
 	;;
 	$BSDDIALOG_ESC )
 		echo "[ESC]"
 	;;
 	$BSDDIALOG_CANCEL )
 		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
-		echo "[OK] $TIME"
+		echo "[OK] $DATE"
 	;;
 esac
diff --git a/examples_utility/timebox.sh b/examples_utility/timebox.sh
index 81d24d558dc9..233434b29195 100755
--- a/examples_utility/timebox.sh
+++ b/examples_utility/timebox.sh
@@ -1,34 +1,33 @@
 #!/bin/sh
 #-
 # SPDX-License-Identifier: CC0-1.0
 #
 # Written in 2021 by Alfonso Sabato Siciliano.
 #
 # To the extent possible under law, the author has dedicated all copyright
 # and related and neighboring rights to this software to the public domain
 # worldwide. This software is distributed without any warranty, see:
 #	<http://creativecommons.org/publicdomain/zero/1.0/>.
 
 : ${BSDDIALOG_ERROR=255}
 : ${BSDDIALOG_OK=0}
 : ${BSDDIALOG_CANCEL=1}
 : ${BSDDIALOG_ESC=5}
 
-TIME=$(./bsddialog --title " timebox " \
-	--timebox "Tab / Left / Right to move\nUp / Down to select" 10 40 \
+TIME=$(./bsddialog --title " timebox " --timebox "Hello World!" 8 25 \
 3>&1 1>&2 2>&3 3>&-)
 
 case $? in
 	$BSDDIALOG_ERROR )
 		exit 1
 	;;
 	$BSDDIALOG_ESC )
 		echo "[ESC]"
 	;;
 	$BSDDIALOG_CANCEL )
 		echo "[Cancel]"
 	;;
 	$BSDDIALOG_OK )
 		echo "[OK] $TIME"
 	;;
 esac
diff --git a/lib/GNUMakefile b/lib/GNUMakefile
index 1d55d6edd60d..3c31c78fdf88 100644
--- a/lib/GNUMakefile
+++ b/lib/GNUMakefile
@@ -1,31 +1,31 @@
 # PUBLIC DOMAIN - NO WARRANTY, see:
 #     <http://creativecommons.org/publicdomain/zero/1.0/>
 #
 # Written in 2021 by Alfonso Sabato Siciliano
 
-VERSION = 0.3
+VERSION = 0.4
 LIBRARY = bsddialog
 LIBRARY_SO = lib${LIBRARY:=.so}
 HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h
-SOURCES = barbox.c formbox.c infobox.c libbsddialog.c lib_util.c menubox.c \
-	messagebox.c textbox.c theme.c timebox.c
+SOURCES = barbox.c calendarbox.c formbox.c infobox.c libbsddialog.c \
+	lib_util.c menubox.c messagebox.c textbox.c theme.c timebox.c
 OBJECTS = $(SOURCES:.c=.o)
-CFLAGS = -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE -D_GNU_SOURCE -Wall -Wextra -Wno-implicit-fallthrough \
-	-Werror -fpic
+CFLAGS = -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE -D_GNU_SOURCE -Wall -Wextra \
+	-Wno-implicit-fallthrough -Werror -fpic
 LDFLAGS = -lncursesw -ltinfo
 LIBFLAG = -shared
 
 RM = rm -f
 LN = ln -s -f
 
 all : $(LIBRARY)
 
 $(LIBRARY): $(OBJECTS)
 	$(CC) $(LIBFLAG) $^ -o $(LIBRARY_SO).$(VERSION) $(LDFLAGS)
 	${LN} ${LIBRARY_SO}.${VERSION} ${LIBRARY_SO}
 
 %.o: %.c $(HEADERS)
 	$(CC) $(CFLAGS) -c $<
 
 clean:
 	$(RM) $(LIBRARY_SO)* *.o *~
diff --git a/lib/Makefile b/lib/Makefile
index 5c535c5483f1..0f536fb38743 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,75 +1,75 @@
 # PUBLIC DOMAIN - NO WARRANTY, see:
 #     <http://creativecommons.org/publicdomain/zero/1.0/>
 #
 # Written in 2021 by Alfonso Sabato Siciliano
 
-VERSION = 0.3
+VERSION = 0.4
 LIBRARY = bsddialog
 LIBRARY_SO = lib${LIBRARY:=.so}
 LIBRARY_A = lib${LIBRARY:=.a}
 HEADERS = bsddialog.h bsddialog_theme.h bsddialog_progressview.h
-SOURCES = barbox.c formbox.c infobox.c libbsddialog.c lib_util.c menubox.c \
-	messagebox.c textbox.c theme.c timebox.c
+SOURCES = barbox.c calendarbox.c formbox.c infobox.c libbsddialog.c \
+	lib_util.c menubox.c messagebox.c textbox.c theme.c timebox.c
 OBJECTS = ${SOURCES:.c=.o}
 CFLAGS += -D_XOPEN_SOURCE_EXTENDED -fPIC -Wall -Wextra
 LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
 	-Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION} \
 	-L/usr/lib -lncursesw -ltinfow
 
 .if defined(DEBUG)
 # `make -DDEBUG`
 CFLAGS = -g -D_XOPEN_SOURCE_EXTENDED -fPIC -Wall -Wextra
 .else
 CFLAGS += -std=gnu99 -fstack-protector-strong
 .endif
 
 LOCALBASE = /usr/local
 LN = ln -s -f
 RM = rm -f
 CP = cp
 GZIP = gzip -cn
 LDCONFIG = /sbin/ldconfig -m
 MAN = ${OUTPUT}.3
 GZIP = gzip -cn
 MANDIR = ${LOCALBASE}/share/man/man3
 INSTALL = install
 RM = rm -f
 
 all : man ${LIBRARY}
 
 ${LIBRARY}: ${LIBRARY_SO} ${LIBRARY_A}
 
 ${LIBRARY_SO}.${VERSION}: ${OBJECTS}
 	${CC} ${LDFLAGS} ${.ALLSRC} -o ${LIBRARY_SO}.${VERSION}
 
 ${LIBRARY_SO}: ${LIBRARY_SO}.${VERSION}
 	${LN} ${LIBRARY_SO}.${VERSION} ${LIBRARY_SO}
 
 ${LIBRARY_A}: ${OBJECTS}
 	${AR} cr ${.TARGET} ${OBJECTS}
 	${RANLIB} ${.TARGET}
 
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 man:
 	${GZIP} ${LIBRARY}.3 > ${LIBRARY}.3.gz
 
 clean:
 	${RM} ${LIBRARY_SO}* *.o *~ *.gz ${LIBRARY_A}
 
 
 install:
 	${INSTALL} -m 644 ${HEADERS} ${LOCALBASE}/include
 	${INSTALL} -m 644 -s ${LIBRARY_SO}.${VERSION} ${LOCALBASE}/lib/
 	${INSTALL} -l rs ${LOCALBASE}/lib/${LIBRARY_SO}.${VERSION} ${LOCALBASE}/lib/${LIBRARY_SO}
 	${INSTALL} -m 644 ${LIBRARY_A} ${LOCALBASE}/lib
 	${LDCONFIG} ${LOCALBASE}/lib
 	${INSTALL} -m 644 ${LIBRARY}.3.gz ${MANDIR}
 
 unistall:
 	${RM} ${LOCALBASE}/include/${LIBRARY}*.h
 	${RM} ${LOCALBASE}/lib/${LIBRARY_SO}
 	${RM} ${LOCALBASE}/lib/${LIBRARY_SO}.${VERSION}
 	${LDCONFIG} ${LOCALBASE}/lib
 	${RM} ${MANDIR}/${LIBRARY}.3.gz
diff --git a/lib/barbox.c b/lib/barbox.c
index b6bfe32fc0aa..71759839a709 100644
--- a/lib/barbox.c
+++ b/lib/barbox.c
@@ -1,750 +1,750 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <ctype.h>
 #include <curses.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 
 #include "bsddialog.h"
 #include "bsddialog_progressview.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
 #define BARPADDING     2
 #define MINBARLEN      15
 #define MINBARWIDTH    (2 + 2 * BARPADDING + MINBARLEN)
 #define MINMGBARLEN    18
 #define MINMGBARWIDTH  (2 + 2 * BARPADDING + MINMGBARLEN)
 
 bool bsddialog_interruptprogview;
 bool bsddialog_abortprogview;
 int  bsddialog_total_progview;
 
 static void
 draw_bar(WINDOW *win, int y, int x, int barlen, int perc, bool withlabel,
     int label)
 {
 	int i, blue_x, color, stringlen;
 	char labelstr[128];
 
 	blue_x = perc > 0 ? (perc * barlen) / 100 : -1;
 
 	wmove(win, y, x);
 	for (i = 0; i < barlen; i++) {
 		color = (i <= blue_x) ? t.bar.f_color : t.bar.color;
 		wattron(win, color);
 		waddch(win, ' ');
 		wattroff(win, color);
 	}
 
 	if (withlabel)
 		sprintf(labelstr, "%d", label);
 	else
 		sprintf(labelstr, "%3d%%", perc);
 	stringlen = (int)strlen(labelstr); /* number, always 1-byte-ch string */
 	wmove(win, y, x + barlen/2 - stringlen/2);
 	for (i = 0; i < stringlen; i++) {
 		color = (blue_x + 1 <= barlen/2 - stringlen/2 + i ) ?
 		    t.bar.color : t.bar.f_color;
 		wattron(win, color);
 		waddch(win, labelstr[i]);
 		wattroff(win, color);
 	}
 }
 
 static int
 bar_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
     const char *text, struct buttons *bs)
 {
 	int htext, wtext;
 
 	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE) {
 		if (text_size(conf, rows, cols, text, bs, 3, MINBARWIDTH,
 		    &htext, &wtext) != 0)
 			return (BSDDIALOG_ERROR);
 	}
 
 	if (cols == BSDDIALOG_AUTOSIZE)
 		*w = widget_min_width(conf, wtext, MINBARWIDTH, bs);
 
 	if (rows == BSDDIALOG_AUTOSIZE)
 		*h = widget_min_height(conf, htext, 3 /* bar */, bs != NULL);
 
 	return (0);
 }
 
 static int
 bar_checksize(int rows, int cols, struct buttons *bs)
 {
 	int minheight, minwidth;
 
 	minwidth = 0;
 	if (bs != NULL) /* gauge has not buttons */
 		minwidth = buttons_min_width(*bs);
 
 	minwidth = MAX(minwidth, MINBARWIDTH);
 	minwidth += VBORDERS;
 
 	if (cols < minwidth)
 		RETURN_ERROR("Few cols to draw bar and/or buttons");
 
 	minheight = HBORDERS + 3;
 	if (bs != NULL)
 		minheight += 2;
 	if (rows < minheight)
 		RETURN_ERROR("Few rows to draw bar");
 
 	return (0);
 }
 
 int
 bsddialog_gauge(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int perc, int fd, const char *sep)
 {
 	bool mainloop;
 	int y, x, h, w, fd2;
 	FILE *input;
 	WINDOW *widget, *textpad, *bar, *shadow;
 	char inputbuf[2048], ntext[2048], *pntext;
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return (BSDDIALOG_ERROR);
 	if (bar_autosize(conf, rows, cols, &h, &w, text, NULL) != 0)
 		return (BSDDIALOG_ERROR);
 	if (bar_checksize(h, w, NULL) != 0)
 		return (BSDDIALOG_ERROR);
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, NULL,
 	    false) != 0)
 		return (BSDDIALOG_ERROR);
 
 	bar = new_boxed_window(conf, y+h-4, x+3, 3, w-6, RAISED);
 
 	input = NULL;
 	if (fd >= 0) {
 		fd2 = dup(fd);
 		if ((input = fdopen(fd2, "r")) == NULL)
 			RETURN_ERROR("Cannot build FILE* from fd");
 	}
 
 	mainloop = true;
 	while (mainloop) {
 		wrefresh(widget);
 		prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-4,
 		    x+w-1-TEXTHMARGIN);
 		draw_borders(conf, bar, 3, w-6, RAISED);
 		draw_bar(bar, 1, 1, w-8, perc, false, -1 /*unused*/);
 		wrefresh(bar);
 		if (input == NULL) /* that is fd < 0 */
 			break;
 
 		while (true) {
 			fscanf(input, "%s", inputbuf);
 			if (strcmp(inputbuf,"EOF") == 0) {
 				mainloop = false;
 				break;
 			}
 			if (strcmp(inputbuf, sep) == 0)
 				break;
 		}
 		if (mainloop == false)
 			break;
 		fscanf(input, "%d", &perc);
 		perc = perc > 100 ? 100 : perc;
 		pntext = &ntext[0];
 		ntext[0] = '\0';
 		while (true) {
 			fscanf(input, "%s", inputbuf);
 			if (strcmp(inputbuf,"EOF") == 0) {
 				mainloop = false;
 				break;
 			}
 			if (strcmp(inputbuf, sep) == 0)
 				break;
 			strcpy(pntext, inputbuf);
 			pntext += strlen(inputbuf); /* end string, no strlen */
 			pntext[0] = ' ';
 			pntext++;
 		}
 		pntext[0] = '\0';
 		if (update_dialog(conf, shadow, widget, y, x, h, w, textpad,
 		    ntext, NULL, false) != 0)
 			return (BSDDIALOG_ERROR);
 	}
 
 	if (input != NULL)
 		fclose(input);
 	delwin(bar);
 	end_dialog(conf, shadow, widget, textpad);
 
 	return (BSDDIALOG_OK);
 }
 
 /* Mixedgauge */
 static int
 do_mixedgauge(struct bsddialog_conf *conf, const char *text, int rows, int cols,
     unsigned int mainperc, unsigned int nminibars, const char **minilabels,
     int *minipercs, bool color)
 {
 	int i, retval, miniperc, y, x, h, w, ypad, max_minbarlen;
 	int htextpad, htext, wtext;
 	int colorperc, red, green;
 	WINDOW *widget, *textpad, *bar, *shadow;
 	char states[12][14] = {
 		"  Succeeded  ", /* -1  */
 		"   Failed    ", /* -2  */
 		"   Passed    ", /* -3  */
 		"  Completed  ", /* -4  */
 		"   Checked   ", /* -5  */
 		"    Done     ", /* -6  */
 		"   Skipped   ", /* -7  */
 		" In Progress ", /* -8  */
 		"(blank)      ", /* -9  */
 		"     N/A     ", /* -10 */
 		"   Pending   ", /* -11 */
 		"   UNKNOWN   ", /* < -11, no API */
 	};
 
 	red   = bsddialog_color(BSDDIALOG_WHITE,BSDDIALOG_RED,  BSDDIALOG_BOLD);
 	green = bsddialog_color(BSDDIALOG_WHITE,BSDDIALOG_GREEN,BSDDIALOG_BOLD);
 
 	max_minbarlen = 0;
 	for (i = 0; i < (int)nminibars; i++)
 		max_minbarlen = MAX(max_minbarlen, (int)strcols(minilabels[i]));
 	max_minbarlen += 3 + 16; /* seps + [...] */
 	max_minbarlen = MAX(max_minbarlen, MINMGBARWIDTH); /* mainbar */
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	/* mixedgauge autosize */
 	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE) {
 		if (text_size(conf, rows, cols, text, NULL, nminibars + 3,
 		    max_minbarlen, &htext, &wtext) != 0)
 			return (BSDDIALOG_ERROR);
 	}
 	if (cols == BSDDIALOG_AUTOSIZE)
 		w = widget_min_width(conf, wtext, max_minbarlen, NULL);
 	if (rows == BSDDIALOG_AUTOSIZE)
 		h = widget_min_height(conf, htext, nminibars + 3, false);
 
 	/* mixedgauge checksize */
 	if (w < max_minbarlen + 2)
 		RETURN_ERROR("Few cols for this mixedgauge");
 	if (h < 5 + (int)nminibars)
 		RETURN_ERROR("Few rows for this mixedgauge");
 
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	retval = new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text,
 	    NULL, false);
 	if (retval == BSDDIALOG_ERROR)
 		return (retval);
 
 	/* mini bars */
 	for (i = 0; i < (int)nminibars; i++) {
 		miniperc = minipercs[i];
 		if (miniperc == BSDDIALOG_MG_BLANK)
 			continue;
 		/* label */
 		if (color && (miniperc >= 0))
 			wattron(widget, A_BOLD);
 		mvwaddstr(widget, i+1, 2, minilabels[i]);
 		if (color && (miniperc >= 0))
 			wattroff(widget, A_BOLD);
 		/* perc */
 		if (miniperc < -11)
 			mvwaddstr(widget, i+1, w-2-15, states[11]);
 		else if (miniperc < 0) {
 			mvwaddstr(widget, i+1, w-2-15, "[             ]");
 			colorperc = -1;
 			if (color && miniperc == BSDDIALOG_MG_FAILED)
 				colorperc = red;
 			if (color && miniperc == BSDDIALOG_MG_DONE)
 				colorperc = green;
 			if (colorperc != -1)
 				wattron(widget, colorperc);
 			miniperc = abs(miniperc + 1);
 			mvwaddstr(widget, i+1, 1+w-2-15, states[miniperc]);
 			if (colorperc != -1)
 				wattroff(widget, colorperc);
 		}
 		else { /* miniperc >= 0 */
 			if (miniperc > 100)
 				miniperc = 100;
 			mvwaddstr(widget, i+1, w-2-15, "[             ]");
 			draw_bar(widget, i+1, 1+w-2-15, 13, miniperc, false,
 			    -1 /*unused*/);
 		}
 	}
 
 	wrefresh(widget);
 	getmaxyx(textpad, htextpad, i /* unused */);
 	ypad =  y + h - 4 - htextpad;
 	ypad = ypad < y+(int)nminibars ? y+(int)nminibars : ypad;
 	prefresh(textpad, 0, 0, ypad, x+2, y+h-4, x+w-2);
 
 	/* main bar */
 	bar = new_boxed_window(conf, y+h -4, x+3, 3, w-6, RAISED);
 
 	draw_bar(bar, 1, 1, w-8, mainperc, false, -1 /*unused*/);
 
 	wattron(bar, t.bar.color);
 	mvwaddstr(bar, 0, 2, "Overall Progress");
 	wattroff(bar, t.bar.color);
 
 	wrefresh(bar);
 
-	/* getch(); port ncurses shows nothing */
+	/* getch(); alternate mode (port devel/ncurses) shows nothing */
 
 	delwin(bar);
 	end_dialog(conf, shadow, widget, textpad);
 
 	return (BSDDIALOG_OK);
 }
 
 int
 bsddialog_mixedgauge(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int mainperc, unsigned int nminibars,
     const char **minilabels, int *minipercs)
 {
 	int retval;
 
 	retval = do_mixedgauge(conf, text, rows, cols, mainperc, nminibars,
 	    minilabels, minipercs, false);
 
 	return (retval);
 }
 
 int
 bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows,
     int cols, struct bsddialog_progviewconf *pvconf, unsigned int nminibar,
     struct bsddialog_fileminibar *minibar)
 {
 	bool update;
 	int perc, retval, *minipercs;
 	unsigned int i, mainperc, totaltodo;
 	float readforsec;
 	const char **minilabels;
 	time_t tstart, told, tnew, refresh;
 
 	if ((minilabels = calloc(nminibar, sizeof(char*))) == NULL)
 		RETURN_ERROR("Cannot allocate memory for minilabels");
 	if ((minipercs = calloc(nminibar, sizeof(int))) == NULL)
 		RETURN_ERROR("Cannot allocate memory for minipercs");
 
 	totaltodo = 0;
 	for (i = 0; i < nminibar; i++) {
 		totaltodo += minibar[i].size;
 		minilabels[i] = minibar[i].label;
 		minipercs[i] = minibar[i].status;
 	}
 
 	refresh = pvconf->refresh == 0 ? 0 : pvconf->refresh - 1;
 	retval = BSDDIALOG_OK;
 	i = 0;
 	update = true;
 	time(&told);
 	tstart = told;
 	while (!(bsddialog_interruptprogview || bsddialog_abortprogview)) {
 		if (bsddialog_total_progview == 0 || totaltodo == 0)
 			mainperc = 0;
 		else
 			mainperc = (bsddialog_total_progview * 100) / totaltodo;
 
 		time(&tnew);
 		if (update || tnew > told + refresh) {
 			retval = do_mixedgauge(conf, text, rows, cols, mainperc,
 			    nminibar, minilabels, minipercs, true);
 			if (retval == BSDDIALOG_ERROR)
 				return (BSDDIALOG_ERROR);
 
 			move(SCREENLINES - 1, 2);
 			clrtoeol();
 			readforsec = ((tnew - tstart) == 0) ? 0 :
 			    bsddialog_total_progview / (float)(tnew - tstart);
 			printw(pvconf->fmtbottomstr, bsddialog_total_progview,
 			    readforsec);
 			refresh();
 
 			time(&told);
 			update = false;
 		}
 
 		if (i >= nminibar)
 			break;
 		if (minibar[i].status == BSDDIALOG_MG_FAILED)
 			break;
 
 		perc = pvconf->callback(&minibar[i]);
 
 		if (minibar[i].status == BSDDIALOG_MG_DONE) { /*||perc >= 100)*/
 			minipercs[i] = BSDDIALOG_MG_DONE;
 			update = true;
 			i++;
 		} else if (minibar[i].status == BSDDIALOG_MG_FAILED || perc < 0) {
 			minipercs[i] = BSDDIALOG_MG_FAILED;
 			update = true;
 		} else /* perc >= 0 */
 			minipercs[i] = perc;
 	}
 
 	free(minilabels);
 	free(minipercs);
 	return (retval);
 }
 
 int
 bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, int min, int max, int *value)
 {
 	bool loop, buttupdate, barupdate;
 	int y, x, h, w;
 	int currvalue, retval, sizebar, bigchange, positions;
 	wint_t input;
 	float perc;
 	WINDOW *widget, *textpad, *bar, *shadow;
 	struct buttons bs;
 
 	if (value == NULL)
 		RETURN_ERROR("*value cannot be NULL");
 
 	if (min >= max)
 		RETURN_ERROR("min >= max");
 
 	currvalue = *value;
 	positions = max - min + 1;
 
 	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return (BSDDIALOG_ERROR);
 	if (bar_autosize(conf, rows, cols, &h, &w, text, &bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (bar_checksize(h, w, &bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
 	    true) != 0)
 		return (BSDDIALOG_ERROR);
 
 	doupdate();
 
 	prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-7, x+w-1-TEXTHMARGIN);
 
 	sizebar = w - HBORDERS - (2 * BARPADDING) - 2;
 	bigchange = MAX(1, sizebar/10);
 
 	bar = new_boxed_window(conf, y + h - 6, x + 1 + BARPADDING, 3,
 	    sizebar + 2, RAISED);
 
 	loop = buttupdate = barupdate = true;
 	while (loop) {
 		if (buttupdate) {
 			draw_buttons(widget, bs, true);
 			wrefresh(widget);
 			buttupdate = false;
 		}
 		if (barupdate) {
 			perc = ((float)(currvalue - min)*100) / (positions-1);
 			draw_bar(bar, 1, 1, sizebar, perc, true, currvalue);
 			barupdate = false;
 			wrefresh(bar);
 		}
 
 		if (get_wch(&input) == ERR)
 			continue;
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			retval = bs.value[bs.curr];
 			*value = currvalue;
 			loop = false;
 			break;
 		case 27: /* Esc */
 			if (conf->key.enable_esc) {
 				retval = BSDDIALOG_ESC;
 				loop = false;
 			}
 			break;
 		case '\t': /* TAB */
 			bs.curr = (bs.curr + 1) % bs.nbuttons;
 			buttupdate = true;
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
 				buttupdate = true;
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
 				buttupdate = true;
 			}
 			break;
 		case KEY_HOME:
 			currvalue = max;
 			barupdate = true;
 			break;
 		case KEY_END:
 			currvalue = min;
 			barupdate = true;
 			break;
 		case KEY_NPAGE:
 			currvalue -= bigchange;
 			if (currvalue < min)
 				currvalue = min;
 			barupdate = true;
 			break;
 		case KEY_PPAGE:
 			currvalue += bigchange;
 			if (currvalue > max)
 				currvalue = max;
 			barupdate = true;
 			break;
 		case KEY_UP:
 			if (currvalue < max) {
 				currvalue++;
 				barupdate = true;
 			}
 			break;
 		case KEY_DOWN:
 			if (currvalue > min) {
 				currvalue--;
 				barupdate = true;
 			}
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return (BSDDIALOG_ERROR);
 			/* No break, screen size can change */
 		case KEY_RESIZE:
 			/* Important for decreasing screen */
 			hide_widget(y, x, h, w, conf->shadow);
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return (BSDDIALOG_ERROR);
 			if (bar_autosize(conf, rows, cols, &h, &w, text,
 			    &bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (bar_checksize(h, w, &bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return (BSDDIALOG_ERROR);
 
 			if (update_dialog(conf, shadow, widget,y, x, h, w,
 			    textpad, text, &bs, true) != 0)
 				return (BSDDIALOG_ERROR);
 
 			doupdate();
 
 			sizebar = w - HBORDERS - (2 * BARPADDING) - 2;
 			bigchange = MAX(1, sizebar/10);
 			wclear(bar);
 			mvwin(bar, y + h - 6, x + 1 + BARPADDING);
 			wresize(bar, 3, sizebar + 2);
 			draw_borders(conf, bar, 3, sizebar+2, RAISED);
 
 			prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-7,
 			    x+w-1-TEXTHMARGIN);
 
 			barupdate = true;
 			break;
 		default:
 			if (shortcut_buttons(input, &bs)) {
 				retval = bs.value[bs.curr];
 				loop = false;
 			}
 		}
 	}
 
 	delwin(bar);
 	end_dialog(conf, shadow, widget, textpad);
 
 	return (retval);
 }
 
 int
 bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int sec)
 {
 	bool loop, buttupdate, barupdate;
 	int retval, y, x, h, w, tout, sizebar;
 	wint_t input;
 	float perc;
 	WINDOW *widget, *textpad, *bar, *shadow;
 	struct buttons bs;
 
 	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return (BSDDIALOG_ERROR);
 	if (bar_autosize(conf, rows, cols, &h, &w, text, &bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (bar_checksize(h, w, &bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
 	    true) != 0)
 		return (BSDDIALOG_ERROR);
 
 	doupdate();
 
 	prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-7, x+w-1-TEXTHMARGIN);
 
 	sizebar = w - HBORDERS - (2 * BARPADDING) - 2;
 	bar = new_boxed_window(conf, y + h - 6, x + 1 + BARPADDING, 3,
 	    sizebar + 2, RAISED);
 
 	tout = sec;
 	nodelay(stdscr, TRUE);
 	timeout(1000);
 	loop = buttupdate = barupdate = true;
 	while (loop) {
 		if (barupdate) {
 			perc = (float)tout * 100 / sec;
 			draw_bar(bar, 1, 1, sizebar, perc, true, tout);
 			barupdate = false;
 			wrefresh(bar);
 		}
 
 		if (buttupdate) {
 			draw_buttons(widget, bs, true);
 			wrefresh(widget);
 			buttupdate = false;
 		}
 
 		if (get_wch(&input) == ERR) { /* timeout */
 			tout--;
 			if (tout < 0) {
 				retval = BSDDIALOG_TIMEOUT;
 				break;
 			}
 			else {
 				barupdate = true;
 				continue;
 			}
 		}
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			retval = bs.value[bs.curr];
 			loop = false;
 			break;
 		case 27: /* Esc */
 			if (conf->key.enable_esc) {
 				retval = BSDDIALOG_ESC;
 				loop = false;
 			}
 			break;
 		case '\t': /* TAB */
 			bs.curr = (bs.curr + 1) % bs.nbuttons;
 			buttupdate = true;
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
 				buttupdate = true;
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
 				buttupdate = true;
 			}
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return (BSDDIALOG_ERROR);
 			/* No break, screen size can change */
 		case KEY_RESIZE:
 			/* Important for decreasing screen */
 			hide_widget(y, x, h, w, conf->shadow);
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return (BSDDIALOG_ERROR);
 			if (bar_autosize(conf, rows, cols, &h, &w, text,
 			    &bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (bar_checksize(h, w, &bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return (BSDDIALOG_ERROR);
 
 			if (update_dialog(conf, shadow, widget,y, x, h, w,
 			    textpad, text, &bs, true) != 0)
 				return (BSDDIALOG_ERROR);
 
 			doupdate();
 
 			sizebar = w - HBORDERS - (2 * BARPADDING) - 2;
 			wclear(bar);
 			mvwin(bar, y + h - 6, x + 1 + BARPADDING);
 			wresize(bar, 3, sizebar + 2);
 			draw_borders(conf, bar, 3, sizebar+2, LOWERED);
 
 			prefresh(textpad, 0, 0, y+1, x+1+TEXTHMARGIN, y+h-7,
 			    x+w-1-TEXTHMARGIN);
 
 			barupdate = true;
 			break;
 		default:
 			if (shortcut_buttons(input, &bs)) {
 				retval = bs.value[bs.curr];
 				loop = false;
 			}
 		}
 	}
 
 	nodelay(stdscr, FALSE);
 
 	delwin(bar);
 	end_dialog(conf, shadow, widget, textpad);
 
 	return (retval);
 }
\ No newline at end of file
diff --git a/lib/bsddialog.3 b/lib/bsddialog.3
index 12db1f039d59..9cc68a90ff62 100644
--- a/lib/bsddialog.3
+++ b/lib/bsddialog.3
@@ -1,1062 +1,1079 @@
 .\"
 .\" Copyright (c) 2021-2022 Alfonso Sabato Siciliano
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 29, 2022
+.Dd September 23, 2022
 .Dt BSDDIALOG 3
 .Os
 .Sh NAME
 .Nm bsddialog_backtitle ,
+.Nm bsddialog_calendar ,
 .Nm bsddialog_clearterminal ,
 .Nm bsddialog_color ,
 .Nm bsddialog_color_attrs ,
 .Nm bsddialog_checklist ,
 .Nm bsddialog_datebox ,
 .Nm bsddialog_end ,
 .Nm bsddialog_form ,
 .Nm bsddialog_gauge ,
 .Nm bsddialog_geterror ,
 .Nm bsddialog_get_theme ,
 .Nm bsddialog_hascolors ,
 .Nm bsddialog_infobox ,
 .Nm bsddialog_init ,
 .Nm bsddialog_init_notheme ,
 .Nm bsddialog_initconf ,
 .Nm bsddialog_menu ,
 .Nm bsddialog_mixedgauge ,
 .Nm bsddialog_mixedlist ,
 .Nm bsddialog_msgbox ,
 .Nm bsddialog_pause ,
 .Nm bsddialog_radiolist ,
 .Nm bsddialog_rangebox ,
 .Nm bsddialog_set_theme ,
 .Nm bsddialog_set_default_theme ,
 .Nm bsddialog_textbox ,
 .Nm bsddialog_timebox ,
 .Nm bsddialog_yesno
 .Nd TUI dialogs
 .Sh LIBRARY
 .Lb libbsddialog
 .Sh SYNOPSIS
 .In bsddialog.h
 .Ft int
 .Fn bsddialog_backtitle "struct bsddialog_conf *conf" "const char *backtitle"
 .Ft int
+.Fo bsddialog_calendar
+.Fa "struct bsddialog_conf *conf"
+.Fa "const char *text"
+.Fa "int rows"
+.Fa "int cols"
+.Fa "unsigned int *yy"
+.Fa "unsigned int *mm"
+.Fa "unsigned int *dd"
+.Fc
+.Ft int
 .Fo bsddialog_checklist
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int menurows"
 .Fa "unsigned int nitems"
 .Fa "struct bsddialog_menuitem *items"
 .Fa "int *focusitem"
 .Fc
 .Ft int
 .Fn bsddialog_clearterminal "void"
 .Ft int
-.Fo bsddialog_datebox"
+.Fo bsddialog_datebox
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int *yy"
 .Fa "unsigned int *mm"
 .Fa "unsigned int *dd"
 .Fc
 .Ft int
 .Fn bsddialog_end "void"
 .Ft int
 .Fo bsddialog_form
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int formrows"
 .Fa "unsigned int nitems"
 .Fa "struct bsddialog_formitem *items"
 .Fc
 .Ft int
 .Fo bsddialog_gauge
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int perc"
 .Fa "int fd"
 .Fa "const char *sep"
 .Fc
 .Ft const char *
 .Fn bsddialog_geterror "void"
 .Ft int
 .Fo bsddialog_infobox
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fc
 .Ft int
 .Fn bsddialog_init "void"
 .Ft int
 .Fn bsddialog_init_notheme "void"
 .Ft int
 .Fn bsddialog_initconf "struct bsddialog_conf *conf"
 .Ft int
 .Fo bsddialog_menu
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int menurows"
 .Fa "unsigned int nitems"
 .Fa "struct bsddialog_menuitem *items"
 .Fa "int *focusitem"
 .Fc
 .Ft int
 .Fo bsddialog_mixedgauge
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int mainperc"
 .Fa "unsigned int nminibars"
 .Fa "char **minilabels"
 .Fa "int *minipercs"
 .Fc
 .Ft int
 .Fo bsddialog_mixedlist
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int menurows"
 .Fa "unsigned int ngroups"
 .Fa "struct bsddialog_menugroup *groups"
 .Fa "int *focuslist"
 .Fa "int *focusitem"
 .Fc
 .Ft int
 .Fo bsddialog_msgbox
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fc
 .Ft int
 .Fo bsddialog_pause
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int seconds"
 .Fc
 .Ft int
 .Fo bsddialog_radiolist
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int menurows"
 .Fa "unsigned int nitems"
 .Fa "struct bsddialog_menuitem *items"
 .Fa "int *focusitem"
 .Fc
 .Ft int
 .Fo bsddialog_rangebox
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "int min"
 .Fa "int max"
 .Fa "int *value"
 .Fc
 .Ft int
 .Fo bsddialog_textbox
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *file"
 .Fa "int rows"
 .Fa "int cols"
 .Fc
 .Ft int
 .Fo bsddialog_timebox
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fa "unsigned int *hh"
 .Fa "unsigned int *mm"
 .Fa "unsigned int *ss"
 .Fc
 .Ft int
 .Fo bsddialog_yesno
 .Fa "struct bsddialog_conf *conf"
 .Fa "const char *text"
 .Fa "int rows"
 .Fa "int cols"
 .Fc
 .In bsddialog_theme.h
 .Ft int
 .Fo bsddialog_color
 .Fa "enum bsddialog_color foreground"
 .Fa "enum bsddialog_color background"
 .Fa "unsigned int flags"
 .Fc
 .Ft int
 .Fo bsddialog_color_attrs
 .Fa "int color"
 .Fa "enum bsddialog_color *foreground"
 .Fa "enum bsddialog_color *background"
 .Fa "unsigned int *flags"
 .Fc
 .Ft int
 .Fn bsddialog_get_theme "struct bsddialog_theme *theme"
 .Ft bool
 .Fn bsddialog_hascolors "void"
 .Ft int
 .Fn bsddialog_set_default_theme "enum bsddialog_default_theme theme"
 .Ft int
 .Fn bsddialog_set_theme "struct bsddialog_theme *theme"
 .Sh DESCRIPTION
 The
 .Nm bsddialog
 library provides an API to build Text User Interface dialogs and widgets: to
 display messages, to get input and to inform about a computation status.
 .Pp
 .Fn bsddialog_init
 initializes the library, the only functions that can be called before is
 .Fn bsddialog_initconf
 described later.
 After the initialization the input and output should be handled via the library
 API.
 .Fn bsddialog_end
 restores the screen like before
 .Fn bsddialog_init ,
 then it is not possible to use the library functions.
 .Fn bsddialog_init_notheme
 is equivalent to
 .Fn bsddialog_init
 except it does not set the default graphical theme; see
 .Sx Theme
 subsection to set a theme explicitly.
 .Pp
 .Fn bsddialog_error
 returns a string to describe the last error, it should be called after a
 .Dv BSDDIALOG_ERROR
 returned value.
 .Fn bsddialog_clearterminal
 clears the screen.
 .Fn bsddialog_backtitle
 prints
 .Fa backtitle
 on the top of the screen, it is possible to set
 .Fa conf.ascii_lines
 and
 .Fa conf.no_lines ;
 .Fa conf
 is described later.
 .Pp
 Each
 .Fa char*
 argument has to be a well terminated string, it can be a multibyte character
 string depending on current locale, see
 .Xr setlocale 3 .
 .Ss Dialogs
 The dialogs have common arguments.
 .Fa text
 is a string printed inside the dialog.
 .Fa rows
 and
 .Fa cols
 are height and width, their value can be between 2 and the screen size,
 .Dv BSDDIALOG_AUTOSIZE
 or
 .Dv BSDDIALOG_FULLSCREEN .
 .Fa conf
 is a struct to customize the dialog, it does not set global properties to the
 library.
 .Pp
 .Bd -literal -offset indent -compact
 struct bsddialog_conf {
 	bool ascii_lines;
 	unsigned int auto_minheight;
 	unsigned int auto_minwidth;
 	unsigned int auto_topmargin;
 	unsigned int auto_downmargin;
 	const char *bottomtitle;
 	bool clear;
 	int *get_height;
 	int *get_width;
 	bool no_lines;
 	bool shadow;
 	unsigned int sleep;
 	const char *title;
 	int y;
 	int x;
 	struct {
 		bool enable_esc;
 		const char *f1_file;
 		const char *f1_message;
 	} key;
 	struct {
 		unsigned int cols_per_row;
 		bool highlight;
 		unsigned int tablen;
 	} text;
 	struct {
 		bool align_left;
 		bool no_desc;
 		bool no_name;
 		bool on_without_ok;
 		bool shortcut_buttons;
 	} menu;
 	struct {
 		char securech;
 		char *securembch;
 		bool value_wchar;
 		bool value_without_ok;
 	} form;
 	struct {
 		bool always_active;
 		bool without_ok;
 		const char *ok_label;
 		bool with_extra;
 		const char *extra_label;
 		bool without_cancel;
 		const char *cancel_label;
 		bool default_cancel;
 		bool with_help;
 		const char *help_label;
 		const char *generic1_label;
 		const char *generic2_label;
 		const char *default_label;
 	} button;
 };
 .Ed
 .Pp
 .Bl -column -compact
 .It Fa conf.ascii_lines
 ascii characters to draw lines, default wide characters.
 .It Fa conf.auto_minheight
 minimum height if
 .Fa rows
 is
 .Dv BSDDIALOG_AUTOSIZE .
 .It Fa conf.auto_minwidth
 minimum width if
 .Fa cols
 is
 .Dv BSDDIALOG_AUTOSIZE .
 .It Fa conf.auto_topmargin
 top margin if
 .Fa rows
 is
 .Dv BSDDIALOG_AUTOSIZE
 or
 .Dv BSDDIALOG_FULLSCREEN ,
 .Fa conf.y
 has to be
 .Dv BSDDIALOG_CENTER .
 .It Fa conf.auto_downmargin
 down margin if
 .Fa rows
 is
 .Dv BSDDIALOG_AUTOSIZE
 or
 .Dv BSDDIALOG_FULLSCREEN .
 .It Fa conf.bottomtitle
 subtitle at the dialog bottom side.
 .It Fa conf.clear
 hide the dialog at exit.
 .It Fa conf.get_height
 if not
 .Dv NULL
 is set like the dialog height.
 .It Fa conf.get_width
 if not
 .Dv NULL
 is set like the dialog width.
 .It Fa conf.no_lines
 not draw lines.
 .It Fa conf.shadow
 draw shadow.
 .It Fa conf.sleep
 wait before to return, the value is in seconds.
 .It Fa conf.title
 title at the top dialog side.
 .It Fa conf.y
 vertical position, 0 is top screen size, can be
 .Dv BSDDIALOG_CENTER .
 .It Fa conf.x
 horizontal position, 0 is left screen side, can be
 .Dv BSDDIALOG_CENTER .
 .El
 .Pp
 .Bl -column -compact
 .It Fa conf.key.enable_esc
 enables
 .Dv ESC
 key to close the dialog.
 .It Fa conf.key.f1_file
 file to open if F1 is pressed.
 .It Fa conf.key.f1_message
 message to display if F1 is pressed.
 .El
 .Pp
 .Bl -column -compact
 .It Fa conf.text.cols_per_row
 Try to set the number of columns for a row of
 .Fa text
 with autosizing; default
 .Dv 10 .
 .It Fa conf.text.highlight
 enables highlights for
 .Fa text ,
 properly the following sequences are considered escapes:
 .It Dq \eZ0
 black.
 .It Dq \eZ1
 red.
 .It Dq \eZ2
 green.
 .It Dq \eZ3
 yellow.
 .It Dq \eZ4
 blue.
 .It Dq \eZ5
 magenta.
 .It Dq \eZ6
 cyan.
 .It Dq \eZ7
 white.
 .It Dq \eZr
 reverse foreground and background.
 .It Dq \eZR
 disable reverse.
 .It Dq \eZb
 bold.
 .It Dq \eZB
 disable bold.
 .It Dq \eZu
 underline.
 .It Dq \eZU
 disable underline.
 .It Dq \eZn
 disable each customization.
 .It Fa conf.text.tablen
 tab length for
 .Fa text
 argument and
 .Fn bsddialog_textbox
 function.
 .El
 .Pp
 .Bl -column -compact
 .It Fa conf.button.always_active
 buttons always active, avoidind focus switch between buttons and input fields or
 input boxes in
 .Fn bsddialog_form ,
-.Fn bsddialog_datebox
+.Fn bsddialog_datebox ,
+.Fn bsddialog_calendar
 and
 .Fn bsddialog_timebox .
 .It Fa conf.button.without_ok
 disable OK button.
 .It Fa conf.button.ok_label
 set label for OK button.
 .It Fa conf.button.with_extra
 add Extra button.
 .It Fa conf.button.extra_label
 set a label for Extra button.
 .It Fa conf.button.without_cancel
 disable Cancel button.
 .It Fa conf.button.cancel_label
 sets a label for Cancel button.
 .It Fa conf.button.default_cancel
 on startup focus on the Cancel button.
 .It Fa conf.button.with_help
 add Help button.
 .It Fa conf.button.help_label
 set a label for Help button.
 .It Fa conf.button.generic1_label
 add a button with the specified label.
 .It Fa conf.button.generic2_label
 add a button with the specified label.
 .It Fa conf.button.default_label
 focus on the button with the specified label.
 .El
 .Pp
 .Fn bsddialog_initconf
 initializes
 .Fa conf
 disabling each property, except
 .Fa conf.shadow
 to true,
 .Fa conf.y
 and
 .Fa conf.x
 to
-.Dv BSDDIALOG_CENTER .
+.Dv BSDDIALOG_CENTER ,
+.Fa conf.text.cols_per_row
+to
+.Dv 10 .
 .Pp
 .Fn bsddialog_infobox
 builds a dialog without buttons and returns instantly.
 .Fn bsddialog_msgbox
 builds a dialog with OK button.
 .Fn bsddialog_yesno
 provides a dialog for a
 .Dq Yes-No Question ,
 the labels on buttons are Yes and No.
 .Pp
 .Fn bsddialog_pause
 builds a dialog waiting until the timeout in
 .Fa seconds
 expires or a button is pressed.
 .Pp
+.Fn bsddialog_calendar
+and
 .Fn bsddialog_datebox
-builds a dialog to select a date,
+build a dialog to select a date,
 .Fa yy ,
 .Fa mm ,
 and
 .Fa dd
 are default values on startup, selected date at exit.
 .Fn bsddialog_timebox
 builds a dialog to choose a time,
 .Fa hh ,
 .Fa mm ,
 and
 .Fa ss
 are default values on startup, selected time at exit.
 .Pp
 .Fn bsddialog_checklist ,
 .Fn bsddialog_menu
 and
 .Fn bsddialog_radiolist
 build dialogs to select some item from a list via the SPACE key, an item is
 defined like:
 .Pp
 .Bd -literal -offset indent -compact
 struct bsddialog_menuitem {
 	const char *prefix;
 	bool on;
 	unsigned int depth;
 	const char *name;
 	const char *desc;
 	const char *bottomdesc;
 };
 .Ed
 .Pp
 .Fa prefix ,
 .Fa name
 and
 .Fa desc
 are strings to describe the item and are printed on its row,
 .Fa bottomdesc
 is printed on the bottom side of the screen,
 .Fa depth
 is a margin between the
 .Fa prefix
 and
 .Fa name
 useful to implement a
 .Dq treeview,
 .Fa on
 is set to
 .Dv true
 if the item is selected,
 .Dv false
 otherwise.
 .Fa items
 is an array of items of
 .Fa nitem
 elements,
 .Fa menurows
 specifies the graphical fixed height of the list, if
 .Fa cols
 is set to
 .Dv BSDDIALOG_AUTOSIZE
 .Fa menurows
 specifies a maximum value.
 Finally, if not
 .Dv NULL ,
 .Fa focusitem
 specifies the default item on startup and the last focused item at exit, could
 be a negative value if no item is focused.
 .Pp
 .Fn bsddialog_mixedlist
 builds a dialog with collections of checklists, radiolists and separators.
 A collection is a set defined like:
 .Pp
 .Bd -literal -offset indent -compact
-enum bsddialog_grouptype {
+enum bsddialog_menutype {
 	BSDDIALOG_CHECKLIST,
 	BSDDIALOG_RADIOLIST,
 	BSDDIALOG_SEPARATOR,
 };
 
 struct bsddialog_menugroup {
-	enum bsddialog_grouptype type;
+	enum bsddialog_menutype type;
 	unsigned int nitems;
 	struct bsddialog_menuitem *items;
 };
 .Ed
 .Pp
 .Fa groups
 is an array of sets of
 .Fa ngroups
 elements.
 .Fa menurows
 is the graphical height size for the list.
 If not
 .Dv NULL ,
 .Fa focuslist
 and
 .Fa focusitem
 specify the default item on startup and the last focused item at exit, could be
 a negative value if no item is focused.
 .Pp
 .Fn bsddialog_checklist ,
 .Fn bsddialog_menu ,
 .Fn bsddialog_mixedlist
 and
 .Fn bsddialog_radiolist
 can be costomizated by:
 .Bl -column -compact
 .It Fa conf.menu.align_left
 aligns items to left, default center.
 .It Fa conf.menu.no_desc
 hide description.
 .It Fa conf.menu.no_name
 hide names.
 .It Fa conf.menu.on_without_ok
 set items
 .Fa on
 also if the OK button is not pressed.
 .It Fa conf.menu.shortcut_buttons
 enable shortcut keys on buttons, default on items.
 .El
 .Pp
 .Fn bsddialog_form
 builds a dialog to display an array of
 .Fa items
 of
 .Fa nitems
 elements to get strings in input.
 .Fa formrows
 specifies the graphical height for the box around the items,
 .Dv 0
 for autosizing.
 An item is defined like:
 .Pp
 .Bd -literal -offset indent -compact
 struct bsddialog_formitem {
 	const char *label;
 	unsigned int ylabel;
 	unsigned int xlabel;
 
 	const char *init;
 	unsigned int yfield;
 	unsigned int xfield;
 	unsigned int fieldlen;
 	unsigned int maxvaluelen;
 	char *value;
 
 	unsigned int flags;
 
 	const char *bottomdesc;
 };
 .Ed
 .Pp
 .Fa label
 is a string to describe the request, it is printed at the position
 .Fa ylabel
 and
 .Fa xlabel .
 The field for the input is at the position
 .Fa yfield
 and
 .Fa xfield ,
 .Fa fieldlen
 is its graphical width, while
 .Fa maxvalelen
 is the maximum number of characters of the input string.
 .Fa init
 is the default field value.
 If the OK button is pressed
 .Fa value
 is the allocated memory with the current field string, its size depends on
 the current locale.
 .Fa flags
 is an OR value to set the
 .Dv BSDDIALOG_FIELDHIDDEN ,
 .Dv BSDDIALOG_FIELDREADONLY ,
 .Dv BSDDIALOG_FIELDNOCOLOR ,
 .Dv BSDDIALOG_FIELDCURSOREND ,
 .Dv BSDDIALOG_FIELDEXTEND
 and
 .Dv BSDDIALOG_FIELDSINGLEBYTE .
 flags for the field.
 .Fa bottomdesc
 is printed on the bottom side of the screen if the item is focused.
 .Pp
 .Fn bsddialog_form
 can be customized by:
 .Bl -column -compact
 .It Fa conf.form.securech
 charachter to hide the input with
 .Dv BSDDIALOG_FIELDHIDDEN .
 .It Fa conf.form.securembch
 multibyte charachter to hide the input with
 .Dv BSDDIALOG_FIELDHIDDEN ,
 .Fa conf.form.securech
 is ignored.
 .It Fa conf.form.value_wchar
 the allocated
 .Fa value
 is a
 .Em wchar_t*
 string.
 .It Fa conf.form.value_without_ok
 allocate memory and set
 .Fa value
 also if the OK button is not pressed.
 .El
 .Pp
 .Fn bsddialog_gauge
 builds a dialog with a bar to shows
 .Fa perc ,
 if the file descriptor
 .Fa fd
 is greater or equal to 0 the dialog waits to read
 .Fa separator
 from it, then the first string replaces
 .Fa perc
 and the following strings replace
 .Fa text
 until the next
 .Fa separator ,
 the loop ends reading
 .Dv EOF .
 .Pp
 .Fn bsddialog_mixedgauge
 draws a main bar with the
 .Fa mainperc
 percentage and
 .Fa nminibars
 each one with a
 .Fa minilabel
 and a
 .Fa miniperc
 with a value between 0 and 100 or
 .Dv BSDDIALOG_MG_SUCCEEDED ,
 .Dv BSDDIALOG_MG_FAILED ,
 .Dv BSDDIALOG_MG_PASSED ,
 .Dv BSDDIALOG_MG_COMPLETED ,
 .Dv BSDDIALOG_MG_CHECKED ,
 .Dv BSDDIALOG_MG_DONE ,
 .Dv BSDDIALOG_MG_SKIPPED ,
 .Dv BSDDIALOG_MG_INPROGRESS ,
 .Dv BSDDIALOG_MG_BLANK ,
 .Dv BSDDIALOG_MG_NA
 or
 .Dv BSDDIALOG_MG_PENDING
 to print a descriptive string.
 .Pp
 .Fn bsddialog_rangebox
 to select a value between
 .Fa min
 and
 .Fa max .
 .Fa value
 is the default value on startup and the selected value at exit.
 The current value is printed inside a bar, the keys UP, DOWN, HOME, END, PAGEUP
 and PAGEDOWN can change it.
 .Pp
 .Fn bsddialog_textbox
 opens and prints
 .Fa file
 in a dialog, the UP, DOWN, HOME, END, PAGEUP and PAGEDOWN keys are availble to
 navigate the file.
 OK button is renamed EXIT.
 .Ss Theme
 The graphical properties are global to the library, they are represented by
 .Fa struct bsddialog_theme
 and can be customized at runtime via the
 .In bsddialog_theme.h
 API.
 .Pp
 .Bd -literal -offset indent -compact
 struct bsddialog_theme {
 	struct {
 		int color;
 	} screen;
 	struct {
 		int color;
 		unsigned int y;
 		unsigned int x;
 	} shadow;
 	struct {
 		int  color;
 		bool delimtitle;
 		int  titlecolor;
 		int  lineraisecolor;
 		int  linelowercolor;
 		int  bottomtitlecolor;
 		int  arrowcolor;
 	} dialog;
 	struct {
 		int f_selectorcolor;
 		int selectorcolor;
 		int f_namecolor;
 		int namecolor;
 		int f_desccolor;
 		int desccolor;
 		int namesepcolor;
 		int descsepcolor;
 		int f_shortcutcolor;
 		int shortcutcolor;
 		int bottomdesccolor;
 	} menu;
 	struct {
 		int f_fieldcolor;
 		int fieldcolor;
 		int readonlycolor;
 		int bottomdesccolor;
 	} form;
 	struct {
 		int f_color;
 		int color;
 	} bar;
 	struct {
 		unsigned int minmargin;
 		unsigned int maxmargin;
 		char leftdelim;
 		char rightdelim;
 		int delimcolor;
 		int f_delimcolor;
 		int color;
 		int f_color;
 		int shortcutcolor;
 		int f_shortcutcolor;
 	} button;
 };
 .Ed
 .Pp
 A member with the
 .Dq f_
 prefix refers to an element with focus.
 .Pp
 .Fn bsddialog_get_theme
 sets
 .Fa theme
 like the current theme.
 .Pp
 A color can be set by the value returned by
 .Fn bsddialog_color ,
 Possible values for
 .Fa background
 and
 .Fa foreground
 are:
 .Dv BSDDIALOG_BLACK ,
 .Dv BSDDIALOG_RED ,
 .Dv BSDDIALOG_GREEN ,
 .Dv BSDDIALOG_YELLOW ,
 .Dv BSDDIALOG_BLUE ,
 .Dv BSDDIALOG_MAGENTA ,
 .Dv BSDDIALOG_CYAN ,
 and
 .Dv BSDDIALOG_WHITE ,
 .Fa flags
 specifies OR-flags, possible values:
 .Dv BSDDIALOG_BOLD ,
 .Dv BSDDIALOG_REVERSE
 and
 .Dv BSDDIALOG_UNDERLINE .
 .Fn bsddialog_color_attrs
 gets the properties of a color.
 .Pp
 .Fn bsddialog_set_theme
 sets
 .Fa theme
 like current theme, the changes takes effect only for dialogs built after the
 call.
 .Pp
 The library provides predefined themes:
 .Dv BSDDIALOG_THEME_BLACKWHITE ,
 .Dv BSDDIALOG_THEME_BSDDIALOG ,
 .Dv BSDDIALOG_THEME_FLAT
 and
 .Dv BSDDIALOG_THEME_DIALOG ,
 they can be set via
 .Fn bsddialog_set_default_theme .
 .Pp
 .Fn bsddialog_hascolors
 returns
 .Dv true
 if the terminal provides colors,
 .Dv false
 otherwise.
 .Sh RETURN VALUES
 The functions return the value
 .Dv BSDDIALOG_ERROR
 if unsuccessful;
 otherwise, depending on the pressed button, the following values can be
 returned:
 .Dv BSDDIALOG_OK ,
 .Dv BSDDIALOG_CANCEL ,
 .Dv BSDDIALOG_HELP ,
 .Dv BSDDIALOG_EXTRA ,
 .Dv BSDDIALOG_GENERIC1
 or
 .Dv BSDDIALOG_GENERIC2 .
 .Dv BSDDIALOG_YES
 and
 .Dv BSDDIALOG_NO
 are aliases for
 .Dv BSDDIALOG_OK
 and
 .Dv BSDDIALOG_CANCEL ,
 respectively.
 .Pp
 The functions return
 .Dv BSDDIALOG_ESC
 if
 .Fa conf.key.enable_esc
 is enabled and the ESC key is pressed.
 .Pp
 .Fn bsddialog_pause
 returns
 .Dv BSDDIALOG_TIMEOUT
 if the timeout expires.
 .Sh EXAMPLES
 .Dq Yes-No Question
 Example:
 .Pp
 .Bd -literal -offset indent -compact
 int output;
 struct bsddialog_conf conf;
 
 if (bsddialog_init() == BSDDIALOG_ERROR)
 	return (1);
 
 bsddialog_initconf(&conf);
 conf.title = "yesno";
 output = bsddialog_yesno(&conf, "Example", 7, 25);
 
 bsddialog_end();
 
 switch (output) {
 case BSDDIALOG_YES:
 	printf("Yes\\n");
 	break;
 case BSDDIALOG_NO
 	printf("NO\\n");
 	break;
 case BSDDIALOG_ERROR:
 	printf("Error: %s\\n", bsddialog_geterror());
 }
 .Ed
 .Pp
 Theme Example:
 .Pp
 .Bd -literal -offset indent -compact
 struct bsddialog_conf conf;
 struct bsddialog_theme theme;
 
 bsddialog_init();
 
 bsddialog_initconf(&conf);
 bsddialog_msgbox(&conf, "Default theme", 7, 25);
 
 bsddialog_get_theme(&theme);
 theme.screen.color = bsddialog_color(BSDDIALOG_RED, BSDDIALOG_GREEN,
     BSDDIALOG_BOLD);
 bsddialog_set_theme(&theme);
 bsddialog_backtitle(&conf, "Red foreground and Green background");
 bsddialog_msgbox(&conf, "Change screen color", 7, 25);
 
 bsddialog_set_default_theme(BSDDIALOG_THEME_BLACKWHITE);
 bsddialog_msgbox(&conf, "Black and White theme", 7, 25);
 
 bsddialog_end();
 .Ed
 .Pp
 Mixedlist Example:
 .Pp
 .Bd -literal -offset indent -compact
 unsigned int i, j;
 struct bsddialog_conf conf;
 struct bsddialog_menuitem item;
 struct bsddialog_menuitem check[2] = {
     { "1", true,  0, "Name 1", "Desc 1", "Check Bottom Desc 1" },
     { "2", false, 0, "Name 2", "Desc 2", "Check Bottom Desc 2" }
 };
 struct bsddialog_menuitem sep[1] = {
     { "3", true, 0, "Radiolist", "(desc)", "" }
 };
-struct bsddialog_menuitem radio[5] = {
+struct bsddialog_menuitem radio[2] = {
     { "4", true,  0, "Name 1", "Desc 1", "Radio Bottom Desc 1" },
     { "5", false, 0, "Name 2", "Desc 2", "Radio Bottom Desc 2" }
 };
 struct bsddialog_menugroup group[3] = {
     { BSDDIALOG_CHECKLIST, 2, check },
     { BSDDIALOG_SEPARATOR, 1, sep   },
     { BSDDIALOG_RADIOLIST, 2, radio }
 };
 
 bsddialog_init();
 bsddialog_initconf(&conf);
 bsddialog_mixedlist(&conf, "Example", 20, 30, 11, 3, group, NULL,
     NULL);
 bsddialog_end();
 
 for (i = 0; i < 3; i++) {
 	for (j = 0; j < group[i].nitems; j++) {
 		item = group[i].items[j];
 		switch (item.type) {
 		case BSDDIALOG_SEPARATOR:
 			printf("---- %s ----\\n", item.name);
 			break;
 		case BSDDIALOG_RADIOLIST:
 			printf(" (%c) %s\\n",
 			    item.on ? '*' : ' ', item.name);
 			break;
 		case BSDDIALOG_CHECKLIST:
 			printf(" [%c] %s\\n",
 			    item.on ? 'X' : ' ', item.name);
 			break;
 		}
 	}
 }
 .Ed
 .Sh SEE ALSO
 .Xr bsddialog 1 ,
 .Xr curses 3
 .Sh HISTORY
 The
 .Nm bsddialog
 library first appeared in
 .Fx 14.0 .
 .Sh AUTHORS
 .Nm bsddialog
 was written by
 .An Alfonso Sabato Siciliano Aq Mt asiciliano@FreeBSD.org .
diff --git a/lib/bsddialog.h b/lib/bsddialog.h
index 6f13da3fa667..ce6aac6d4632 100644
--- a/lib/bsddialog.h
+++ b/lib/bsddialog.h
@@ -1,242 +1,246 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _LIBBSDDIALOG_H_
 #define _LIBBSDDIALOG_H_
 
 #include <stdbool.h>
 
-#define LIBBSDDIALOG_VERSION     "0.3"
+#define LIBBSDDIALOG_VERSION     "0.4"
 
 /* Exit status */
 #define BSDDIALOG_ERROR          -1
 #define BSDDIALOG_OK              0
 #define BSDDIALOG_YES             BSDDIALOG_OK
 #define BSDDIALOG_CANCEL          1
 #define BSDDIALOG_NO              BSDDIALOG_CANCEL
 #define BSDDIALOG_HELP            2
 #define BSDDIALOG_EXTRA           3
 #define BSDDIALOG_TIMEOUT         4
 #define BSDDIALOG_ESC             5
 #define BSDDIALOG_GENERIC1        6
 #define BSDDIALOG_GENERIC2        7
 
 /* Size and position */
 #define BSDDIALOG_FULLSCREEN     -1
 #define BSDDIALOG_AUTOSIZE        0
 #define BSDDIALOG_CENTER         -1
 
 /* Mixedgauge */
 #define BSDDIALOG_MG_SUCCEEDED   -1
 #define BSDDIALOG_MG_FAILED      -2
 #define BSDDIALOG_MG_PASSED      -3
 #define BSDDIALOG_MG_COMPLETED   -4
 #define BSDDIALOG_MG_CHECKED     -5
 #define BSDDIALOG_MG_DONE        -6
 #define BSDDIALOG_MG_SKIPPED     -7
 #define BSDDIALOG_MG_INPROGRESS  -8
 #define BSDDIALOG_MG_BLANK       -9
 #define BSDDIALOG_MG_NA          -10
 #define BSDDIALOG_MG_PENDING     -11
 
 /* Form */
 #define BSDDIALOG_FIELDHIDDEN      1U
 #define BSDDIALOG_FIELDREADONLY    2U
 #define BSDDIALOG_FIELDNOCOLOR     4U
 #define BSDDIALOG_FIELDCURSOREND   8U
 #define BSDDIALOG_FIELDEXTEND      16U
 #define BSDDIALOG_FIELDSINGLEBYTE  32U
 
 struct bsddialog_conf {
 	bool ascii_lines;
 	unsigned int auto_minheight;
 	unsigned int auto_minwidth;
 	unsigned int auto_topmargin;
 	unsigned int auto_downmargin;
 	const char *bottomtitle;
 	bool clear;
 	int *get_height;
 	int *get_width;
 	bool no_lines;
 	bool shadow;
 	unsigned int sleep;
 	const char *title;
 	int y;
 	int x;
 	struct {
 		bool enable_esc;
 		const char *f1_file;
 		const char *f1_message;
 	} key;
 	struct {
 		unsigned int cols_per_row;
 		bool highlight;
 		unsigned int tablen;
 	} text;
 	struct {
 		bool align_left;
 		bool no_desc;
 		bool no_name;
 		bool on_without_ok;
 		bool shortcut_buttons;
 	} menu;
 	struct {
 		char securech;
 		char *securembch;
 		bool value_wchar;
 		bool value_without_ok;
 	} form;
 	struct {
 		bool always_active;
 		bool without_ok;
 		const char *ok_label;
 		bool with_extra;
 		const char *extra_label;
 		bool without_cancel;
 		const char *cancel_label;
 		bool default_cancel;
 		bool with_help;
 		const char *help_label;
 		const char *generic1_label;
 		const char *generic2_label;
 		const char *default_label;
 	} button;
 };
 
 struct bsddialog_menuitem {
 	const char *prefix;
 	bool on;
 	unsigned int depth;
 	const char *name;
 	const char *desc;
 	const char *bottomdesc;
 };
 
-enum bsddialog_grouptype {
+enum bsddialog_menutype {
 	BSDDIALOG_CHECKLIST,
 	BSDDIALOG_RADIOLIST,
 	BSDDIALOG_SEPARATOR,
 };
 
 struct bsddialog_menugroup {
-	enum bsddialog_grouptype type;
+	enum bsddialog_menutype type;
 	unsigned int nitems;
 	struct bsddialog_menuitem *items;
 };
 
 struct bsddialog_formitem {
 	const char *label;
 	unsigned int ylabel;
 	unsigned int xlabel;
 
 	const char *init;
 	unsigned int yfield;
 	unsigned int xfield;
 	unsigned int fieldlen;
 	unsigned int maxvaluelen;
 	char *value;
 	unsigned int flags;
 
 	const char *bottomdesc;
 };
 
 int bsddialog_init(void);
 int bsddialog_init_notheme(void);
 int bsddialog_end(void);
 int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle);
 int bsddialog_initconf(struct bsddialog_conf *conf);
 int bsddialog_clearterminal(void);
 const char *bsddialog_geterror(void);
 
 /* Dialogs */
+int
+bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows,
+    int cols, unsigned int *yy, unsigned int *mm, unsigned int *dd);
+
 int
 bsddialog_checklist(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int menurows, unsigned int nitems,
     struct bsddialog_menuitem *items, int *focusitem);
 
 int
 bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int *yy, unsigned int *mm, unsigned int *dd);
 
 int
 bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int formheight, unsigned int nitems,
     struct bsddialog_formitem *items);
 
 int
 bsddialog_gauge(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int perc, int fd, const char *sep);
 
 int
 bsddialog_infobox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols);
 
 int
 bsddialog_menu(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int menurows, unsigned int nitems,
     struct bsddialog_menuitem *items, int *focusitem);
 
 int
 bsddialog_mixedgauge(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int mainperc, unsigned int nminibars,
     const char **minilabels, int *minipercs);
 
 int
 bsddialog_mixedlist(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int menurows, unsigned int ngroups,
     struct bsddialog_menugroup *groups, int *focuslist, int *focusitem);
 
 int
 bsddialog_msgbox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols);
 
 int
 bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int seconds);
 
 int
 bsddialog_radiolist(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int menurows, unsigned int nitems,
     struct bsddialog_menuitem *items, int *focusitem);
 
 int
 bsddialog_rangebox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, int min, int max, int *value);
 
 int
 bsddialog_textbox(struct bsddialog_conf *conf, const char *file, int rows,
     int cols);
 
 int
 bsddialog_timebox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int *hh, unsigned int *mm, unsigned int *ss);
 
 int
 bsddialog_yesno(struct bsddialog_conf *conf, const char *text, int rows,
     int cols);
 
 #endif
diff --git a/lib/calendarbox.c b/lib/calendarbox.c
new file mode 100644
index 000000000000..3b55b26a13b8
--- /dev/null
+++ b/lib/calendarbox.c
@@ -0,0 +1,520 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Alfonso Sabato Siciliano
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/param.h>
+
+#include <curses.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "bsddialog.h"
+#include "bsddialog_theme.h"
+#include "lib_util.h"
+
+#define MINHCAL   13
+#define MINWCAL   36 /* 34 calendar, 1 + 1 margins */
+#define MINYEAR   1900
+#define MAXYEAR   999999999
+
+static int month_days(int yy, int mm)
+{
+	int days;
+
+	if (mm == 2)
+		days = ISLEAP(yy) ? 29 : 28;
+	else if (mm == 4 || mm == 6 || mm == 9 || mm == 11)
+		days = 30;
+	else
+		days = 31;
+
+	return (days);
+}
+
+enum operation {
+	UP_DAY,
+	DOWN_DAY,
+	LEFT_DAY,
+	RIGHT_DAY,
+	UP_MONTH,
+	DOWN_MONTH,
+	UP_YEAR,
+	DOWN_YEAR
+};
+
+static void datectl(enum operation op, int *yy, int *mm, int *dd)
+{
+	int ndays;
+
+	ndays = month_days(*yy, *mm);
+
+	switch (op) {
+	case UP_DAY:
+		if (*dd > 7)
+			*dd -= 7;
+		else {
+			if (*mm == 1) {
+				*yy -= 1;
+				*mm = 12;
+			} else
+				*mm -= 1;
+			ndays = month_days(*yy, *mm);
+			*dd = ndays - abs(7 - *dd);
+		}
+		break;
+	case DOWN_DAY:
+		if (*dd + 7 < ndays)
+			*dd += 7;
+		else {
+			if (*mm == 12) {
+				*yy += 1;
+				*mm = 1;
+			} else
+				*mm += 1;
+			*dd = *dd + 7 - ndays;
+		}
+		break;
+	case LEFT_DAY:
+		if (*dd > 1)
+			*dd -= 1;
+		else {
+			if (*mm == 1) {
+				*yy -= 1;
+				*mm = 12;
+			} else
+				*mm -= 1;
+			*dd = month_days(*yy, *mm);
+		}
+		break;
+	case RIGHT_DAY:
+		if (*dd < ndays)
+			*dd += 1;
+		else {
+			if (*mm == 12) {
+				*yy += 1;
+				*mm = 1;
+			} else
+				*mm += 1;
+			*dd = 1;
+		}
+		break;
+	case UP_MONTH:
+		if (*mm == 1) {
+			*mm = 12;
+			*yy -= 1;
+		} else
+			*mm -= 1;
+		ndays = month_days(*yy, *mm);
+		if (*dd > ndays)
+			*dd = ndays;
+		break;
+	case DOWN_MONTH:
+		if (*mm == 12) {
+			*mm = 1;
+			*yy += 1;
+		} else
+			*mm += 1;
+		ndays = month_days(*yy, *mm);
+		if (*dd > ndays)
+			*dd = ndays;
+		break;
+	case UP_YEAR:
+		*yy -= 1;
+		ndays = month_days(*yy, *mm);
+		if (*dd > ndays)
+			*dd = ndays;
+		break;
+	case DOWN_YEAR:
+		*yy += 1;
+		ndays = month_days(*yy, *mm);
+		if (*dd > ndays)
+			*dd = ndays;
+		break;
+	}
+
+	if (*yy < MINYEAR) {
+		*yy = MINYEAR;
+		*mm = 1;
+		*dd = 1;
+	}
+	if (*yy > MAXYEAR) {
+		*yy = MAXYEAR;
+		*mm = 12;
+		*dd = 31;
+	}
+}
+
+static int week_day(int yy, int mm, int dd)
+{
+	int wd;
+
+	dd += mm < 3 ? yy-- : yy - 2;
+	wd = 23*mm/9 + dd + 4 + yy/4 - yy/100 + yy/400;
+	wd %= 7;
+
+	return (wd);
+}
+
+static void
+print_calendar(struct bsddialog_conf *conf, WINDOW *win, int yy, int mm, int dd,
+    bool active)
+{
+	int ndays, i, y, x, wd, h, w;
+
+	getmaxyx(win, h, w);
+	wclear(win);
+	draw_borders(conf, win, h, w, RAISED);
+	if (active) {
+		wattron(win, t.dialog.arrowcolor);
+		mvwhline(win, 0, 15, conf->ascii_lines ? '^' : ACS_UARROW, 4);
+		mvwhline(win, h-1, 15, conf->ascii_lines ? 'v' : ACS_DARROW, 4);
+		mvwvline(win, 3, 0, conf->ascii_lines ? '<' : ACS_LARROW, 3);
+		mvwvline(win, 3, w-1, conf->ascii_lines ? '>' : ACS_RARROW, 3);
+		wattroff(win, t.dialog.arrowcolor);
+	}
+
+	mvwaddstr(win, 1, 5, "Sun Mon Tue Wed Thu Fri Sat");
+	ndays = month_days(yy, mm);
+	y = 2;
+	wd = week_day(yy, mm, 1);
+	for (i = 1; i <= ndays; i++) {
+		x = 5 + (4 * wd); /* x has to be 6 with week number */
+		wmove(win, y, x);
+		mvwprintw(win, y, x, "%2d", i);
+		if (i == dd) {
+			wattron(win, t.menu.f_namecolor);
+			mvwprintw(win, y, x, "%2d", i);
+			wattroff(win, t.menu.f_namecolor);
+		}
+		wd++;
+		if (wd > 6) {
+			wd = 0;
+			y++;
+		}
+	}
+
+	wrefresh(win);
+}
+
+static void
+drawsquare(struct bsddialog_conf *conf, WINDOW *win, const char *fmt,
+    const void *value, bool focus)
+{
+	int h, w;
+
+	getmaxyx(win, h, w);
+	draw_borders(conf, win, h, w, RAISED);
+	if (focus) {
+		wattron(win, t.dialog.arrowcolor);
+		mvwhline(win, 0, 7, conf->ascii_lines ? '^' : ACS_UARROW, 3);
+		mvwhline(win, 2, 7, conf->ascii_lines ? 'v' : ACS_DARROW, 3);
+		wattroff(win, t.dialog.arrowcolor);
+	}
+
+	if (focus)
+		wattron(win, t.menu.f_namecolor);
+	if (strchr(fmt, 's') != NULL)
+		mvwprintw(win, 1, 1, fmt, (const char*)value);
+	else
+		mvwprintw(win, 1, 1, fmt, *((const int*)value));
+	if (focus)
+		wattroff(win, t.menu.f_namecolor);
+
+	wrefresh(win);
+}
+
+static int
+calendar_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
+    int *w, const char *text, struct buttons bs)
+{
+	int htext, wtext;
+
+	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE) {
+		if (text_size(conf, rows, cols, text, &bs, MINHCAL, MINWCAL,
+		    &htext, &wtext) != 0)
+			return (BSDDIALOG_ERROR);
+	}
+
+	if (cols == BSDDIALOG_AUTOSIZE)
+		*w = widget_min_width(conf, wtext, MINWCAL, &bs);
+
+	if (rows == BSDDIALOG_AUTOSIZE)
+		*h = widget_min_height(conf, htext, MINHCAL, true);
+
+	return (0);
+}
+
+static int calendar_checksize(int rows, int cols, struct buttons bs)
+{
+	int mincols;
+
+	mincols = MAX(MINWCAL, buttons_min_width(bs));
+	mincols += VBORDERS;
+
+	if (cols < mincols)
+		RETURN_ERROR("Few cols for this calendar (at least 38)");
+
+	if (rows < MINHCAL + 2 + 2) /* 2 buttons + 2 borders */
+		RETURN_ERROR("Few rows for calendar (at least 17)");
+
+	return (0);
+}
+
+int
+bsddialog_calendar(struct bsddialog_conf *conf, const char *text, int rows,
+    int cols, unsigned int *yy, unsigned int *mm, unsigned int *dd)
+{
+	bool loop, focusbuttons;
+	int retval, y, x, h, w, sel, ycal, xcal, year, month, day;
+	wint_t input;
+	WINDOW *widget, *textpad, *shadow, *yearwin, *monthwin, *daywin;
+	struct buttons bs;
+	const char *m[12] = {
+		"January", "February", "March", "April", "May", "June", "July",
+		"August", "September", "October", "November", "December"
+	};
+
+	if (yy == NULL || mm == NULL || dd == NULL)
+		RETURN_ERROR("yy / mm / dd cannot be NULL");
+
+	year = *yy > MAXYEAR ? MAXYEAR : *yy;
+	if (year < MINYEAR)
+		year = MINYEAR;
+	month = *mm > 12 ? 12 : *mm;
+	if (month == 0)
+		month = 1;
+	day = *dd == 0 ? 1 : *dd;
+	if(day > month_days(year, month))
+		day = month_days(year, month);
+
+	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
+
+	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
+		return (BSDDIALOG_ERROR);
+	if (calendar_autosize(conf, rows, cols, &h, &w, text, bs) != 0)
+		return (BSDDIALOG_ERROR);
+	if (calendar_checksize(h, w, bs) != 0)
+		return (BSDDIALOG_ERROR);
+	if (set_widget_position(conf, &y, &x, h, w) != 0)
+		return (BSDDIALOG_ERROR);
+
+	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
+	    true) != 0)
+		return (BSDDIALOG_ERROR);
+
+	pnoutrefresh(textpad, 0, 0, y+1, x+2, y+h-17, x+w-2);
+	doupdate();
+
+	ycal = y + h - 15;
+	xcal = x + w/2 - 17;
+	mvwaddstr(widget, h - 16, w/2 - 17, "Month");
+	monthwin = new_boxed_window(conf, ycal, xcal, 3, 17, RAISED);
+	mvwaddstr(widget, h - 16, w/2, "Year");
+	yearwin = new_boxed_window(conf, ycal, xcal + 17, 3, 17, RAISED);
+	daywin = new_boxed_window(conf, ycal + 3, xcal, 9, 34, RAISED);
+
+	wrefresh(widget);
+
+	sel = -1;
+	loop = focusbuttons = true;
+	while (loop) {
+		drawsquare(conf, monthwin, "%15s", m[month - 1], sel == 0);
+		drawsquare(conf, yearwin, "%15d", &year, sel == 1);
+		print_calendar(conf, daywin, year, month, day, sel == 2);
+
+		if (get_wch(&input) == ERR)
+			continue;
+		switch(input) {
+		case KEY_ENTER:
+		case 10: /* Enter */
+			if (focusbuttons || conf->button.always_active) {
+				retval = bs.value[bs.curr];
+				loop = false;
+			}
+			break;
+		case 27: /* Esc */
+			if (conf->key.enable_esc) {
+				retval = BSDDIALOG_ESC;
+				loop = false;
+			}
+			break;
+		case '\t': /* TAB */
+			if (focusbuttons) {
+				bs.curr++;
+				if (bs.curr >= (int)bs.nbuttons) {
+					focusbuttons = false;
+					sel = 0;
+					bs.curr = conf->button.always_active ?
+					    0 : -1;
+				}
+			} else {
+				sel++;
+				if (sel > 2) {
+					focusbuttons = true;
+					sel = -1;
+					bs.curr = 0;
+				}
+			}
+			draw_buttons(widget, bs, true);
+			wrefresh(widget);
+			break;
+		case KEY_RIGHT:
+			if (focusbuttons) {
+				bs.curr++;
+				if (bs.curr >= (int)bs.nbuttons) {
+					focusbuttons = false;
+					sel = 0;
+					bs.curr = conf->button.always_active ?
+					    0 : -1;
+				}
+			} else if (sel == 2) {
+				datectl(RIGHT_DAY, &year, &month, &day);
+			} else { /* Month or Year*/
+				sel++;
+			}
+			draw_buttons(widget, bs, true);
+			wrefresh(widget);
+			break;
+		case KEY_LEFT:
+			if (focusbuttons) {
+				bs.curr--;
+				if (bs.curr < 0) {
+					focusbuttons = false;
+					sel = 2;
+					bs.curr = conf->button.always_active ?
+					    0 : -1;
+				}
+			} else if (sel == 2) {
+				datectl(LEFT_DAY, &year, &month, &day);
+			} else if (sel == 1) {
+				sel = 0;
+			} else { /* sel = 0, Month */
+				focusbuttons = true;
+				sel = -1;
+				bs.curr = 0;
+			}
+			draw_buttons(widget, bs, true);
+			wrefresh(widget);
+			break;
+		case KEY_UP:
+			if (focusbuttons) {
+				sel = 2;
+				focusbuttons = false;
+				bs.curr = conf->button.always_active ? 0 : -1;
+				draw_buttons(widget, bs, true);
+				wrefresh(widget);
+			} else if (sel == 0) {
+				datectl(UP_MONTH, &year, &month, &day);
+			} else if (sel == 1) {
+				datectl(UP_YEAR, &year, &month, &day);
+			} else { /* sel = 2 */
+				datectl(UP_DAY, &year, &month, &day);
+			}
+			break;
+		case KEY_DOWN:
+			if (focusbuttons) {
+				break;
+			} else if (sel == 0) {
+				datectl(DOWN_MONTH, &year, &month, &day);
+			} else if (sel == 1) {
+				datectl(DOWN_YEAR, &year, &month, &day);
+			} else { /* sel = 2 */
+				datectl(DOWN_DAY, &year, &month, &day);
+			}
+			break;
+		case KEY_HOME:
+			datectl(UP_MONTH, &year, &month, &day);
+			break;
+		case KEY_END:
+			datectl(DOWN_MONTH, &year, &month, &day);
+			break;
+		case KEY_PPAGE:
+			datectl(UP_YEAR, &year, &month, &day);
+			break;
+		case KEY_NPAGE:
+			datectl(DOWN_YEAR, &year, &month, &day);
+			break;
+		case KEY_F(1):
+			if (conf->key.f1_file == NULL &&
+			    conf->key.f1_message == NULL)
+				break;
+			if (f1help(conf) != 0)
+				return (BSDDIALOG_ERROR);
+			/* No break, screen size can change */
+		case KEY_RESIZE:
+			/* Important for decreasing screen */
+			hide_widget(y, x, h, w, conf->shadow);
+			refresh();
+
+			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
+				return (BSDDIALOG_ERROR);
+			if (calendar_autosize(conf, rows, cols, &h, &w, text,
+			    bs) != 0)
+				return (BSDDIALOG_ERROR);
+			if (calendar_checksize(h, w, bs) != 0)
+				return (BSDDIALOG_ERROR);
+			if (set_widget_position(conf, &y, &x, h, w) != 0)
+				return (BSDDIALOG_ERROR);
+
+			if (update_dialog(conf, shadow, widget, y, x, h, w,
+			    textpad, text, &bs, true) != 0)
+				return (BSDDIALOG_ERROR);
+			pnoutrefresh(textpad, 0, 0, y+1, x+2, y+h-17, x+w-2);
+			doupdate();
+
+			ycal = y + h - 15;
+			xcal = x + w/2 - 17;
+			mvwaddstr(widget, h - 16, w/2 - 17, "Month");
+			mvwin(monthwin, ycal, xcal);
+			mvwaddstr(widget, h - 16, w/2, "Year");
+			mvwin(yearwin, ycal, xcal + 17);
+			mvwin(daywin, ycal + 3, xcal);
+			wrefresh(widget);
+
+			/* Important to avoid grey lines expanding screen */
+			refresh();
+			break;
+		default:
+			if (shortcut_buttons(input, &bs)) {
+				retval = bs.value[bs.curr];
+				loop = false;
+			}
+		}
+	}
+
+	if (retval == BSDDIALOG_OK) {
+		*yy = year;
+		*mm = month;
+		*dd = day;
+	}
+
+	delwin(yearwin);
+	delwin(monthwin);
+	delwin(daywin);
+	end_dialog(conf, shadow, widget, textpad);
+
+	return (retval);
+}
\ No newline at end of file
diff --git a/lib/formbox.c b/lib/formbox.c
index cd29919417be..5b1d2ab61de2 100644
--- a/lib/formbox.c
+++ b/lib/formbox.c
@@ -1,944 +1,941 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <curses.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
 struct privateitem {
 	const char *label;      /* formitem.label */
 	unsigned int ylabel;    /* formitem.ylabel */
 	unsigned int xlabel;    /* formitem.xlabel */
 	unsigned int yfield;    /* formitem.yfield */
 	unsigned int xfield;    /* formitem.xfield */
 	bool secure;            /* formitem.flags & BSDDIALOG_FIELDHIDDEN */
 	bool readonly;          /* formitem.flags & BSDDIALOG_FIELDREADONLY */
 	bool fieldnocolor;      /* formitem.flags & BSDDIALOG_FIELDNOCOLOR */
 	bool extendfield;       /* formitem.flags & BSDDIALOG_FIELDEXTEND */
 	bool fieldonebyte;      /* formitem.flags & BSDDIALOG_FIELDSINGLEBYTE */
 	bool cursorend;         /* formitem.flags & BSDDIALOG_FIELDCURSOREND */
 	bool cursor;            /* field cursor visibility */
 	const char *bottomdesc; /* formitem.bottomdesc */
 
 	wchar_t *privwbuf;       /* formitem.value */
 	wchar_t *pubwbuf;        /* string for drawitem() */
 	unsigned int maxletters; /* formitem.maxvaluelen, [priv|pub]wbuf size */
 	unsigned int nletters;   /* letters in privwbuf and pubwbuf */
 	unsigned int pos;        /* pos in privwbuf and pubwbuf */
 	unsigned int fieldcols;  /* formitem.fieldlen */
 	unsigned int xcursor;    /* position in fieldcols [0 - fieldcols-1] */
 	unsigned int xposdraw;   /* first pubwbuf index to draw */
 };
 
 struct privateform {
 	WINDOW *border;
 
 	WINDOW *pad;
 	unsigned int h;    /* only to create pad */
 	unsigned int w;    /* only to create pad */
 	unsigned int wmin; /* to refresh, w can change for FIELDEXTEND */
 	unsigned int ys;   /* to refresh */
 	unsigned int ye;   /* to refresh */
 	unsigned int xs;   /* to refresh */
 	unsigned int xe;   /* to refresh */
 	unsigned int y;    /* changes moving focus around items */
 	unsigned int viewrows;    /* visible rows, real formheight */
 	unsigned int minviewrows; /* min viewrows, ylabel != yfield */
 
 	wchar_t securewch; /* wide char of conf.form.secure[mb]ch */
 };
 
 enum operation {
 	MOVE_CURSOR_BEGIN,
 	MOVE_CURSOR_END,
 	MOVE_CURSOR_RIGHT,
 	MOVE_CURSOR_LEFT,
 	DEL_LETTER
 };
 
 static bool fieldctl(struct privateitem *item, enum operation op)
 {
 	bool change;
 	int width, oldwidth, nextwidth, cols;
 	unsigned int i;
 
 	change = false;
 	switch (op){
 	case MOVE_CURSOR_BEGIN:
 		if (item->pos == 0 && item->xcursor == 0)
 			break;
 		/* here the cursor is changed */
 		change = true;
 		item->pos = 0;
 		item->xcursor = 0;
 		item->xposdraw = 0;
 		break;
 	case MOVE_CURSOR_END:
 		while (fieldctl(item, MOVE_CURSOR_RIGHT))
 			change = true;
 		break;
 	case MOVE_CURSOR_LEFT:
 		if (item->pos == 0)
 			break;
 		/* check redundant by item->pos == 0 because of 'while' below */
 		if (item->xcursor == 0 && item->xposdraw == 0)
 			break;
 		/* here some letter to left */
 		change = true;
 		item->pos -= 1;
 		width = wcwidth(item->pubwbuf[item->pos]);
 		if (((int)item->xcursor) - width < 0) {
 			item->xcursor = 0;
 			item->xposdraw -= 1;
 		} else
 			item->xcursor -= width;
 
 		while (true) {
 			if (item->xposdraw == 0)
 				break;
 			if (item->xcursor >= item->fieldcols / 2)
 				break;
 			if (wcwidth(item->pubwbuf[item->xposdraw - 1]) +
 			    item->xcursor + width > item->fieldcols)
 				break;
 
 			item->xposdraw -= 1;
 			item->xcursor +=
 			    wcwidth(item->pubwbuf[item->xposdraw]);
 		}
 		break;
 	case DEL_LETTER:
 		if (item->nletters == 0)
 			break;
 		if (item->pos == item->nletters)
 			break;
 		/* here a letter under the cursor */
 		change = true;
 		for (i = item->pos; i < item->nletters; i++) {
 			item->privwbuf[i] = item->privwbuf[i+1];
 			item->pubwbuf[i] = item->pubwbuf[i+1];
 		}
 		item->nletters -= 1;
 		item->privwbuf[i] = L'\0';
 		item->pubwbuf[i] = L'\0';
 		break;
 	case MOVE_CURSOR_RIGHT: /* used also by "insert", see handler loop */
 		if (item->pos + 1 == item->maxletters)
 			break;
 		if (item->pos == item->nletters)
 			break;
 		/* here a change to right */
 		change = true;
 		oldwidth = wcwidth(item->pubwbuf[item->pos]);
 		item->pos += 1;
 		if (item->pos == item->nletters) { /* empty column */
 			nextwidth = 1;
 		} else { /* a letter to right */
 			nextwidth = wcwidth(item->pubwbuf[item->pos]);
 		}
 		if (item->xcursor + oldwidth + nextwidth - 1 >= item->fieldcols) {
 			cols = nextwidth;
 			item->xposdraw = item->pos;
 			while (item->xposdraw != 0) {
 				cols += wcwidth(item->pubwbuf[item->xposdraw - 1]);
 				if (cols > (int)item->fieldcols)
 					break;
 				item->xposdraw -= 1;
 			}
 			item->xcursor = 0;
 			for (i = item->xposdraw; i < item->pos ; i++)
 				item->xcursor += wcwidth(item->pubwbuf[i]);
 		}
 		else {
 			item->xcursor += oldwidth;
 		}
 
 		break;
 	}
 
 	return (change);
 }
 
 static void
 drawitem(struct privateform *form, struct privateitem *item, bool focus)
 {
 	int color;
 	unsigned int n, cols;
 
 	/* Label */
 	wattron(form->pad, t.dialog.color);
 	mvwaddstr(form->pad, item->ylabel, item->xlabel, item->label);
 	wattroff(form->pad, t.dialog.color);
 
 	/* Field */
 	if (item->readonly)
 		color = t.form.readonlycolor;
 	else if (item->fieldnocolor)
 		color = t.dialog.color;
 	else
 		color = focus ? t.form.f_fieldcolor : t.form.fieldcolor;
 	wattron(form->pad, color);
 	mvwhline(form->pad, item->yfield, item->xfield, ' ', item->fieldcols);
 	n = 0;
 	cols = wcwidth(item->pubwbuf[item->xposdraw]);
 	while (cols <= item->fieldcols && item->xposdraw + n <
 	    wcslen(item->pubwbuf)) {
 		n++;
 		cols += wcwidth(item->pubwbuf[item->xposdraw + n]);
 
 	}
 	mvwaddnwstr(form->pad, item->yfield, item->xfield,
 	    &item->pubwbuf[item->xposdraw], n);
 	wattroff(form->pad, color);
 
 	/* Bottom Desc */
 	move(SCREENLINES - 1, 2);
 	clrtoeol();
 	if (item->bottomdesc != NULL && focus) {
 		attron(t.form.bottomdesccolor);
 		addstr(item->bottomdesc);
 		attroff(t.form.bottomdesccolor);
 		refresh();
 	}
 
 	/* Cursor */
 	curs_set((focus && item->cursor) ? 1 : 0);
 	wmove(form->pad, item->yfield, item->xfield + item->xcursor);
 
 	prefresh(form->pad, form->y, 0, form->ys, form->xs, form->ye, form->xe);
 }
 
 /*
  * Trick: draw 2 times an item switching focus.
  * Problem: curses tries to optimize the rendering but sometimes it misses some
  * updates or draws old stuff. libformw has a similar problem fixed by the
  * same trick.
  * Case 1: KEY_DC and KEY_BACKSPACE, deleted multicolumn letters are drawn
  * again. It seems fixed by new items pad and prefresh(), previously WINDOW.
  * Case2: some terminal, tmux and ssh does not show the cursor.
  */
 #define DRAWITEM_TRICK(form,item,focus) do {                                   \
 	drawitem(form, item, !focus);                                          \
 	drawitem(form, item, focus);                                           \
 } while (0)
 
 static bool
 insertch(struct privateform *form, struct privateitem *item, wchar_t wch)
 {
 	int i;
 
 	if (item->nletters >= item->maxletters)
 		return (false);
 
 	for (i = (int)item->nletters - 1; i >= (int)item->pos; i--) {
 		item->privwbuf[i+1] = item->privwbuf[i];
 		item->pubwbuf[i+1] = item->pubwbuf[i];
 	}
 
 	item->privwbuf[item->pos] = wch;
 	item->pubwbuf[item->pos] = item->secure ? form->securewch : wch;
 	item->nletters += 1;
 	item->privwbuf[item->nletters] = L'\0';
 	item->pubwbuf[item->nletters] = L'\0';
 
 	return (true);
 }
 
 static char* alloc_wstomb(wchar_t *wstr)
 {
 	int len, nbytes, i;
 	char mbch[MB_LEN_MAX], *mbstr;
 
 	nbytes = MB_LEN_MAX; /* to ensure a null terminated string */
 	len = wcslen(wstr);
 	for (i = 0; i < len; i++) {
 		wctomb(mbch, wstr[i]);
 		nbytes += mblen(mbch, MB_LEN_MAX);
 	}
 	if((mbstr = malloc(nbytes)) == NULL)
 		return (NULL);
 
 	wcstombs(mbstr,	wstr, nbytes);
 
 	return (mbstr);
 }
 
 static int
 return_values(struct bsddialog_conf *conf, int output, int nitems,
     struct bsddialog_formitem *apiitems, struct privateitem *items)
 {
 	int i;
 
 	if (output != BSDDIALOG_OK && conf->form.value_without_ok == false)
 		return (output);
 
 	for (i = 0; i < nitems; i++) {
 		if (conf->form.value_wchar) {
 			apiitems[i].value = (char*)wcsdup(items[i].privwbuf);
 		} else {
 			apiitems[i].value = alloc_wstomb(items[i].privwbuf);
 		}
 		if (apiitems[i].value == NULL)
 			RETURN_ERROR("Cannot allocate memory for form value");
 	}
 
 	return (output);
 }
 
 static unsigned int firstitem(unsigned int nitems, struct privateitem *items)
 {
 	int i;
 
 	for (i = 0; i < (int)nitems; i++)
 		if (items[i].readonly == false)
 			break;
 
 	return (i);
 }
 
 static unsigned int lastitem(unsigned int nitems, struct privateitem *items)
 {
 	int i;
 
 	for (i = nitems - 1; i >= 0 ; i--)
 		if (items[i].readonly == false)
 			break;
 
 	return (i);
 }
 
 static unsigned int
 previtem(unsigned int nitems, struct privateitem *items, int curritem)
 {
 	int i;
 
 	for (i = curritem - 1; i >= 0; i--)
 		if (items[i].readonly == false)
 			return(i);
 
 	for (i = nitems - 1; i > curritem - 1; i--)
 		if (items[i].readonly == false)
 			return(i);
 
 	return (curritem);
 }
 
 static unsigned int
 nextitem(unsigned int nitems, struct privateitem *items, int curritem)
 {
 	int i;
 
 	for (i = curritem + 1; i < (int)nitems; i++)
 		if (items[i].readonly == false)
 			return(i);
 
 	for (i = 0; i < curritem; i++)
 		if (items[i].readonly == false)
 			return(i);
 
 	return (curritem);
 }
 
 static void
 redrawbuttons(WINDOW *window, struct buttons *bs, bool focus, bool shortcut)
 {
 	int selected;
 
 	selected = bs->curr;
 	if (focus == false)
 		bs->curr = -1;
 	draw_buttons(window, *bs, shortcut);
 	wrefresh(window);
 	bs->curr = selected;
 }
 
 static void
 update_formborders(struct bsddialog_conf *conf, struct privateform *form)
 {
 	int h, w;
 
 	getmaxyx(form->border, h, w);
 	draw_borders(conf, form->border, h, w, LOWERED);
 
 	if (form->viewrows < form->h) {
 		wattron(form->border, t.dialog.arrowcolor);
 		if (form->y > 0)
 			mvwhline(form->border, 0, (w / 2) - 2,
 			    conf->ascii_lines ? '^' : ACS_UARROW, 5);
 
 		if (form->y + form->viewrows < form->h)
 			mvwhline(form->border, h-1, (w / 2) - 2,
 			    conf->ascii_lines ? 'v' : ACS_DARROW, 5);
 		wattroff(form->border, t.dialog.arrowcolor);
 		wrefresh(form->border);
 	}
 }
 
 /* use menu autosizing, linelen = form.w, nitems = form.h */
 static int
 menu_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
     const char *text, int linelen, unsigned int *menurows, int nitems,
     struct buttons bs)
 {
 	int htext, wtext, menusize, notext;
 
 	notext = 2;
 	if (*menurows == BSDDIALOG_AUTOSIZE) {
 		/* algo 1): grows vertically */
 		/* notext = 1; */
 		/* algo 2): grows horizontally, better with little screens */
 		notext += nitems;
 		notext = MIN(notext, widget_max_height(conf) - HBORDERS - 3);
 	} else
 		notext += *menurows;
 
-	/* cols autosize, rows autosize, rows fullscreen, menu particularity */
-	if (cols == BSDDIALOG_AUTOSIZE || rows <= BSDDIALOG_AUTOSIZE) {
-		if (text_size(conf, rows, cols, text, &bs, notext, linelen + 4,
-		    &htext, &wtext) != 0)
-			return (BSDDIALOG_ERROR);
-	}
+	if (text_size(conf, rows, cols, text, &bs, notext, linelen + 4, &htext,
+	    &wtext) != 0)
+		return (BSDDIALOG_ERROR);
 
 	if (cols == BSDDIALOG_AUTOSIZE)
 		*w = widget_min_width(conf, wtext, linelen + 4, &bs);
 
 	if (rows == BSDDIALOG_AUTOSIZE) {
-		if (*menurows == 0) {
+		if (*menurows == BSDDIALOG_AUTOSIZE) {
 			menusize = widget_max_height(conf) - HBORDERS -
 			     2 /*buttons*/ - htext;
 			menusize = MIN(menusize, nitems + 2);
 			*menurows = menusize - 2 < 0 ? 0 : menusize - 2;
-		}
-		else /* h autosize with fixed menurows */
+		} else /* h autosize with fixed menurows */
 			menusize = *menurows + 2;
 
 		*h = widget_min_height(conf, htext, menusize, true);
-		/*
-		 * avoid menurows overflow and
-		 * with rows=AUTOSIZE menurows!=0 becomes max-menurows
-		 */
-		*menurows = MIN(*h - 6 - htext, (int)*menurows);
-	} else {
-		if (*menurows == 0) {
+	} else { /* fixed rows */
+		if (*menurows == BSDDIALOG_AUTOSIZE) {
 			if (*h - 6 - htext <= 0)
 				*menurows = 0; /* form_checksize() will check */
 			else
 				*menurows = MIN(*h-6-htext, nitems);
 		}
 	}
 
+	/* avoid menurows overflow and menurows becomes at most menurows */
+	if (*h - 6 - htext <= 0)
+		*menurows = 0; /* form_checksize() will check */
+	else
+		*menurows = MIN(*h - 6 - htext, (int)*menurows);
+
 	return (0);
 }
 
 static int
 form_checksize(int rows, int cols, const char *text, struct privateform *form,
     int nitems, struct buttons bs)
 {
 	int mincols, textrow, menusize;
 
 	/* cols */
 	mincols = VBORDERS;
 	mincols += buttons_min_width(bs);
 	mincols = MAX(mincols, (int)form->w + 6);
 
 	if (cols < mincols)
 		RETURN_ERROR("Form width, cols < buttons or xlabels/xfields");
 
 	/* rows */
 	if (nitems > 0 && form->viewrows == 0)
 		RETURN_ERROR("items > 0 but viewrows == 0, if formheight = 0 "
 		    "terminal too small");
 
 	if (form->viewrows < form->minviewrows)
 		RETURN_ERROR("Few formheight rows, if formheight = 0 terminal "
 		    "too small");
 
 	textrow = text != NULL && text[0] != '\0' ? 1 : 0;
 	menusize = nitems > 0 ? 3 : 0;
 	if (rows < 2  + 2 + menusize + textrow)
 		RETURN_ERROR("Few lines for this form");
 
 	return (0);
 }
 
 static void curriteminview(struct privateform *form, struct privateitem *item)
 {
 	unsigned int yup, ydown;
 
 	yup = MIN(item->ylabel, item->yfield);
 	ydown = MAX(item->ylabel, item->yfield);
 
 	if (form->y > yup && form->y > 0)
 		form->y = yup;
 	if ((int)(form->y + form->viewrows) - 1 < (int)ydown)
 		form->y = ydown - form->viewrows + 1;
 }
 
 /* API */
 int
 bsddialog_form(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int formheight, unsigned int nitems,
     struct bsddialog_formitem *apiitems)
 {
 	bool switchfocus, changeitem, focusinform, insecurecursor, loop;
 	int curritem, mbchsize, next, retval, y, x, h, w, wchtype;
 	unsigned int i, j, itemybeg, itemxbeg, tmp;
 	wchar_t *winit;
 	wint_t input;
 	WINDOW *widget, *textpad, *shadow;
 	struct privateitem *items, *item;
 	struct buttons bs;
 	struct privateform form;
 
 	for (i = 0; i < nitems; i++) {
 		if (apiitems[i].maxvaluelen == 0)
 			RETURN_ERROR("maxvaluelen cannot be zero");
 		if (apiitems[i].fieldlen == 0)
 			RETURN_ERROR("fieldlen cannot be zero");
 	}
 
 	insecurecursor = false;
 	if (conf->form.securembch != NULL) {
 		mbchsize = mblen(conf->form.securembch, MB_LEN_MAX);
 		if(mbtowc(&form.securewch, conf->form.securembch, mbchsize) < 0)
 			RETURN_ERROR("Cannot convert securembch to wchar_t");
 		insecurecursor = true;
 	} else if (conf->form.securech != '\0') {
 		form.securewch = btowc(conf->form.securech);
 		insecurecursor = true;
 	} else {
 		form.securewch = L' ';
 	}
 
 	if ((items = malloc(nitems * sizeof(struct privateitem))) == NULL)
 		RETURN_ERROR("Cannot allocate internal items");
 	form.h = form.w = form.minviewrows = 0;
 	for (i = 0; i < nitems; i++) {
 		item = &items[i];
 		item->label = apiitems[i].label;
 		item->ylabel = apiitems[i].ylabel;
 		item->xlabel = apiitems[i].xlabel;
 		item->yfield = apiitems[i].yfield;
 		item->xfield = apiitems[i].xfield;
 		item->secure = apiitems[i].flags & BSDDIALOG_FIELDHIDDEN;
 		item->readonly = apiitems[i].flags & BSDDIALOG_FIELDREADONLY;
 		item->fieldnocolor = apiitems[i].flags & BSDDIALOG_FIELDNOCOLOR;
 		item->extendfield = apiitems[i].flags & BSDDIALOG_FIELDEXTEND;
 		item->fieldonebyte = apiitems[i].flags &
 		    BSDDIALOG_FIELDSINGLEBYTE;
 		item->cursorend = apiitems[i].flags & BSDDIALOG_FIELDCURSOREND;
 		item->bottomdesc = apiitems[i].bottomdesc;
 		if (item->readonly || (item->secure && !insecurecursor))
 			item->cursor = false;
 		else
 			item->cursor = true;
 
 		item->maxletters = apiitems[i].maxvaluelen;
 		item->privwbuf = calloc(item->maxletters + 1, sizeof(wchar_t));
 		if (item->privwbuf == NULL)
 			RETURN_ERROR("Cannot allocate item private buffer");
 		memset(item->privwbuf, 0, item->maxletters + 1);
 		item->pubwbuf = calloc(item->maxletters + 1, sizeof(wchar_t));
 		if (item->pubwbuf == NULL)
 			RETURN_ERROR("Cannot allocate item private buffer");
 		memset(item->pubwbuf, 0, item->maxletters + 1);
 
 		if ((winit = alloc_mbstows(apiitems[i].init)) == NULL)
 			RETURN_ERROR("Cannot allocate item.init in wchar_t*");
 		wcsncpy(item->privwbuf, winit, item->maxletters);
 		wcsncpy(item->pubwbuf, winit, item->maxletters);
 		free(winit);
 		item->nletters = wcslen(item->pubwbuf);
 		if (item->secure) {
 			for (j = 0; j < item->nletters; j++)
 				item->pubwbuf[j] = form.securewch;
 		}
 
 		item->fieldcols = apiitems[i].fieldlen;
 		item->xposdraw = 0;
 		item->xcursor = 0;
 		item->pos = 0;
 
 		form.h = MAX(form.h, items[i].ylabel);
 		form.h = MAX(form.h, items[i].yfield);
 		form.w = MAX(form.w, items[i].xlabel + strcols(items[i].label));
 		form.w = MAX(form.w, items[i].xfield + items[i].fieldcols);
 		if (i == 0) {
 			itemybeg = MIN(items[i].ylabel, items[i].yfield);
 			itemxbeg = MIN(items[i].xlabel, items[i].xfield);
 		} else {
 			tmp = MIN(items[i].ylabel, items[i].yfield);
 			itemybeg = MIN(itemybeg, tmp);
 			tmp = MIN(items[i].xlabel, items[i].xfield);
 			itemxbeg = MIN(itemxbeg, tmp);
 		}
 		tmp = abs((int)items[i].ylabel - (int)items[i].yfield);
 		form.minviewrows = MAX(form.minviewrows, tmp);
 	}
 	if (nitems > 0) {
 		form.h = form.h + 1 - itemybeg;
 		form.w -= itemxbeg;
 		form.minviewrows += 1;
 	}
 	form.wmin = form.w;
 	for (i = 0; i < nitems; i++) {
 		items[i].ylabel -= itemybeg;
 		items[i].yfield -= itemybeg;
 		items[i].xlabel -= itemxbeg;
 		items[i].xfield -= itemxbeg;
 	}
 
 	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
 	form.viewrows = formheight;
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return (BSDDIALOG_ERROR);
 	if (menu_autosize(conf, rows, cols, &h, &w, text, form.w,
 	    &form.viewrows, form.h, bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (form_checksize(h, w, text, &form, nitems, bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
 	    true) != 0)
 		return (BSDDIALOG_ERROR);
 
 	doupdate();
 
 	prefresh(textpad, 0, 0, y + 1, x + 1 + TEXTHMARGIN,
 	    y + h - form.viewrows, x + 1 + w - TEXTHMARGIN);
 
 	form.border = new_boxed_window(conf, y + h - 5 - form.viewrows, x + 2,
 	    form.viewrows + 2, w - 4, LOWERED);
 
 	for (i = 0; i < nitems; i++) {
 		if (items[i].extendfield) {
 			form.w = w - 6;
 			items[i].fieldcols = form.w - items[i].xfield;
 		}
 		if (items[i].cursorend)
 			fieldctl(item, MOVE_CURSOR_END);
 	}
 
 	form.pad = newpad(form.h, form.w);
 	wbkgd(form.pad, t.dialog.color);
 
 	form.ys = y + h - 5 - form.viewrows + 1;
 	form.ye = y + h - 5 ;
 	if ((int)form.w >= w - 6) { /* left */
 		form.xs = x + 3;
 		form.xe = form.xs + w - 7;
 	} else { /* center */
 		form.xs = x + 3 + (w-6)/2 - form.w/2;
 		form.xe = form.xs + w - 5;
 	}
 
 	curritem = -1;
 	for (i=0 ; i < nitems; i++) {
 		DRAWITEM_TRICK(&form, &items[i], false);
 		if (curritem == -1 && items[i].readonly == false)
 			curritem = i;
 	}
 	if (curritem != -1) {
 		focusinform = true;
 		redrawbuttons(widget, &bs, conf->button.always_active, false);
 		form.y = 0;
 		item = &items[curritem];
 		curriteminview(&form, item);
 		update_formborders(conf, &form);
 		wrefresh(form.border);
 		DRAWITEM_TRICK(&form, item, true);
 	} else {
 		item = NULL;
 		focusinform = false;
 		wrefresh(form.border);
 	}
 
 	changeitem = switchfocus = false;
 	loop = true;
 	while (loop) {
 		if ((wchtype = get_wch(&input)) == ERR)
 			continue;
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			if (focusinform && conf->button.always_active == false)
 				break;
 			retval = return_values(conf, bs.value[bs.curr],
 			    nitems, apiitems, items);
 			loop = false;
 			break;
 		case 27: /* Esc */
 			if (conf->key.enable_esc) {
 				retval = return_values(conf, BSDDIALOG_ESC,
 				    nitems, apiitems, items);
 				loop = false;
 			}
 			break;
 		case '\t': /* TAB */
 			if (focusinform) {
 				switchfocus = true;
 			} else {
 				if (bs.curr + 1 < (int)bs.nbuttons) {
 					bs.curr++;
 				} else {
 					bs.curr = 0;
 					if (curritem != -1) {
 						switchfocus = true;
 					}
 				}
 				draw_buttons(widget, bs, true);
 				wrefresh(widget);
 			}
 			break;
 		case KEY_LEFT:
 			if (focusinform) {
 				if(fieldctl(item, MOVE_CURSOR_LEFT))
 					DRAWITEM_TRICK(&form, item, true);
 			} else if (bs.curr > 0) {
 				bs.curr--;
 				draw_buttons(widget, bs, true);
 				wrefresh(widget);
 			} else if (curritem != -1) {
 				switchfocus = true;
 			}
 			break;
 		case KEY_RIGHT:
 			if (focusinform) {
 				if(fieldctl(item, MOVE_CURSOR_RIGHT))
 					DRAWITEM_TRICK(&form, item, true);
 			} else if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
 				draw_buttons(widget, bs, true);
 				wrefresh(widget);
 			} else if (curritem != -1) {
 				switchfocus = true;
 			}
 			break;
 		case KEY_UP:
 			if (focusinform) {
 				next = previtem(nitems, items, curritem);
 				changeitem = curritem != next;
 			} else if (curritem != -1) {
 				switchfocus = true;
 			}
 			break;
 		case KEY_DOWN:
 			if (focusinform == false)
 				break;
 			if (nitems == 1) {
 				switchfocus = true;
 			} else {
 				next = nextitem(nitems, items, curritem);
 				changeitem = curritem != next;
 			}
 			break;
 		case KEY_PPAGE:
 			if (focusinform) {
 				next = firstitem(nitems, items);
 				changeitem = curritem != next;
 			}
 			break;
 		case KEY_NPAGE:
 			if (focusinform) {
 				next = lastitem(nitems, items);
 				changeitem = curritem != next;
 			}
 			break;
 		case KEY_BACKSPACE:
 		case 127: /* Backspace */
 			if (focusinform == false)
 				break;
 			if(fieldctl(item, MOVE_CURSOR_LEFT))
 				if(fieldctl(item, DEL_LETTER))
 					DRAWITEM_TRICK(&form, item, true);
 			break;
 		case KEY_DC:
 			if (focusinform == false)
 				break;
 			if(fieldctl(item, DEL_LETTER))
 				DRAWITEM_TRICK(&form, item, true);
 			break;
 		case KEY_HOME:
 			if (focusinform == false)
 				break;
 			if(fieldctl(item, MOVE_CURSOR_BEGIN))
 				DRAWITEM_TRICK(&form, item, true);
 			break;
 		case KEY_END:
 			if (focusinform == false)
 				break;
 			if (fieldctl(item, MOVE_CURSOR_END))
 				DRAWITEM_TRICK(&form, item, true);
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
 			curs_set(0);
 			if (f1help(conf) != 0) {
 				retval = BSDDIALOG_ERROR;
 				loop = false;
 			}
 			/* No break, screen size can change */
 		case KEY_RESIZE:
 			/* Important for decreasing screen */
 			hide_widget(y, x, h, w, conf->shadow);
 			refresh();
 
 			form.viewrows = formheight;
 			form.w = form.wmin;
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return (BSDDIALOG_ERROR);
 			if (menu_autosize(conf, rows, cols, &h, &w, text, form.w,
 			    &form.viewrows, form.h, bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (form_checksize(h, w, text, &form, nitems, bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return (BSDDIALOG_ERROR);
 
 			if (update_dialog(conf, shadow, widget, y, x, h, w,
 			    textpad, text, &bs, true) != 0)
 			return (BSDDIALOG_ERROR);
 
 			doupdate();
 
 			prefresh(textpad, 0, 0, y + 1, x + 1 + TEXTHMARGIN,
 			    y + h - form.viewrows, x + 1 + w - TEXTHMARGIN);
 
 			wclear(form.border);
 			mvwin(form.border, y + h - 5 - form.viewrows, x + 2);
 			wresize(form.border, form.viewrows + 2, w - 4);
 
 			for (i = 0; i < nitems; i++) {
 				fieldctl(&items[i], MOVE_CURSOR_BEGIN);
 				if (items[i].extendfield) {
 					form.w = w - 6;
 					items[i].fieldcols =
 					    form.w - items[i].xfield;
 				}
 				if (items[i].cursorend)
 					fieldctl(&items[i], MOVE_CURSOR_END);
 			}
 
 			form.ys = y + h - 5 - form.viewrows + 1;
 			form.ye = y + h - 5 ;
 			if ((int)form.w >= w - 6) { /* left */
 				form.xs = x + 3;
 				form.xe = form.xs + w - 7;
 			} else { /* center */
 				form.xs = x + 3 + (w-6)/2 - form.w/2;
 				form.xe = form.xs + w - 5;
 			}
 
 			if (curritem != -1) {
 				redrawbuttons(widget, &bs,
 				    conf->button.always_active || !focusinform,
 				    !focusinform);
 				curriteminview(&form, item);
 				update_formborders(conf, &form);
 				wrefresh(form.border);
 				/* drawitem just to prefresh() pad */
 				DRAWITEM_TRICK(&form, item, focusinform);
 			} else {
 				wrefresh(form.border);
 			}
 			break;
 		default:
 			if (wchtype == KEY_CODE_YES)
 				break;
 			if (focusinform) {
 				if (item->fieldonebyte && wctob(input) == EOF)
 					break;
 				/*
 				 * MOVE_CURSOR_RIGHT manages new positions
 				 * because the cursor remains on the new letter,
 				 * "if" and "while" update the positions.
 				 */
 				if(insertch(&form, item, input)) {
 					fieldctl(item, MOVE_CURSOR_RIGHT);
 					/*
 					 * no if(fieldctl), update always
 					 * because it fails with maxletters.
 					 */
 					DRAWITEM_TRICK(&form, item, true);
 				}
 			} else {
 				if (shortcut_buttons(input, &bs)) {
 					retval = return_values(conf,
 					    bs.value[bs.curr], nitems, apiitems,
 					    items);
 					loop = false;
 				}
 			}
 			break;
 		} /* end switch handler */
 
 		if (switchfocus) {
 			focusinform = !focusinform;
 			bs.curr = 0;
 			redrawbuttons(widget, &bs,
 			    conf->button.always_active || !focusinform,
 			    !focusinform);
 			DRAWITEM_TRICK(&form, item, focusinform);
 			switchfocus = false;
 		}
 
 		if (changeitem) {
 			DRAWITEM_TRICK(&form, item, false);
 			curritem = next;
 			item = &items[curritem];
 			curriteminview(&form, item);
 			update_formborders(conf, &form);
 			DRAWITEM_TRICK(&form, item, true);
 			changeitem = false;
 		}
 	} /* end while handler */
 
 	curs_set(0);
 
 	delwin(form.pad);
 	delwin(form.border);
 	for (i = 0; i < nitems; i++) {
 		free(items[i].privwbuf);
 		free(items[i].pubwbuf);
 	}
 	end_dialog(conf, shadow, widget, textpad);
 
 	return (retval);
 }
diff --git a/lib/lib_util.c b/lib/lib_util.c
index fcdf4c3d8769..d8c0f1d21b42 100644
--- a/lib/lib_util.c
+++ b/lib/lib_util.c
@@ -1,1210 +1,1204 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <ctype.h>
 #include <curses.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <wctype.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
 #define ERRBUFLEN    1024 /* Error buffer len */
 
 /* Error */
 static char errorbuffer[ERRBUFLEN];
 
 const char *get_error_string(void)
 {
 	return (errorbuffer);
 }
 
 void set_error_string(const char *str)
 {
 	strncpy(errorbuffer, str, ERRBUFLEN-1);
 }
 
 /* Unicode */
 wchar_t* alloc_mbstows(const char *mbstring)
 {
 	size_t charlen, nchar;
 	mbstate_t mbs;
 	const char *pmbstring;
 	wchar_t *wstring;
 
 	nchar = 1;
 	pmbstring = mbstring;
 	memset(&mbs, 0, sizeof(mbs));
 	while ((charlen = mbrlen(pmbstring, MB_CUR_MAX, &mbs)) != 0 &&
 	    charlen != (size_t)-1 && charlen != (size_t)-2) {
 		pmbstring += charlen;
 		nchar++;
 	}
 
 	if ((wstring = calloc(nchar, sizeof(wchar_t))) == NULL)
 		return (NULL);
 	mbstowcs(wstring, mbstring, nchar);
 
 	return (wstring);
 }
 
 void mvwaddwch(WINDOW *w, int y, int x, wchar_t wch)
 {
 	wchar_t ws[2];
 
 	ws[0] = wch;
 	ws[1] = L'\0';
 	mvwaddwstr(w, y, x, ws);
 
 }
 
 int str_props(const char *mbstring, unsigned int *cols, bool *has_multi_col)
 {
 	bool multicol;
 	int w;
 	unsigned int ncol;
 	size_t charlen, mb_cur_max;
 	wchar_t wch;
 	mbstate_t mbs;
 
 	multicol = false;
 	mb_cur_max = MB_CUR_MAX;
 	ncol = 0;
 	memset(&mbs, 0, sizeof(mbs));
 	while ((charlen = mbrlen(mbstring, mb_cur_max, &mbs)) != 0 &&
 	    charlen != (size_t)-1 && charlen != (size_t)-2) {
 		if (mbtowc(&wch, mbstring, mb_cur_max) < 0)
 			return (-1);
 		w = (wch == L'\t') ? TABSIZE : wcwidth(wch);
 		ncol += (w < 0) ? 0 : w;
 		if (w > 1 && wch != L'\t')
 			multicol = true;
 		mbstring += charlen;
 	}
 
 	if (cols != NULL)
 		*cols = ncol;
 	if (has_multi_col != NULL)
 		*has_multi_col = multicol;
 
 	return (0);
 }
 
 unsigned int strcols(const char *mbstring)
 {
 	int w;
 	unsigned int ncol;
 	size_t charlen, mb_cur_max;
 	wchar_t wch;
 	mbstate_t mbs;
 
 	mb_cur_max = MB_CUR_MAX;
 	ncol = 0;
 	memset(&mbs, 0, sizeof(mbs));
 	while ((charlen = mbrlen(mbstring, mb_cur_max, &mbs)) != 0 &&
 	    charlen != (size_t)-1 && charlen != (size_t)-2) {
 		if (mbtowc(&wch, mbstring, mb_cur_max) < 0)
 			return (0);
 		w = (wch == L'\t') ? TABSIZE : wcwidth(wch);
 		ncol += (w < 0) ? 0 : w;
 		mbstring += charlen;
 	}
 
 	return (ncol);
 }
 
 /* Clear */
 int hide_widget(int y, int x, int h, int w, bool withshadow)
 {
 	WINDOW *clear;
 
 	if ((clear = newwin(h, w, y + t.shadow.y, x + t.shadow.x)) == NULL)
 		RETURN_ERROR("Cannot hide the widget");
 	wbkgd(clear, t.screen.color);
 
 	if (withshadow)
 		wrefresh(clear);
 
 	mvwin(clear, y, x);
 	wrefresh(clear);
 
 	delwin(clear);
 
 	return (0);
 }
 
 /* F1 help */
 int f1help(struct bsddialog_conf *conf)
 {
 	int output;
 	struct bsddialog_conf hconf;
 
 	bsddialog_initconf(&hconf);
 	hconf.title           = "HELP";
 	hconf.button.ok_label = "EXIT";
 	hconf.clear           = true;
 	hconf.ascii_lines     = conf->ascii_lines;
 	hconf.no_lines        = conf->no_lines;
 	hconf.shadow          = conf->shadow;
 	hconf.text.highlight  = conf->text.highlight;
 
 	output = BSDDIALOG_OK;
 	if (conf->key.f1_message != NULL)
 		output = bsddialog_msgbox(&hconf, conf->key.f1_message, 0, 0);
 
 	if (output != BSDDIALOG_ERROR && conf->key.f1_file != NULL)
 		output = bsddialog_textbox(&hconf, conf->key.f1_file, 0, 0);
 
 	return (output == BSDDIALOG_ERROR ? BSDDIALOG_ERROR : 0);
 }
 
 /* Buttons */
 static void
 draw_button(WINDOW *window, int y, int x, int size, const char *text,
     wchar_t first, bool selected, bool shortcut)
 {
 	int i, color_arrows, color_shortkey, color_button;
 
 	if (selected) {
 		color_arrows = t.button.f_delimcolor;
 		color_shortkey = t.button.f_shortcutcolor;
 		color_button = t.button.f_color;
 	} else {
 		color_arrows = t.button.delimcolor;
 		color_shortkey = t.button.shortcutcolor;
 		color_button = t.button.color;
 	}
 
 	wattron(window, color_arrows);
 	mvwaddch(window, y, x, t.button.leftdelim);
 	wattroff(window, color_arrows);
 	wattron(window, color_button);
 	for (i = 1; i < size - 1; i++)
 		waddch(window, ' ');
 	wattroff(window, color_button);
 	wattron(window, color_arrows);
 	mvwaddch(window, y, x + i, t.button.rightdelim);
 	wattroff(window, color_arrows);
 
 	x = x + 1 + ((size - 2 - strcols(text))/2);
 	wattron(window, color_button);
 	mvwaddstr(window, y, x, text);
 	wattroff(window, color_button);
 
 	if (shortcut) {
 		wattron(window, color_shortkey);
 		mvwaddwch(window, y, x, first);
 		wattroff(window, color_shortkey);
 	}
 }
 
 void
 draw_buttons(WINDOW *window, struct buttons bs, bool shortcut)
 {
 	int i, x, startx, y, rows, cols;
 	unsigned int newmargin, margin, wbuttons;
 
 	getmaxyx(window, rows, cols);
 	y = rows - 2;
 
 	newmargin = cols - VBORDERS - (bs.nbuttons * bs.sizebutton);
 	newmargin /= (bs.nbuttons + 1);
 	newmargin = MIN(newmargin, t.button.maxmargin);
 	if (newmargin == 0) {
 		margin = t.button.minmargin;
 		wbuttons = buttons_min_width(bs);
 	} else {
 		margin = newmargin;
 		wbuttons = bs.nbuttons * bs.sizebutton;
 		wbuttons += (bs.nbuttons + 1) * margin;
 	}
 
 	startx = (cols)/2 - wbuttons/2 + newmargin;
 	for (i = 0; i < (int)bs.nbuttons; i++) {
 		x = i * (bs.sizebutton + margin);
 		draw_button(window, y, startx + x, bs.sizebutton, bs.label[i],
 		    bs.first[i],  i == bs.curr, shortcut);
 	}
 }
 
 void
 get_buttons(struct bsddialog_conf *conf, struct buttons *bs,
     const char *yesoklabel, const char *nocancellabel)
 {
 	int i;
 #define SIZEBUTTON              8
 #define DEFAULT_BUTTON_LABEL	BUTTON_OK_LABEL
 #define DEFAULT_BUTTON_VALUE	BSDDIALOG_OK
 	wchar_t first;
 
 	bs->nbuttons = 0;
 	bs->curr = 0;
 	bs->sizebutton = 0;
 
 	if (yesoklabel != NULL && conf->button.without_ok == false) {
 		bs->label[0] = conf->button.ok_label != NULL ?
 		    conf->button.ok_label : yesoklabel;
 		bs->value[0] = BSDDIALOG_OK;
 		bs->nbuttons += 1;
 	}
 
 	if (conf->button.with_extra) {
 		bs->label[bs->nbuttons] = conf->button.extra_label != NULL ?
 		    conf->button.extra_label : "Extra";
 		bs->value[bs->nbuttons] = BSDDIALOG_EXTRA;
 		bs->nbuttons += 1;
 	}
 
 	if (nocancellabel != NULL && conf->button.without_cancel == false) {
 		bs->label[bs->nbuttons] = conf->button.cancel_label ?
 		    conf->button.cancel_label : nocancellabel;
 		bs->value[bs->nbuttons] = BSDDIALOG_CANCEL;
 		if (conf->button.default_cancel)
 			bs->curr = bs->nbuttons;
 		bs->nbuttons += 1;
 	}
 
 	if (conf->button.with_help) {
 		bs->label[bs->nbuttons] = conf->button.help_label != NULL ?
 		    conf->button.help_label : "Help";
 		bs->value[bs->nbuttons] = BSDDIALOG_HELP;
 		bs->nbuttons += 1;
 	}
 
 	if (conf->button.generic1_label != NULL) {
 		bs->label[bs->nbuttons] = conf->button.generic1_label;
 		bs->value[bs->nbuttons] = BSDDIALOG_GENERIC1;
 		bs->nbuttons += 1;
 	}
 
 	if (conf->button.generic2_label != NULL) {
 		bs->label[bs->nbuttons] = conf->button.generic2_label;
 		bs->value[bs->nbuttons] = BSDDIALOG_GENERIC2;
 		bs->nbuttons += 1;
 	}
 
 	if (bs->nbuttons == 0) {
 		bs->label[0] = DEFAULT_BUTTON_LABEL;
 		bs->value[0] = DEFAULT_BUTTON_VALUE;
 		bs->nbuttons = 1;
 	}
 
 	for (i = 0; i < (int)bs->nbuttons; i++) {
 		mbtowc(&first, bs->label[i], MB_CUR_MAX);
 		bs->first[i] = first;
 	}
 
 	if (conf->button.default_label != NULL) {
 		for (i = 0; i < (int)bs->nbuttons; i++) {
 			if (strcmp(conf->button.default_label,
 			    bs->label[i]) == 0)
 				bs->curr = i;
 		}
 	}
 
 	bs->sizebutton = MAX(SIZEBUTTON - 2, strcols(bs->label[0]));
 	for (i = 1; i < (int)bs->nbuttons; i++)
 		bs->sizebutton = MAX(bs->sizebutton, strcols(bs->label[i]));
 	bs->sizebutton += 2;
 }
 
 int buttons_min_width(struct buttons bs)
 {
 	unsigned int width;
 
 	width = bs.nbuttons * bs.sizebutton;
 	if (bs.nbuttons > 0)
 		width += (bs.nbuttons - 1) * t.button.minmargin;
 
 	return (width);
 }
 
 bool shortcut_buttons(wint_t key, struct buttons *bs)
 {
 	bool match;
 	unsigned int i;
 
 	match = false;
 	for (i = 0; i < bs->nbuttons; i++) {
 		if (towlower(key) == towlower(bs->first[i])) {
 			bs->curr = i;
 			match = true;
 			break;
 		}
 	}
 
 	return (match);
 }
 
 /* Text */
 static bool is_wtext_attr(const wchar_t *wtext)
 {
 	if (wcsnlen(wtext, 3) < 3)
 		return (false);
 
 	if (wtext[0] != L'\\' || wtext[1] != L'Z')
 		return (false);
 
 	return (wcschr(L"nbBrRuU01234567", wtext[2]) == NULL ? false : true);
 }
 
 static bool check_set_wtext_attr(WINDOW *win, wchar_t *wtext)
 {
 	enum bsddialog_color bg;
 
 	if (is_wtext_attr(wtext) == false)
 		return (false);
 
 	if ((wtext[2] - L'0') >= 0 && (wtext[2] - L'0') < 8) {
 		bsddialog_color_attrs(t.dialog.color, NULL, &bg, NULL);
 		wattron(win, bsddialog_color(wtext[2] - L'0', bg, 0));
 		return (true);
 	}
 
 	switch (wtext[2]) {
 	case L'n':
 		wattron(win, t.dialog.color);
 		wattrset(win, A_NORMAL);
 		break;
 	case L'b':
 		wattron(win, A_BOLD);
 		break;
 	case L'B':
 		wattroff(win, A_BOLD);
 		break;
 	case L'r':
 		wattron(win, A_REVERSE);
 		break;
 	case L'R':
 		wattroff(win, A_REVERSE);
 		break;
 	case L'u':
 		wattron(win, A_UNDERLINE);
 		break;
 	case L'U':
 		wattroff(win, A_UNDERLINE);
 		break;
 	}
 
 	return (true);
 }
 
 /* Word Wrapping */
 static void
 print_string(WINDOW *win, int *rows, int cols, int *y, int *x, wchar_t *str,
     bool color)
 {
 	int i, j, len, reallen, wc;
 	wchar_t ws[2];
 
 	ws[1] = L'\0';
 
 	len = wcslen(str);
 	if (color) {
 		reallen = 0;
 		i=0;
 		while (i < len) {
 			if (is_wtext_attr(str+i) == false)
 				reallen += wcwidth(str[i]);
 			i++;
 		}
 	} else
 		reallen = wcswidth(str, len);
 
 	i = 0;
 	while (i < len) {
 		if (*x + reallen > cols) {
 			*y = (*x != 0 ? *y+1 : *y);
 			if (*y >= *rows) {
 				*rows = *y + 1;
 				wresize(win, *rows, cols);
 			}
 			*x = 0;
 		}
 		j = *x;
 		while (j < cols && i < len) {
 			if (color && check_set_wtext_attr(win, str+i)) {
 				i += 3;
 			} else if (j + wcwidth(str[i]) > cols) {
 				break;
 			} else {
 				/* inline mvwaddwch() for efficiency */
 				ws[0] = str[i];
 				mvwaddwstr(win, *y, j, ws);
 				wc = wcwidth(str[i]);;
 				reallen -= wc;
 				j += wc;
 				i++;
 				*x = j;
 			}
 		}
 	}
 }
 
 static int
 print_textpad(struct bsddialog_conf *conf, WINDOW *pad, const char *text)
 {
 	bool loop;
 	int i, j, z, rows, cols, x, y, tablen;
 	wchar_t *wtext, *string;
 
 	if ((wtext = alloc_mbstows(text)) == NULL)
 		RETURN_ERROR("Cannot allocate/print text in wchar_t*");
 
 	if ((string = calloc(wcslen(wtext) + 1, sizeof(wchar_t))) == NULL)
 		RETURN_ERROR("Cannot build (analyze) text");
 
 	getmaxyx(pad, rows, cols);
 	tablen = (conf->text.tablen == 0) ? TABSIZE : (int)conf->text.tablen;
 
 	i = j = x = y = 0;
 	loop = true;
 	while (loop) {
 		string[j] = wtext[i];
 
 		if (wcschr(L"\n\t  ", string[j]) != NULL || string[j] == L'\0') {
 			string[j] = L'\0';
 			print_string(pad, &rows, cols, &y, &x, string,
 			    conf->text.highlight);
 		}
 
 		switch (wtext[i]) {
 		case L'\0':
 			loop = false;
 			break;
 		case L'\n':
 			x = 0;
 			y++;
 			j = -1;
 			break;
 		case L'\t':
 			for (z = 0; z < tablen; z++) {
 				if (x >= cols) {
 					x = 0;
 					y++;
 				}
 				x++;
 			}
 			j = -1;
 			break;
 		case L' ':
 			x++;
 			if (x >= cols) {
 				x = 0;
 				y++;
 			}
 			j = -1;
 		}
 
 		if (y >= rows) {
 			rows = y + 1;
 			wresize(pad, rows, cols);
 		}
 
 		j++;
 		i++;
 	}
 
 	free(wtext);
 	free(string);
 
 	return (0);
 }
 
 /* Text Autosize */
 #define NL  -1
 #define WS  -2
 #define TB  -3
 
 struct textproperties {
 	int nword;
 	int *words;
 	uint8_t *wletters;
 	int maxwordcols;
 	int maxline;
 	bool hasnewline;
 };
 
 static int
 text_properties(struct bsddialog_conf *conf, const char *text,
     struct textproperties *tp)
 {
 	int i, l, currlinecols, maxwords, wtextlen, tablen, wordcols;
 	wchar_t *wtext;
 
 	tablen = (conf->text.tablen == 0) ? TABSIZE : (int)conf->text.tablen;
 
 	maxwords = 1024;
 	if ((tp->words = calloc(maxwords, sizeof(int))) == NULL)
 		RETURN_ERROR("Cannot alloc memory for text autosize");
 
 	if ((wtext = alloc_mbstows(text)) == NULL)
 		RETURN_ERROR("Cannot allocate/autosize text in wchar_t*");
 	wtextlen = wcslen(wtext);
 	if ((tp->wletters = calloc(wtextlen, sizeof(uint8_t))) == NULL)
 		RETURN_ERROR("Cannot allocate wletters for text autosizing");
 
 	tp->nword = 0;
 	tp->maxline = 0;
 	tp->maxwordcols = 0;
 	tp->hasnewline = false;
 	currlinecols = 0;
 	wordcols = 0;
 	l = 0;
 	for (i = 0; i < wtextlen; i++) {
 		if (conf->text.highlight && is_wtext_attr(wtext + i)) {
 			i += 2; /* +1 for update statement */
 			continue;
 		}
 
 		if (tp->nword + 1 >= maxwords) {
 			maxwords += 1024;
 			tp->words = realloc(tp->words, maxwords * sizeof(int));
 			if (tp->words == NULL)
 				RETURN_ERROR("Cannot realloc memory for text "
 				    "autosize");
 		}
 
 		if (wcschr(L"\t\n  ", wtext[i]) != NULL) {
 			tp->maxwordcols = MAX(wordcols, tp->maxwordcols);
 
 			if (wordcols != 0) {
 				/* line */
 				currlinecols += wordcols;
 				/* word */
 				tp->words[tp->nword] = wordcols;
 				tp->nword += 1;
 				wordcols = 0;
 			}
 
 			switch (wtext[i]) {
 			case L'\t':
 				/* line */
 				currlinecols += tablen;
 				/* word */
 				tp->words[tp->nword] = TB;
 				break;
 			case L'\n':
 				/* line */
 				tp->hasnewline = true;
 				tp->maxline = MAX(tp->maxline, currlinecols);
 				currlinecols = 0;
 				/* word */
 				tp->words[tp->nword] = NL;
 				break;
 			case L' ':
 				/* line */
 				currlinecols += 1;
 				/* word */
 				tp->words[tp->nword] = WS;
 				break;
 			}
 			tp->nword += 1;
 		} else {
 			tp->wletters[l] = wcwidth(wtext[i]);
 			wordcols += tp->wletters[l];
 			l++;
 		}
 	}
 	/* word */
 	if (wordcols != 0) {
 		tp->words[tp->nword] = wordcols;
 		tp->nword += 1;
 		tp->maxwordcols = MAX(wordcols, tp->maxwordcols);
 	}
 	/* line */
 	tp->maxline = MAX(tp->maxline, currlinecols);
 
 	free(wtext);
 
 	return (0);
 }
 
 
 static int
 text_autosize(struct bsddialog_conf *conf, struct textproperties *tp,
     int maxrows, int mincols, bool increasecols, int *h, int *w)
 {
 	int i, j, x, y, z, l, line, maxwidth, tablen;
 
 	maxwidth = widget_max_width(conf) - HBORDERS - TEXTHMARGINS;
 	tablen = (conf->text.tablen == 0) ? TABSIZE : (int)conf->text.tablen;
 
 	if (increasecols) {
 		mincols = MAX(mincols, tp->maxwordcols);
 		mincols = MAX(mincols,
 		    (int)conf->auto_minwidth - HBORDERS - TEXTHMARGINS);
 		mincols = MIN(mincols, maxwidth);
 	}
 
 	while (true) {
 		x = 0;
 		y = 1;
 		line=0;
 		l = 0;
 		for (i = 0; i < tp->nword; i++) {
 			switch (tp->words[i]) {
 			case TB:
 				for (j = 0; j < tablen; j++) {
 					if (x >= mincols) {
 						x = 0;
 						y++;
 					}
 				x++;
 				}
 				break;
 			case NL:
 				y++;
 				x = 0;
 				break;
 			case WS:
 				x++;
 				if (x >= mincols) {
 					x = 0;
 					y++;
 				}
 				break;
 			default:
 				if (tp->words[i] + x <= mincols) {
 					x += tp->words[i];
 					for (z = 0 ; z != tp->words[i]; l++ )
 						z += tp->wletters[l];
 				} else if (tp->words[i] <= mincols) {
 					y++;
 					x = tp->words[i];
 					for (z = 0 ; z != tp->words[i]; l++ )
 						z += tp->wletters[l];
 				} else {
 					for (j = tp->words[i]; j > 0; ) {
 						y = (x == 0) ? y : y + 1;
 						z = 0;
 						while (z != j && z < mincols) {
 							z += tp->wletters[l];
 							l++;
 						}
 						x = z;
 						line = MAX(line, x);
 						j -= z;
 					}
 				}
 			}
 			line = MAX(line, x);
 		}
 
 		if (increasecols == false)
 			break;
 		if (mincols >= maxwidth)
 			break;
 		if (line >= y * (int)conf->text.cols_per_row && y <= maxrows)
 			break;
 		mincols++;
 	}
 
 	*h = (tp->nword == 0) ? 0 : y;
 	*w = MIN(mincols, line); /* wtext can be less than mincols */
 
 	return (0);
 }
 
 int
 text_size(struct bsddialog_conf *conf, int rows, int cols, const char *text,
     struct buttons *bs, int rowsnotext, int startwtext, int *htext, int *wtext)
 {
 	bool changewtext;
 	int wbuttons, maxhtext;
 	struct textproperties tp;
 
 	wbuttons = 0;
 	if (bs != NULL)
 		wbuttons = buttons_min_width(*bs);
 
 	/* Rows */
 	if (rows == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_FULLSCREEN) {
 		maxhtext = widget_max_height(conf) - VBORDERS - rowsnotext;
 	} else { /* fixed */
 		maxhtext = rows - VBORDERS - rowsnotext;
 	}
 	if (bs != NULL)
 		maxhtext -= 2;
 	if (maxhtext <= 0)
 		maxhtext = 1; /* text_autosize() computes always htext */
 
 	/* Cols */
 	if (cols == BSDDIALOG_AUTOSIZE) {
 		startwtext = MAX(startwtext, wbuttons - TEXTHMARGINS);
 		changewtext = true;
 	} else if (cols == BSDDIALOG_FULLSCREEN) {
 		startwtext = widget_max_width(conf) - VBORDERS - TEXTHMARGINS;
 		changewtext = false;
 	} else { /* fixed */
 		startwtext = cols - VBORDERS - TEXTHMARGINS;
 		changewtext = false;
 	}
 
 	if (startwtext <= 0 && changewtext)
 		startwtext = 1;
 	if (startwtext <= 0)
 		RETURN_ERROR("Fullscreen or fixed cols to print text <=0");
 
 	/* Sizing calculation */
 	if (text_properties(conf, text, &tp) != 0)
 		return (BSDDIALOG_ERROR);
 	if (text_autosize(conf, &tp, maxhtext, startwtext, changewtext, htext,
 	    wtext) != 0)
 		return (BSDDIALOG_ERROR);
 
 	free(tp.words);
 	free(tp.wletters);
 
 	return (0);
 }
 
 /* Widget size and position */
 int widget_max_height(struct bsddialog_conf *conf)
 {
 	int maxheight;
 
 	maxheight = conf->shadow ? SCREENLINES - (int)t.shadow.y : SCREENLINES;
 	if (maxheight <= 0)
 		RETURN_ERROR("Terminal too small, screen lines - shadow <= 0");
 
 	if (conf->y != BSDDIALOG_CENTER && conf->auto_topmargin > 0)
 		RETURN_ERROR("conf.y > 0 and conf->auto_topmargin > 0");
 	else if (conf->y == BSDDIALOG_CENTER) {
 		maxheight -= conf->auto_topmargin;
 		if (maxheight <= 0)
 			RETURN_ERROR("Terminal too small, screen lines - top "
 			    "margins <= 0");
 	} else if (conf->y > 0) {
 		maxheight -= conf->y;
 		if (maxheight <= 0)
 			RETURN_ERROR("Terminal too small, screen lines - "
 			    "shadow - y <= 0");
 	}
 
 	maxheight -= conf->auto_downmargin;
 	if (maxheight <= 0)
 		RETURN_ERROR("Terminal too small, screen lines - Down margins "
 		    "<= 0");
 
 	return (maxheight);
 }
 
 int widget_max_width(struct bsddialog_conf *conf)
 {
 	int maxwidth;
 
 	maxwidth = conf->shadow ? SCREENCOLS - (int)t.shadow.x : SCREENCOLS;
 	if (maxwidth <= 0)
 		RETURN_ERROR("Terminal too small, screen cols - shadow <= 0");
 
 	if (conf->x > 0) {
 		maxwidth -= conf->x;
 		if (maxwidth <= 0)
 			RETURN_ERROR("Terminal too small, screen cols - shadow "
 			    "- x <= 0");
 	}
 
 	return (maxwidth);
 }
 
 int
 widget_min_height(struct bsddialog_conf *conf, int htext, int minwidget,
     bool withbuttons)
 {
 	int min;
 
 	min = 0;
 
 	/* buttons */
 	if (withbuttons)
 		min += 2; /* buttons and border */
 
 	/* text */
 	min += htext;
 
 	/* specific widget min height */
 	min += minwidget;
 
 	/* dialog borders */
 	min += HBORDERS;
 	/* conf.auto_minheight */
 	min = MAX(min, (int)conf->auto_minheight);
 	/* avoid terminal overflow */
 	min = MIN(min, widget_max_height(conf));
 
 	return (min);
 }
 
 int
 widget_min_width(struct bsddialog_conf *conf, int wtext, int minwidget,
     struct buttons *bs)
 
 {
 	int min, delimtitle, wbottomtitle, wtitle;
 
 	min = 0;
 
 	/* buttons */
 	if (bs != NULL)
 		min += buttons_min_width(*bs);
 
 	/* text */
 	if (wtext > 0)
 		min = MAX(min, wtext + TEXTHMARGINS);
 
 	/* specific widget min width */
 	min = MAX(min, minwidget);
 
 	/* title */
 	if (conf->title != NULL) {
 		delimtitle = t.dialog.delimtitle ? 2 : 0;
 		wtitle = strcols(conf->title);
 		min = MAX(min, wtitle + 2 + delimtitle);
 	}
 
 	/* bottom title */
 	if (conf->bottomtitle != NULL) {
 		wbottomtitle = strcols(conf->bottomtitle);
 		min = MAX(min, wbottomtitle + 4);
 	}
 
 	/* dialog borders */
 	min += VBORDERS;
 	/* conf.auto_minwidth */
 	min = MAX(min, (int)conf->auto_minwidth);
 	/* avoid terminal overflow */
 	min = MIN(min, widget_max_width(conf));
 
 	return (min);
 }
 
 int
 set_widget_size(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w)
 {
 	int maxheight, maxwidth;
 
 	if ((maxheight = widget_max_height(conf)) == BSDDIALOG_ERROR)
 		return (BSDDIALOG_ERROR);
 
 	if (rows == BSDDIALOG_FULLSCREEN)
 		*h = maxheight;
 	else if (rows < BSDDIALOG_FULLSCREEN)
 		RETURN_ERROR("Negative (less than -1) height");
-	else if (rows > BSDDIALOG_AUTOSIZE) {
-		if ((*h = rows) > maxheight)
-			RETURN_ERROR("Height too big (> terminal height - "
-			    "shadow)");
-	}
+	else if (rows > BSDDIALOG_AUTOSIZE) /* fixed rows */
+		*h = MIN(rows, maxheight); /* rows is at most maxheight */
 	/* rows == AUTOSIZE: each widget has to set its size */
 
 	if ((maxwidth = widget_max_width(conf)) == BSDDIALOG_ERROR)
 		return (BSDDIALOG_ERROR);
 
 	if (cols == BSDDIALOG_FULLSCREEN)
 		*w = maxwidth;
 	else if (cols < BSDDIALOG_FULLSCREEN)
 		RETURN_ERROR("Negative (less than -1) width");
-	else if (cols > BSDDIALOG_AUTOSIZE) {
-		if ((*w = cols) > maxwidth)
-			RETURN_ERROR("Width too big (> terminal width - "
-			    "shadow)");
-	}
+	else if (cols > BSDDIALOG_AUTOSIZE) /* fixed cols */
+		*w = MIN(cols, maxwidth); /* cols is at most maxwidth */
 	/* cols == AUTOSIZE: each widget has to set its size */
 
 	return (0);
 }
 
 int
 set_widget_position(struct bsddialog_conf *conf, int *y, int *x, int h, int w)
 {
 	int hshadow = conf->shadow ? (int)t.shadow.y : 0;
 	int wshadow = conf->shadow ? (int)t.shadow.x : 0;
 
 	if (conf->y == BSDDIALOG_CENTER) {
 		*y = SCREENLINES/2 - (h + hshadow)/2;
 		if (*y < (int)conf->auto_topmargin)
 			*y = conf->auto_topmargin;
 		if (*y + h + hshadow > SCREENLINES - (int)conf->auto_downmargin)
 			*y = SCREENLINES - h - hshadow - conf->auto_downmargin;
 	}
 	else if (conf->y < BSDDIALOG_CENTER)
 		RETURN_ERROR("Negative begin y (less than -1)");
 	else if (conf->y >= SCREENLINES)
 		RETURN_ERROR("Begin Y under the terminal");
 	else
 		*y = conf->y;
 
 	if (*y + h + hshadow > SCREENLINES)
 		RETURN_ERROR("The lower of the box under the terminal "
 		    "(begin Y + height (+ shadow) > terminal lines)");
 
 
 	if (conf->x == BSDDIALOG_CENTER)
 		*x = SCREENCOLS/2 - (w + wshadow)/2;
 	else if (conf->x < BSDDIALOG_CENTER)
 		RETURN_ERROR("Negative begin x (less than -1)");
 	else if (conf->x >= SCREENCOLS)
 		RETURN_ERROR("Begin X over the right of the terminal");
 	else
 		*x = conf->x;
 
 	if ((*x + w + wshadow) > SCREENCOLS)
 		RETURN_ERROR("The right of the box over the terminal "
 		    "(begin X + width (+ shadow) > terminal cols)");
 
 	return (0);
 }
 
 /* Widgets build, update, destroy */
 void
 draw_borders(struct bsddialog_conf *conf, WINDOW *win, int rows, int cols,
     enum elevation elev)
 {
 	int leftcolor, rightcolor;
 	int ls, rs, ts, bs, tl, tr, bl, br, ltee, rtee;
 
 	if (conf->no_lines)
 		return;
 
 	if (conf->ascii_lines) {
 		ls = rs = '|';
 		ts = bs = '-';
 		tl = tr = bl = br = ltee = rtee = '+';
 	} else {
 		ls = rs = ACS_VLINE;
 		ts = bs = ACS_HLINE;
 		tl = ACS_ULCORNER;
 		tr = ACS_URCORNER;
 		bl = ACS_LLCORNER;
 		br = ACS_LRCORNER;
 		ltee = ACS_LTEE;
 		rtee = ACS_RTEE;
 	}
 
 	leftcolor = elev == RAISED ?
 	    t.dialog.lineraisecolor : t.dialog.linelowercolor;
 	rightcolor = elev == RAISED ?
 	    t.dialog.linelowercolor : t.dialog.lineraisecolor;
 	wattron(win, leftcolor);
 	wborder(win, ls, rs, ts, bs, tl, tr, bl, br);
 	wattroff(win, leftcolor);
 
 	wattron(win, rightcolor);
 	mvwaddch(win, 0, cols-1, tr);
 	mvwvline(win, 1, cols-1, rs, rows-2);
 	mvwaddch(win, rows-1, cols-1, br);
 	mvwhline(win, rows-1, 1, bs, cols-2);
 	wattroff(win, rightcolor);
 }
 
 WINDOW *
 new_boxed_window(struct bsddialog_conf *conf, int y, int x, int rows, int cols,
     enum elevation elev)
 {
 	WINDOW *win;
 
 	if ((win = newwin(rows, cols, y, x)) == NULL) {
 		set_error_string("Cannot build boxed window");
 		return (NULL);
 	}
 
 	wbkgd(win, t.dialog.color);
 
 	draw_borders(conf, win, rows, cols, elev);
 
 	return (win);
 }
 
 static int
 draw_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
     WINDOW *textpad, const char *text, struct buttons *bs, bool shortcutbuttons)
 {
 	int h, w, wtitle, wbottomtitle, ts, ltee, rtee;
 
 	ts = conf->ascii_lines ? '-' : ACS_HLINE;
 	ltee = conf->ascii_lines ? '+' : ACS_LTEE;
 	rtee = conf->ascii_lines ? '+' : ACS_RTEE;
 
 	getmaxyx(widget, h, w);
 
 	if (conf->shadow)
 		wnoutrefresh(shadow);
 
 	draw_borders(conf, widget, h, w, RAISED);
 
 	if (conf->title != NULL) {
 		if ((wtitle = strcols(conf->title)) < 0)
 			return (BSDDIALOG_ERROR);
 		if (t.dialog.delimtitle && conf->no_lines == false) {
 			wattron(widget, t.dialog.lineraisecolor);
 			mvwaddch(widget, 0, w/2 - wtitle/2 -1, rtee);
 			wattroff(widget, t.dialog.lineraisecolor);
 		}
 		wattron(widget, t.dialog.titlecolor);
 		mvwaddstr(widget, 0, w/2 - wtitle/2, conf->title);
 		wattroff(widget, t.dialog.titlecolor);
 		if (t.dialog.delimtitle && conf->no_lines == false) {
 			wattron(widget, t.dialog.lineraisecolor);
 			waddch(widget, ltee);
 			wattroff(widget, t.dialog.lineraisecolor);
 		}
 	}
 
 	if (bs != NULL) {
 		if (conf->no_lines == false) {
 			wattron(widget, t.dialog.lineraisecolor);
 			mvwaddch(widget, h-3, 0, ltee);
 			mvwhline(widget, h-3, 1, ts, w-2);
 			wattroff(widget, t.dialog.lineraisecolor);
 
 			wattron(widget, t.dialog.linelowercolor);
 			mvwaddch(widget, h-3, w-1, rtee);
 			wattroff(widget, t.dialog.linelowercolor);
 		}
 		draw_buttons(widget, *bs, shortcutbuttons);
 	}
 
 	if (conf->bottomtitle != NULL) {
 		if ((wbottomtitle = strcols(conf->bottomtitle)) < 0)
 			return (BSDDIALOG_ERROR);
 		wattron(widget, t.dialog.bottomtitlecolor);
 		wmove(widget, h - 1, w/2 - wbottomtitle/2 - 1);
 		waddch(widget, ' ');
 		waddstr(widget, conf->bottomtitle);
 		waddch(widget, ' ');
 		wattroff(widget, t.dialog.bottomtitlecolor);
 	}
 
 	wnoutrefresh(widget);
 
 	if (textpad != NULL && text != NULL) /* textbox */
 		if (print_textpad(conf, textpad, text) !=0)
 			return (BSDDIALOG_ERROR);
 
 	return (0);
 }
 
 int
 update_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
     int y, int x, int h, int w, WINDOW *textpad, const char *text,
     struct buttons *bs, bool shortcutbuttons)
 {
 	int error;
 
 	if (conf->shadow) {
 		wclear(shadow);
 		mvwin(shadow, y + t.shadow.y, x + t.shadow.x);
 		wresize(shadow, h, w);
 	}
 
 	wclear(widget);
 	mvwin(widget, y, x);
 	wresize(widget, h, w);
 
 	if (textpad != NULL) {
 		wclear(textpad);
 		wresize(textpad, 1, w - HBORDERS - TEXTHMARGINS);
 	}
 
 	error = draw_dialog(conf, shadow, widget, textpad, text, bs,
 	    shortcutbuttons);
 
 	return (error);
 }
 
 int
 new_dialog(struct bsddialog_conf *conf, WINDOW **shadow, WINDOW **widget, int y,
     int x, int h, int w, WINDOW **textpad, const char *text, struct buttons *bs,
     bool shortcutbuttons)
 {
 	int error;
 
 	if (conf->shadow) {
 		*shadow = newwin(h, w, y + t.shadow.y, x + t.shadow.x);
 		if (*shadow == NULL)
 			RETURN_ERROR("Cannot build shadow");
 		wbkgd(*shadow, t.shadow.color);
 	}
 
 	if ((*widget = new_boxed_window(conf, y, x, h, w, RAISED)) == NULL) {
 		if (conf->shadow)
 			delwin(*shadow);
 		return (BSDDIALOG_ERROR);
 	}
 
 	if (textpad != NULL && text != NULL) { /* textbox */
 		*textpad = newpad(1, w - HBORDERS - TEXTHMARGINS);
 		if (*textpad == NULL) {
 			delwin(*widget);
 			if (conf->shadow)
 				delwin(*shadow);
 			RETURN_ERROR("Cannot build the pad window for text");
 		}
 		wbkgd(*textpad, t.dialog.color);
 	}
 
 	error = draw_dialog(conf, *shadow, *widget,
 	    textpad == NULL ? NULL : *textpad, text, bs, shortcutbuttons);
 
 	return (error);
 }
 
 void
 end_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
     WINDOW *textpad)
 {
 	int y, x, h, w;
 
 	getbegyx(widget, y, x);
 	getmaxyx(widget, h, w);
 
 	if (conf->sleep > 0)
 		sleep(conf->sleep);
 
 	if (textpad != NULL)
 		delwin(textpad);
 
 	delwin(widget);
 
 	if (conf->shadow)
 		delwin(shadow);
 
 	if (conf->clear)
 		hide_widget(y, x, h, w, conf->shadow);
 
 	if (conf->get_height != NULL)
 		*conf->get_height = h;
 	if (conf->get_width != NULL)
 		*conf->get_width = w;
 }
diff --git a/lib/lib_util.h b/lib/lib_util.h
index 238d3fda4675..17ea0e0d1368 100644
--- a/lib/lib_util.h
+++ b/lib/lib_util.h
@@ -1,141 +1,144 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _LIBBSDDIALOG_UTIL_H_
 #define _LIBBSDDIALOG_UTIL_H_
 
 #define HBORDERS	2
 #define VBORDERS	2
 #define TEXTHMARGIN     1
 #define TEXTHMARGINS    (TEXTHMARGIN + TEXTHMARGIN)
 
 /* theme utils */
 extern struct bsddialog_theme t;
 extern bool hastermcolors;
 
 /* debug */
 #define BSDDIALOG_DEBUG(y,x,fmt, ...) do {	\
 	mvprintw(y, x, fmt, __VA_ARGS__);	\
 	refresh();				\
 } while (0)
 
+/* date */
+#define ISLEAP(year) ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
+
 /* unicode */
 unsigned int strcols(const char *mbstring);
 int str_props(const char *mbstring, unsigned int *cols, bool *has_multi_col);
 void mvwaddwch(WINDOW *w, int y, int x, wchar_t wch);
 wchar_t* alloc_mbstows(const char *mbstring);
 
 /* error buffer */
 const char *get_error_string(void);
 void set_error_string(const char *string);
 
 #define RETURN_ERROR(str) do {			\
 	set_error_string(str);			\
 	return (BSDDIALOG_ERROR);		\
 } while (0)
 
 /* buttons */
 struct buttons {
 	unsigned int nbuttons;
 #define MAXBUTTONS 6 /* ok + extra + cancel + help + 2 generics */
 	const char *label[MAXBUTTONS];
 	wchar_t first[MAXBUTTONS];
 	int value[MAXBUTTONS];
 	int curr;
 	unsigned int sizebutton; /* including left and right delimiters */
 };
 
 #define BUTTON_OK_LABEL      "OK"
 #define BUTTON_CANCEL_LABEL  "Cancel"
 void
 get_buttons(struct bsddialog_conf *conf, struct buttons *bs,
     const char *yesoklabel, const char *nocancellabel);
 
 void
 draw_buttons(WINDOW *window, struct buttons bs, bool shortcut);
 
 int buttons_min_width(struct buttons bs);
 bool shortcut_buttons(wint_t key, struct buttons *bs);
 
 /* help window with F1 key */
 int f1help(struct bsddialog_conf *conf);
 
 /* cleaner */
 int hide_widget(int y, int x, int h, int w, bool withshadow);
 
 /* (auto) size and (auto) position */
 #define SCREENLINES (getmaxy(stdscr))
 #define SCREENCOLS  (getmaxx(stdscr))
 
 int
 text_size(struct bsddialog_conf *conf, int rows, int cols, const char *text,
     struct buttons *bs, int rowsnotext, int startwtext, int *htext, int *wtext);
 
 int widget_max_height(struct bsddialog_conf *conf);
 int widget_max_width(struct bsddialog_conf *conf);
 
 int
 widget_min_height(struct bsddialog_conf *conf, int htext, int minwidget,
     bool withbuttons);
 
 int
 widget_min_width(struct bsddialog_conf *conf, int wtext, int minwidget,
     struct buttons *bs);
 
 int
 set_widget_size(struct bsddialog_conf *conf, int rows, int cols, int *h,
     int *w);
 
 int
 set_widget_position(struct bsddialog_conf *conf, int *y, int *x, int h, int w);
 
 /* widget builders */
 enum elevation { RAISED, LOWERED };
 
 void
 draw_borders(struct bsddialog_conf *conf, WINDOW *win, int rows, int cols,
     enum elevation elev);
 
 WINDOW *
 new_boxed_window(struct bsddialog_conf *conf, int y, int x, int rows, int cols,
     enum elevation elev);
 
 int
 new_dialog(struct bsddialog_conf *conf, WINDOW **shadow, WINDOW **widget, int y,
     int x, int h, int w, WINDOW **textpad, const char *text, struct buttons *bs,
     bool shortcutbuttons);
 
 int
 update_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
     int y, int x, int h, int w, WINDOW *textpad, const char *text,
     struct buttons *bs, bool shortcutbuttons);
 
 void
 end_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget,
     WINDOW *textpad);
 
 #endif
diff --git a/lib/libbsddialog.c b/lib/libbsddialog.c
index 1a8188b0e7d3..73c1f5c2dd57 100644
--- a/lib/libbsddialog.c
+++ b/lib/libbsddialog.c
@@ -1,140 +1,142 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <curses.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
 #define COLSPERROW  10   /* Default conf.text.columns_per_row */
 
 int bsddialog_init_notheme(void)
 {
 	int i, j, c, error;
 
 	set_error_string("");
 
 	if (initscr() == NULL)
 		RETURN_ERROR("Cannot init curses (initscr)");
 
 	error = OK;
 	error += keypad(stdscr, TRUE);
 	nl();
 	error += cbreak();
 	error += noecho();
 	curs_set(0);
 	if (error != OK) {
 		bsddialog_end();
 		RETURN_ERROR("Cannot init curses (keypad and cursor)");
 	}
 
 	c = 1;
 	error += start_color();
 	for (i = 0; i < 8; i++) {
 		for (j = 0; j < 8; j++) {
 			error += init_pair(c, i, j);
 			c++;
 		}
 	}
 
 	hastermcolors = (error == OK && has_colors()) ? true : false;
 
 	return (BSDDIALOG_OK);
 }
 
 int bsddialog_init(void)
 {
 	enum bsddialog_default_theme theme;
 
 	bsddialog_init_notheme();
 
 	if (bsddialog_hascolors())
 		theme = BSDDIALOG_THEME_FLAT;
 	else
 		theme = BSDDIALOG_THEME_BLACKWHITE;
 
 	if (bsddialog_set_default_theme(theme) != 0) {
 		bsddialog_end();
 		return (BSDDIALOG_ERROR);
 	}
 
 	return (BSDDIALOG_OK);
 }
 
 int bsddialog_end(void)
 {
 	if (endwin() != OK)
 		RETURN_ERROR("Cannot end curses (endwin)");
 
 	return (BSDDIALOG_OK);
 }
 
 int bsddialog_backtitle(struct bsddialog_conf *conf, const char *backtitle)
 {
-	mvaddstr(0, 1, backtitle);
+	move(0, 1);
+	clrtoeol();
+	addstr(backtitle);
 	if (conf->no_lines != true)
 		mvhline(1, 1, conf->ascii_lines ? '-' : ACS_HLINE,
 		    SCREENCOLS - 2);
 
 	refresh();
 
 	return (BSDDIALOG_OK);
 }
 
 const char *bsddialog_geterror(void)
 {
 	return (get_error_string());
 }
 
 int bsddialog_initconf(struct bsddialog_conf *conf)
 {
 	if (conf == NULL)
 		RETURN_ERROR("conf is NULL");
 	if (sizeof(*conf) != sizeof(struct bsddialog_conf))
 		RETURN_ERROR("Bad conf size");
 
 	memset(conf, 0, sizeof(struct bsddialog_conf));
 	conf->y = BSDDIALOG_CENTER;
 	conf->x = BSDDIALOG_CENTER;
 	conf->shadow = true;
 	conf->text.cols_per_row = COLSPERROW;
 
 	return (BSDDIALOG_OK);
 }
 
 int bsddialog_clearterminal(void)
 {
 	if (clear() != OK)
 		RETURN_ERROR("Cannot clear the terminal");
 	refresh();
 
 	return (BSDDIALOG_OK);
 }
\ No newline at end of file
diff --git a/lib/menubox.c b/lib/menubox.c
index 28b9c8a0923b..bd06a9e37df2 100644
--- a/lib/menubox.c
+++ b/lib/menubox.c
@@ -1,824 +1,822 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <ctype.h>
 #include <curses.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
-#define DEPTH       2
 #define MIN_HEIGHT  VBORDERS + 6 /* 2 buttons 1 text 3 menu */
 
 enum menumode {
 	CHECKLISTMODE,
 	MENUMODE,
 	MIXEDLISTMODE,
 	RADIOLISTMODE,
 	SEPARATORMODE
 };
 
 struct lineposition {
 	unsigned int maxsepstr;
 	unsigned int maxprefix;
 	unsigned int xselector;
 	unsigned int selectorlen;
 	unsigned int maxdepth;
 	unsigned int xname;
 	unsigned int maxname;
 	unsigned int xdesc;
 	unsigned int maxdesc;
 	unsigned int line;
 };
 
 struct privateitem {
 	bool on;
 	int group;
 	int index;
 	enum menumode type;
 	struct bsddialog_menuitem *item;
 };
 
 static void
 set_on_output(struct bsddialog_conf *conf, int output, int ngroups,
     struct bsddialog_menugroup *groups, struct privateitem *pritems)
 {
 	int i, j, abs;
 
 	if (output != BSDDIALOG_OK && !conf->menu.on_without_ok)
 		return;
 
 	for(i = abs = 0; i < ngroups; i++) {
 		if (groups[i].type == BSDDIALOG_SEPARATOR) {
 			abs += groups[i].nitems;
 			continue;
 		}
 
 		for(j = 0; j < (int)groups[i].nitems; j++) {
 			groups[i].items[j].on = pritems[abs].on;
 			abs++;
 		}
 	}
 }
 
 static int getprev(struct privateitem *pritems, int abs)
 {
 	int i;
 
 	for (i = abs - 1; i >= 0; i--) {
 		if (pritems[i].type == SEPARATORMODE)
 			continue;
 		return (i);
 	}
 
 	return (abs);
 }
 
 static int getnext(int npritems, struct privateitem *pritems, int abs)
 {
 	int i;
 
 	for (i = abs + 1; i < npritems; i++) {
 		if (pritems[i].type == SEPARATORMODE)
 			continue;
 		return (i);
 	}
 
 	return (abs);
 }
 
 static int
 getfirst_with_default(int npritems, struct privateitem *pritems, int ngroups,
     struct bsddialog_menugroup *groups, int *focusgroup, int *focusitem)
 {
 	int i, abs;
 
 	if ((abs =  getnext(npritems, pritems, -1)) < 0)
 		return (abs);
 
 	if (focusgroup == NULL || focusitem == NULL)
 		return (abs);
 	if (*focusgroup < 0 || *focusgroup >= ngroups)
 		return (abs);
 	if (groups[*focusgroup].type == BSDDIALOG_SEPARATOR)
 		return (abs);
 	if (*focusitem < 0 || *focusitem >= (int)groups[*focusgroup].nitems)
 		return (abs);
 
 	for (i = abs; i < npritems; i++) {
 		if (pritems[i].group == *focusgroup &&
 		    pritems[i].index == *focusitem)
 			return (i);
 	}
 
 	return (abs);
 }
 
 static int
 getfastnext(int menurows, int npritems, struct privateitem *pritems, int abs)
 {
 	int a, start, i;
 
 	start = abs;
 	i = menurows;
 	do {
 		a = abs;
 		abs = getnext(npritems, pritems, abs);
 		i--;
 	} while (abs != a && abs < start + menurows && i > 0);
 
 	return (abs);
 }
 
 static int
 getfastprev(int menurows, struct privateitem *pritems, int abs)
 {
 	int a, start, i;
 
 	start = abs;
 	i = menurows;
 	do {
 		a = abs;
 		abs = getprev(pritems, abs);
 		i--;
 	} while (abs != a && abs > start - menurows && i > 0);
 
 	return (abs);
 }
 
 static int
 getnextshortcut(struct bsddialog_conf *conf, int npritems,
     struct privateitem *pritems, int abs, wint_t key)
 {
 	int i, next;
 	wchar_t wch;
 
 	next = -1;
 	for (i = 0; i < npritems; i++) {
 		if (pritems[i].type == SEPARATORMODE)
 			continue;
 
 		if (conf->menu.no_name)
 			mbtowc(&wch, pritems[i].item->desc, MB_CUR_MAX);
 		else
 			mbtowc(&wch, pritems[i].item->name, MB_CUR_MAX);
 
 		if (wch == (wchar_t)key) {
 			if (i > abs)
 				return (i);
 
 			if (i < abs && next == -1)
 				next = i;
 		}
 	}
 
 	return (next != -1 ? next : abs);
 }
 
 static enum menumode
 getmode(enum menumode mode, struct bsddialog_menugroup group)
 {
 	if (mode == MIXEDLISTMODE) {
 		if (group.type == BSDDIALOG_SEPARATOR)
 			mode = SEPARATORMODE;
 		else if (group.type == BSDDIALOG_RADIOLIST)
 			mode = RADIOLISTMODE;
 		else if (group.type == BSDDIALOG_CHECKLIST)
 			mode = CHECKLISTMODE;
 	}
 
 	return (mode);
 }
 
 static void
 drawseparators(struct bsddialog_conf *conf, WINDOW *pad, int linelen,
     int nitems, struct privateitem *pritems)
 {
 	int i, linech, labellen;
 	const char *desc, *name;
 
 	for (i = 0; i < nitems; i++) {
 		if (pritems[i].type != SEPARATORMODE)
 			continue;
 		if (conf->no_lines == false) {
 			wattron(pad, t.menu.desccolor);
 			linech = conf->ascii_lines ? '-' : ACS_HLINE;
 			mvwhline(pad, i, 0, linech, linelen);
 			wattroff(pad, t.menu.desccolor);
 		}
 		name = pritems[i].item->name;
 		desc = pritems[i].item->desc;
 		labellen = strcols(name) + strcols(desc) + 1;
 		wmove(pad, i, labellen < linelen ? linelen/2 - labellen/2 : 0);
 		wattron(pad, t.menu.namesepcolor);
 		waddstr(pad, name);
 		wattroff(pad, t.menu.namesepcolor);
 		if (strcols(name) > 0 && strcols(desc) > 0)
 			waddch(pad, ' ');
 		wattron(pad, t.menu.descsepcolor);
 		waddstr(pad, desc);
 		wattroff(pad, t.menu.descsepcolor);
 	}
 }
 
 static void
 drawitem(struct bsddialog_conf *conf, WINDOW *pad, int y,
     struct lineposition pos, struct privateitem *pritem, bool focus)
 {
 	int colordesc, colorname, colorshortcut;
 	wchar_t shortcut;
 	struct bsddialog_menuitem *item;
 
 	item = pritem->item;
 
 	/* prefix */
 	if (item->prefix != NULL && item->prefix[0] != '\0')
 		mvwaddstr(pad, y, 0, item->prefix);
 
 	/* selector */
 	wmove(pad, y, pos.xselector);
 	wattron(pad, focus ? t.menu.f_selectorcolor : t.menu.selectorcolor);
 	if (pritem->type == CHECKLISTMODE)
 		wprintw(pad, "[%c]", pritem->on ? 'X' : ' ');
 	if (pritem->type == RADIOLISTMODE)
 		wprintw(pad, "(%c)", pritem->on ? '*' : ' ');
 	wattroff(pad, focus ? t.menu.f_selectorcolor : t.menu.selectorcolor);
 
 	/* name */
 	colorname = focus ? t.menu.f_namecolor : t.menu.namecolor;
 	if (conf->menu.no_name == false) {
 		wattron(pad, colorname);
-		mvwaddstr(pad, y, pos.xname + item->depth * DEPTH, item->name);
+		mvwaddstr(pad, y, pos.xname + item->depth, item->name);
 		wattroff(pad, colorname);
 	}
 
 	/* description */
 	if (conf->menu.no_name)
 		colordesc = focus ? t.menu.f_namecolor : t.menu.namecolor;
 	else
 		colordesc = focus ? t.menu.f_desccolor : t.menu.desccolor;
 
 	if (conf->menu.no_desc == false) {
 		wattron(pad, colordesc);
 		if (conf->menu.no_name)
-			mvwaddstr(pad, y, pos.xname + item->depth * DEPTH,
-			    item->desc);
+			mvwaddstr(pad, y, pos.xname + item->depth, item->desc);
 		else
 			mvwaddstr(pad, y, pos.xdesc, item->desc);
 		wattroff(pad, colordesc);
 	}
 
 	/* shortcut */
 	if (conf->menu.shortcut_buttons == false) {
 		colorshortcut = focus ?
 		    t.menu.f_shortcutcolor : t.menu.shortcutcolor;
 		wattron(pad, colorshortcut);
 
 		if (conf->menu.no_name)
 			mbtowc(&shortcut, item->desc, MB_CUR_MAX);
 		else
 			mbtowc(&shortcut, item->name, MB_CUR_MAX);
-		mvwaddwch(pad, y, pos.xname + item->depth * DEPTH, shortcut);
+		mvwaddwch(pad, y, pos.xname + item->depth, shortcut);
 		wattroff(pad, colorshortcut);
 	}
 
 	/* bottom description */
 	move(SCREENLINES - 1, 2);
 	clrtoeol();
 	if (item->bottomdesc != NULL && focus) {
 		attron(t.menu.bottomdesccolor);
 		addstr(item->bottomdesc);
 		attroff(t.menu.bottomdesccolor);
 		refresh();
 	}
 }
 
 /* the caller has to call prefresh(menupad, ymenupad, 0, ys, xs, ye, xe); */
 static void
 update_menuwin(struct bsddialog_conf *conf, WINDOW *menuwin, int h, int w,
     int totnitems, unsigned int menurows, int ymenupad)
 {
 	draw_borders(conf, menuwin, h, w, LOWERED);
 
 	if (totnitems > (int)menurows) {
 		wattron(menuwin, t.dialog.arrowcolor);
 		if (ymenupad > 0)
 			mvwhline(menuwin, 0, 2,
 			    conf->ascii_lines ? '^' : ACS_UARROW, 3);
 
 		if ((ymenupad + (int)menurows) < totnitems)
 			mvwhline(menuwin, h-1, 2,
 			    conf->ascii_lines ? 'v' : ACS_DARROW, 3);
 
 		mvwprintw(menuwin, h-1, w-6, "%3d%%",
 		    100 * (ymenupad + menurows) / totnitems);
 		wattroff(menuwin, t.dialog.arrowcolor);
 	}
 }
 
 static int
 menu_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h, int *w,
     const char *text, int linelen, unsigned int *menurows, int nitems,
     struct buttons bs)
 {
 	int htext, wtext, menusize, notext;
 
 	notext = 2;
 	if (*menurows == BSDDIALOG_AUTOSIZE) {
 		/* algo 1): grows vertically */
 		/* notext = 1; */
 		/* algo 2): grows horizontally, better with little screens */
 		notext += nitems;
 		notext = MIN(notext, widget_max_height(conf) - HBORDERS - 3);
 	} else
 		notext += *menurows;
 
-	/* cols autosize, rows autosize, rows fullscreen, menu particularity */
-	if (cols == BSDDIALOG_AUTOSIZE || rows <= BSDDIALOG_AUTOSIZE) {
-		if (text_size(conf, rows, cols, text, &bs, notext, linelen + 4,
-		    &htext, &wtext) != 0)
-			return (BSDDIALOG_ERROR);
-	}
+	if (text_size(conf, rows, cols, text, &bs, notext, linelen + 4, &htext,
+	    &wtext) != 0)
+		return (BSDDIALOG_ERROR);
 
 	if (cols == BSDDIALOG_AUTOSIZE)
 		*w = widget_min_width(conf, wtext, linelen + 4, &bs);
 
 	if (rows == BSDDIALOG_AUTOSIZE) {
-		if (*menurows == 0) {
+		if (*menurows == BSDDIALOG_AUTOSIZE) {
 			menusize = widget_max_height(conf) - HBORDERS -
 			     2 /*buttons*/ - htext;
 			menusize = MIN(menusize, nitems + 2);
 			*menurows = menusize - 2 < 0 ? 0 : menusize - 2;
-		}
-		else /* h autosize with fixed menurows */
+		} else /* h autosize with fixed menurows */
 			menusize = *menurows + 2;
 
 		*h = widget_min_height(conf, htext, menusize, true);
-		/*
-		 * avoid menurows overflow and
-		 * with rows=AUTOSIZE menurows!=0 becomes max-menurows
-		 */
-		*menurows = MIN(*h - 6 - htext, (int)*menurows);
-	} else {
-		if (*menurows == 0) {
+	} else { /* fixed rows */
+		if (*menurows == BSDDIALOG_AUTOSIZE) {
 			if (*h - 6 - htext <= 0)
 				*menurows = 0; /* menu_checksize() will check */
 			else
 				*menurows = MIN(*h-6-htext, nitems);
 		}
 	}
 
+	/* avoid menurows overflow and menurows becomes at most menurows */
+	if (*h - 6 - htext <= 0)
+		*menurows = 0; /* menu_checksize() will check */
+	else
+		*menurows = MIN(*h - 6 - htext, (int)*menurows);
+
 	return (0);
 }
 
 static int
 menu_checksize(int rows, int cols, const char *text, int menurows, int nitems,
     struct buttons bs)
 {
 	int mincols, textrow, menusize;
 
 	mincols = VBORDERS;
 	/* buttons */
 	mincols += buttons_min_width(bs);
 	/*
 	 * linelen check, comment to allow some hidden col otherwise portconfig
 	 * could not show big menus like www/apache24
 	 */
 	/* mincols = MAX(mincols, linelen); */
 
 	if (cols < mincols)
 		RETURN_ERROR("Few cols, width < size buttons or "
 		    "name + descripion of the items");
 
 	textrow = text != NULL && text[0] != '\0' ? 1 : 0;
 
 	if (nitems > 0 && menurows == 0)
 		RETURN_ERROR("items > 0 but menurows == 0, if menurows = 0 "
 		    "terminal too small");
 
 	menusize = nitems > 0 ? 3 : 0;
 	if (rows < 2  + 2 + menusize + textrow)
 		RETURN_ERROR("Few lines for this menus");
 
 	return (0);
 }
 
 static int
 do_mixedlist(struct bsddialog_conf *conf, const char *text, int rows, int cols,
     unsigned int menurows, enum menumode mode, unsigned int ngroups,
     struct bsddialog_menugroup *groups, int *focuslist, int *focusitem)
 {
 	bool loop, onetrue, movefocus, automenurows, shortcut_butts;
 	int i, j, y, x, h, w, retval;
 	int ymenupad, ys, ye, xs, xe, abs, next, totnitems;
 	wint_t input;
 	WINDOW  *shadow, *widget, *textpad, *menuwin, *menupad;
 	struct buttons bs;
 	struct lineposition pos = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	struct bsddialog_menuitem *item;
 	struct privateitem *pritems;
 
 	shortcut_butts = conf->menu.shortcut_buttons;
 
 	automenurows = (menurows == BSDDIALOG_AUTOSIZE) ? true : false;
 
 	totnitems = 0;
 	for (i = 0; i < (int)ngroups; i++) {
 		if (getmode(mode, groups[i]) == RADIOLISTMODE ||
 		    getmode(mode, groups[i]) == CHECKLISTMODE)
 			pos.selectorlen = 3;
 
 		for (j = 0; j < (int)groups[i].nitems; j++) {
 			totnitems++;
 			item = &groups[i].items[j];
 
 			if (groups[i].type == BSDDIALOG_SEPARATOR) {
 				pos.maxsepstr = MAX(pos.maxsepstr,
 				    strcols(item->name) + strcols(item->desc));
 				continue;
 			}
 
 			pos.maxprefix = MAX(pos.maxprefix,strcols(item->prefix));
 			pos.maxdepth  = MAX(pos.maxdepth, item->depth);
 			pos.maxname   = MAX(pos.maxname, strcols(item->name));
 			pos.maxdesc   = MAX(pos.maxdesc, strcols(item->desc));
 		}
 	}
 	pos.maxname = conf->menu.no_name ? 0 : pos.maxname;
 	pos.maxdesc = conf->menu.no_desc ? 0 : pos.maxdesc;
-	pos.maxdepth = DEPTH * pos.maxdepth;
 
 	pos.xselector = pos.maxprefix + (pos.maxprefix != 0 ? 1 : 0);
 	pos.xname = pos.xselector + pos.selectorlen +
 	    (pos.selectorlen > 0 ? 1 : 0);
 	pos.xdesc = pos.maxdepth + pos.xname + pos.maxname;
 	pos.xdesc += (pos.maxname != 0 ? 1 : 0);
 	pos.line = MAX(pos.maxsepstr + 3, pos.xdesc + pos.maxdesc);
 
 	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return (BSDDIALOG_ERROR);
 	if (menu_autosize(conf, rows, cols, &h, &w, text, pos.line, &menurows,
 	    totnitems, bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (menu_checksize(h, w, text, menurows, totnitems, bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
 	     shortcut_butts) != 0)
 		return (BSDDIALOG_ERROR);
 
 	doupdate();
 
 	prefresh(textpad, 0, 0, y + 1, x + 1 + TEXTHMARGIN, y + h - menurows,
 	    x + 1 + w - TEXTHMARGIN);
 
 	menuwin = new_boxed_window(conf, y + h - 5 - menurows, x + 2,
 	    menurows + 2, w - 4, LOWERED);
 
 	menupad = newpad(totnitems, pos.line);
 	wbkgd(menupad, t.dialog.color);
 
 	if ((pritems = calloc(totnitems, sizeof (struct privateitem))) == NULL)
 		RETURN_ERROR("Cannot allocate memory for internal menu items");
 
 	abs = 0;
 	for (i = 0; i < (int)ngroups; i++) {
 		onetrue = false;
 		for (j = 0; j < (int)groups[i].nitems; j++) {
 			item = &groups[i].items[j];
 
 			if (getmode(mode, groups[i]) == MENUMODE) {
 				pritems[abs].on = false;
 			} else if (getmode(mode, groups[i]) == RADIOLISTMODE) {
 				pritems[abs].on = onetrue ? false : item->on;
 				if (pritems[abs].on)
 					onetrue = true;
 			} else {
 				pritems[abs].on = item->on;
 			}
 			pritems[abs].group = i;
 			pritems[abs].index = j;
 			pritems[abs].type = getmode(mode, groups[i]);
 			pritems[abs].item = item;
 
 			drawitem(conf, menupad, abs, pos, &pritems[abs], false);
 			abs++;
 		}
 	}
 	drawseparators(conf, menupad, MIN((int)pos.line, w-6), totnitems,
 	    pritems);
 	abs = getfirst_with_default(totnitems, pritems, ngroups, groups,
 	    focuslist, focusitem);
 	if (abs >= 0)
 		drawitem(conf, menupad, abs, pos, &pritems[abs], true);
 
 	ys = y + h - 5 - menurows + 1;
 	ye = y + h - 5 ;
 	if (conf->menu.align_left || (int)pos.line > w - 6) {
 		xs = x + 3;
 		xe = xs + w - 7;
 	} else { /* center */
 		xs = x + 3 + (w-6)/2 - pos.line/2;
 		xe = xs + w - 5;
 	}
 
 	ymenupad = 0;
 	if ((int)(ymenupad + menurows) - 1 < abs)
 		ymenupad = abs - menurows + 1;
 	update_menuwin(conf, menuwin, menurows+2, w-4, totnitems, menurows,
 	    ymenupad);
 	wrefresh(menuwin);
 	prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 
 	movefocus = false;
 	loop = true;
 	while (loop) {
 		if (get_wch(&input) == ERR)
 			continue;
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			retval = bs.value[bs.curr];
 			if (abs >= 0 && pritems[abs].type == MENUMODE)
 				pritems[abs].on = true;
 			set_on_output(conf, retval, ngroups, groups, pritems);
 			loop = false;
 			break;
 		case 27: /* Esc */
 			if (conf->key.enable_esc) {
 				retval = BSDDIALOG_ESC;
 				if (abs >= 0 && pritems[abs].type == MENUMODE)
 					pritems[abs].on = true;
 				set_on_output(conf, retval, ngroups, groups,
 				    pritems);
 				loop = false;
 			}
 			break;
 		case '\t': /* TAB */
 			bs.curr = (bs.curr + 1) % bs.nbuttons;
 			draw_buttons(widget, bs, shortcut_butts);
 			wrefresh(widget);
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
 				draw_buttons(widget, bs, shortcut_butts);
 				wrefresh(widget);
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int) bs.nbuttons - 1) {
 				bs.curr++;
 				draw_buttons(widget, bs, shortcut_butts);
 				wrefresh(widget);
 			}
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return (BSDDIALOG_ERROR);
 			/* No break, screen size can change */
 		case KEY_RESIZE:
 			/* Important for decreasing screen */
 			hide_widget(y, x, h, w, conf->shadow);
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return (BSDDIALOG_ERROR);
 			menurows = automenurows ? 0 : menurows;
 			if (menu_autosize(conf, rows, cols, &h, &w, text,
 			    pos.line, &menurows, totnitems, bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (menu_checksize(h, w, text, menurows, totnitems,
 			    bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return (BSDDIALOG_ERROR);
 
 			if (update_dialog(conf, shadow, widget, y, x, h, w,
 			    textpad, text, &bs, shortcut_butts) != 0)
 				return (BSDDIALOG_ERROR);
 
 			doupdate();
 
 			prefresh(textpad, 0, 0, y + 1, x + 1 + TEXTHMARGIN,
 			    y + h - menurows, x + 1 + w - TEXTHMARGIN);
 
 			wclear(menuwin);
 			mvwin(menuwin, y + h - 5 - menurows, x + 2);
 			wresize(menuwin,menurows+2, w-4);
 			update_menuwin(conf, menuwin, menurows+2, w-4,
 			    totnitems, menurows, ymenupad);
 			wrefresh(menuwin);
 
 			ys = y + h - 5 - menurows + 1;
 			ye = y + h - 5 ;
 			if (conf->menu.align_left || (int)pos.line > w - 6) {
 				xs = x + 3;
 				xe = xs + w - 7;
 			} else { /* center */
 				xs = x + 3 + (w-6)/2 - pos.line/2;
 				xe = xs + w - 5;
 			}
 
 			drawseparators(conf, menupad, MIN((int)pos.line, w-6),
 			    totnitems, pritems);
 
 			if ((int)(ymenupad + menurows) - 1 < abs)
 				ymenupad = abs - menurows + 1;
 			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 
 			refresh();
 
 			break;
 		}
 
 		if (abs < 0)
 			continue;
 		switch(input) {
 		case KEY_HOME:
 			next = getnext(totnitems, pritems, -1);
 			movefocus = next != abs;
 			break;
 		case KEY_UP:
 			next = getprev(pritems, abs);
 			movefocus = next != abs;
 			break;
 		case KEY_PPAGE:
 			next = getfastprev(menurows, pritems, abs);
 			movefocus = next != abs;
 			break;
 		case KEY_END:
 			next = getprev(pritems, totnitems);
 			movefocus = next != abs;
 			break;
 		case KEY_DOWN:
 			next = getnext(totnitems, pritems, abs);
 			movefocus = next != abs;
 			break;
 		case KEY_NPAGE:
 			next = getfastnext(menurows, totnitems, pritems, abs);
 			movefocus = next != abs;
 			break;
 		case ' ': /* Space */
-			if (pritems[abs].type == MENUMODE)
-				break;
-			else if (pritems[abs].type == CHECKLISTMODE)
+			if (pritems[abs].type == MENUMODE) {
+				retval = bs.value[bs.curr];
+				pritems[abs].on = true;
+				set_on_output(conf, retval, ngroups, groups,
+				    pritems);
+				loop = false;
+			} else if (pritems[abs].type == CHECKLISTMODE) {
 				pritems[abs].on = !pritems[abs].on;
-			else { /* RADIOLISTMODE */
+			} else { /* RADIOLISTMODE */
 				for (i = abs - pritems[abs].index;
 				    i < totnitems &&
 				    pritems[i].group == pritems[abs].group;
 				    i++) {
 					if (i != abs && pritems[i].on) {
 						pritems[i].on = false;
 						drawitem(conf, menupad, i, pos,
 						    &pritems[i], false);
 					}
 				}
 				pritems[abs].on = !pritems[abs].on;
 			}
 			drawitem(conf, menupad, abs, pos, &pritems[abs], true);
 			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 			break;
 		default:
 			if (shortcut_butts) {
 				if (shortcut_buttons(input, &bs)) {
 					retval = bs.value[bs.curr];
 					if (pritems[abs].type == MENUMODE)
 						pritems[abs].on = true;
 					set_on_output(conf, retval, ngroups,
 					    groups, pritems);
 					loop = false;
 				}
 				break;
 			}
 
 			/* shourtcut items */
 			next = getnextshortcut(conf, totnitems, pritems, abs,
 			    input);
 			movefocus = next != abs;
 		} /* end switch handler */
 
 		if (movefocus) {
 			drawitem(conf, menupad, abs, pos, &pritems[abs], false);
 			abs = next;
 			drawitem(conf, menupad, abs, pos, &pritems[abs], true);
 			if (ymenupad > abs && ymenupad > 0)
 				ymenupad = abs;
 			if ((int)(ymenupad + menurows) <= abs)
 				ymenupad = abs - menurows + 1;
 			update_menuwin(conf, menuwin, menurows+2, w-4,
 			    totnitems, menurows, ymenupad);
 			wrefresh(menuwin);
 			prefresh(menupad, ymenupad, 0, ys, xs, ye, xe);
 			movefocus = false;
 		}
 	} /* end while handler */
 
 	if (focuslist != NULL)
 		*focuslist = abs < 0 ? -1 : pritems[abs].group;
 	if (focusitem !=NULL)
 		*focusitem = abs < 0 ? -1 : pritems[abs].index;
 
 	delwin(menupad);
 	delwin(menuwin);
 	end_dialog(conf, shadow, widget, textpad);
 	free(pritems);
 
 	return (retval);
 }
 
 /* API */
 int
 bsddialog_mixedlist(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int menurows, unsigned int ngroups,
     struct bsddialog_menugroup *groups, int *focuslist, int *focusitem)
 {
 	int retval;
 
 	retval = do_mixedlist(conf, text, rows, cols, menurows, MIXEDLISTMODE,
 	    ngroups, groups, focuslist, focusitem);
 
 	return (retval);
 }
 
 int
 bsddialog_checklist(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int menurows, unsigned int nitems,
     struct bsddialog_menuitem *items, int *focusitem)
 {
 	int retval, focuslist = 0;
 	struct bsddialog_menugroup group = {
 	    BSDDIALOG_CHECKLIST /* unused */, nitems, items};
 
 	retval = do_mixedlist(conf, text, rows, cols, menurows, CHECKLISTMODE,
 	    1, &group, &focuslist, focusitem);
 
 	return (retval);
 }
 
 int
 bsddialog_menu(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int menurows, unsigned int nitems,
     struct bsddialog_menuitem *items, int *focusitem)
 {
 	int retval, focuslist = 0;
 	struct bsddialog_menugroup group = {
 	    BSDDIALOG_CHECKLIST /* unused */, nitems, items};
 
 	retval = do_mixedlist(conf, text, rows, cols, menurows, MENUMODE, 1,
 	    &group, &focuslist, focusitem);
 
 	return (retval);
 }
 
 int
 bsddialog_radiolist(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int menurows, unsigned int nitems,
     struct bsddialog_menuitem *items, int *focusitem)
 {
 	int retval, focuslist = 0;
 	struct bsddialog_menugroup group = {
 	    BSDDIALOG_RADIOLIST /* unused */, nitems, items};
 
 	retval = do_mixedlist(conf, text, rows, cols, menurows, RADIOLISTMODE,
 	    1, &group, &focuslist, focusitem);
 
 	return (retval);
 }
diff --git a/lib/messagebox.c b/lib/messagebox.c
index 06753be20c3d..7063ea9d273e 100644
--- a/lib/messagebox.c
+++ b/lib/messagebox.c
@@ -1,242 +1,256 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <curses.h>
 #include <string.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
 static int
 message_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
     int *w, const char *text, bool *hastext, struct buttons bs)
 {
 	int htext, wtext;
 
 	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE ||
 	    hastext != NULL) {
 		if (text_size(conf, rows, cols, text, &bs, 0, 1, &htext,
 		    &wtext) != 0)
 			return (BSDDIALOG_ERROR);
 		if (hastext != NULL)
 			*hastext = htext > 0 ? true : false;
 	}
 
 	if (cols == BSDDIALOG_AUTOSIZE)
 		*w = widget_min_width(conf, wtext, 0, &bs);
 
 	if (rows == BSDDIALOG_AUTOSIZE)
 		*h = widget_min_height(conf, htext, 0, true);
 
 	return (0);
 }
 
 static int
 message_checksize(int rows, int cols, bool hastext, struct buttons bs)
 {
 	int mincols;
 
 	mincols = VBORDERS;
 	mincols += buttons_min_width(bs);
 
 	if (cols < mincols)
 		RETURN_ERROR("Few cols, Msgbox and Yesno need at least width "
 		    "for borders, buttons and spaces between buttons");
 
 	if (rows < HBORDERS + 2 /* buttons */)
 		RETURN_ERROR("Msgbox and Yesno need at least 4 rows");
 	if (hastext && rows < HBORDERS + 2 /*buttons*/ + 1 /* text row */)
 		RETURN_ERROR("Msgbox and Yesno with text need at least 5 rows");
 
 	return (0);
 }
 
 static void
 textupdate(WINDOW *widget, WINDOW *textpad, int htextpad, int ytextpad,
     bool hastext)
 {
 	int y, x, h, w;
 
 	getbegyx(widget, y, x);
 	getmaxyx(widget, h, w);
 
 	if (hastext && htextpad > h - 4) {
 		wattron(widget, t.dialog.arrowcolor);
 		mvwprintw(widget, h-3, w-6, "%3d%%",
 		    100 * (ytextpad+h-4)/ htextpad);
 		wattroff(widget, t.dialog.arrowcolor);
 		wnoutrefresh(widget);
 	}
 
 	pnoutrefresh(textpad, ytextpad, 0, y+1, x+2, y+h-4, x+w-2);
 }
 
 static int
 do_message(struct bsddialog_conf *conf, const char *text, int rows, int cols,
     struct buttons bs)
 {
 	bool hastext, loop;
-	int y, x, h, w, retval, ytextpad, htextpad, unused;
+	int y, x, h, w, retval, ytextpad, htextpad, printrows, unused;
 	WINDOW *widget, *textpad, *shadow;
 	wint_t input;
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return (BSDDIALOG_ERROR);
 	if (message_autosize(conf, rows, cols, &h, &w, text, &hastext, bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (message_checksize(h, w, hastext, bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
 	    true) != 0)
 		return (BSDDIALOG_ERROR);
 
+	printrows = h - 4;
 	ytextpad = 0;
 	getmaxyx(textpad, htextpad, unused);
 	unused++; /* fix unused error */
-	textupdate(widget, textpad, htextpad, ytextpad, hastext);
 	loop = true;
 	while (loop) {
+		textupdate(widget, textpad, htextpad, ytextpad, hastext);
 		doupdate();
 		if (get_wch(&input) == ERR)
 			continue;
 		switch (input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			retval = bs.value[bs.curr];
 			loop = false;
 			break;
 		case 27: /* Esc */
 			if (conf->key.enable_esc) {
 				retval = BSDDIALOG_ESC;
 				loop = false;
 			}
 			break;
 		case '\t': /* TAB */
 			bs.curr = (bs.curr + 1) % bs.nbuttons;
 			draw_buttons(widget, bs, true);
 			wnoutrefresh(widget);
 			break;
 		case KEY_LEFT:
 			if (bs.curr > 0) {
 				bs.curr--;
 				draw_buttons(widget, bs, true);
 				wnoutrefresh(widget);
 			}
 			break;
 		case KEY_RIGHT:
 			if (bs.curr < (int)bs.nbuttons - 1) {
 				bs.curr++;
 				draw_buttons(widget, bs, true);
 				wnoutrefresh(widget);
 			}
 			break;
+		case KEY_UP:
+			if (ytextpad > 0)
+				ytextpad--;
+			break;
+		case KEY_DOWN:
+			if (ytextpad + printrows < htextpad)
+				ytextpad++;
+			break;
+		case KEY_HOME:
+			ytextpad = 0;
+			break;
+		case KEY_END:
+			ytextpad = htextpad - printrows;
+			ytextpad = ytextpad < 0 ? 0 : ytextpad;
+			break;
+		case KEY_PPAGE:
+			ytextpad -= printrows;
+			ytextpad = ytextpad < 0 ? 0 : ytextpad;
+			break;
+		case KEY_NPAGE:
+			ytextpad += printrows;
+			if (ytextpad + printrows > htextpad)
+				ytextpad = htextpad - printrows;
+			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return (BSDDIALOG_ERROR);
 			/* No break, screen size can change */
 		case KEY_RESIZE:
 			/* Important for decreasing screen */
 			hide_widget(y, x, h, w, conf->shadow);
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return (BSDDIALOG_ERROR);
 			if (message_autosize(conf, rows, cols, &h, &w, text,
 			    NULL, bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (message_checksize(h, w, hastext, bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return (BSDDIALOG_ERROR);
 
 			if (update_dialog(conf, shadow, widget, y, x, h, w,
 			    textpad, text, &bs, true) != 0)
 				return (BSDDIALOG_ERROR);
 
+			printrows = h - 4;
 			getmaxyx(textpad, htextpad, unused);
 			ytextpad = 0;
 			textupdate(widget, textpad, htextpad, ytextpad, hastext);
 
 			/* Important to fix grey lines expanding screen */
 			refresh();
 			break;
-		case KEY_UP:
-			if (ytextpad == 0)
-				break;
-			ytextpad--;
-			textupdate(widget, textpad, htextpad, ytextpad, hastext);
-			break;
-		case KEY_DOWN:
-			if (ytextpad + h - 4 >= htextpad)
-				break;
-			ytextpad++;
-			textupdate(widget, textpad, htextpad, ytextpad, hastext);
-			break;
 		default:
 			if (shortcut_buttons(input, &bs)) {
 				retval = bs.value[bs.curr];
 				loop = false;
 			}
 		}
 	}
 
 	end_dialog(conf, shadow, widget, textpad);
 
 	return (retval);
 }
 
 /* API */
 int
 bsddialog_msgbox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols)
 {
 	struct buttons bs;
 
 	get_buttons(conf, &bs, BUTTON_OK_LABEL, NULL);
 
 	return (do_message(conf, text, rows, cols, bs));
 }
 
 int
 bsddialog_yesno(struct bsddialog_conf *conf, const char *text, int rows,
     int cols)
 {
 	struct buttons bs;
 
 	get_buttons(conf, &bs, "Yes", "No");
 
 	return (do_message(conf, text, rows, cols, bs));
 }
\ No newline at end of file
diff --git a/lib/theme.c b/lib/theme.c
index 40310d58cda4..6e53eb356825 100644
--- a/lib/theme.c
+++ b/lib/theme.c
@@ -1,325 +1,324 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <curses.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
 #define GET_COLOR(bg, fg) (COLOR_PAIR(bg * 8 + fg +1))
 
 struct bsddialog_theme t;
 bool hastermcolors;
 
 static struct bsddialog_theme bsddialogtheme = {
 	.screen.color = GET_COLOR(COLOR_BLACK, COLOR_CYAN),
 
 	.shadow.color   = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
 	.shadow.y       = 1,
 	.shadow.x       = 2,
 
 	.dialog.delimtitle       = true,
 	.dialog.titlecolor       = GET_COLOR(COLOR_YELLOW, COLOR_WHITE),
 	.dialog.lineraisecolor   = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.dialog.linelowercolor   = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.dialog.color            = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.dialog.bottomtitlecolor = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.dialog.arrowcolor       = GET_COLOR(COLOR_YELLOW, COLOR_WHITE),
 
 	.menu.f_selectorcolor = GET_COLOR(COLOR_BLACK,  COLOR_YELLOW),
 	.menu.selectorcolor   = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.menu.f_desccolor     = GET_COLOR(COLOR_WHITE,  COLOR_YELLOW),
 	.menu.desccolor       = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.menu.f_namecolor     = GET_COLOR(COLOR_BLACK,  COLOR_YELLOW),
 	.menu.namecolor       = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.menu.namesepcolor    = GET_COLOR(COLOR_YELLOW, COLOR_WHITE),
 	.menu.descsepcolor    = GET_COLOR(COLOR_YELLOW, COLOR_WHITE),
 	.menu.f_shortcutcolor = GET_COLOR(COLOR_RED,    COLOR_YELLOW),
 	.menu.shortcutcolor   = GET_COLOR(COLOR_RED,    COLOR_WHITE),
 	.menu.bottomdesccolor = GET_COLOR(COLOR_WHITE,  COLOR_CYAN),
 
 	.form.f_fieldcolor    = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 	.form.fieldcolor      = GET_COLOR(COLOR_WHITE, COLOR_CYAN),
 	.form.readonlycolor   = GET_COLOR(COLOR_CYAN,  COLOR_WHITE),
 	.form.bottomdesccolor = GET_COLOR(COLOR_WHITE, COLOR_CYAN),
 
 	.bar.f_color = GET_COLOR(COLOR_BLACK, COLOR_YELLOW),
 	.bar.color   = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 
 	.button.minmargin       = 1,
 	.button.maxmargin       = 5,
 	.button.leftdelim       = '[',
 	.button.rightdelim      = ']',
 	.button.f_delimcolor    = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.button.delimcolor      = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.button.f_color         = GET_COLOR(COLOR_BLACK, COLOR_YELLOW),
 	.button.color           = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.button.f_shortcutcolor = GET_COLOR(COLOR_RED,   COLOR_YELLOW),
 	.button.shortcutcolor   = GET_COLOR(COLOR_RED,   COLOR_WHITE)
 };
 
 static struct bsddialog_theme blackwhite = {
 #define fg  COLOR_WHITE
 #define bk  COLOR_BLACK
 	.screen.color = GET_COLOR(fg, bk),
 
 	.shadow.color   = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
 	.shadow.y       = 1,
 	.shadow.x       = 2,
 
 	.dialog.delimtitle       = true,
 	.dialog.titlecolor       = GET_COLOR(fg, bk),
 	.dialog.lineraisecolor   = GET_COLOR(fg, bk),
 	.dialog.linelowercolor   = GET_COLOR(fg, bk),
 	.dialog.color            = GET_COLOR(fg, bk),
 	.dialog.bottomtitlecolor = GET_COLOR(fg, bk),
 	.dialog.arrowcolor       = GET_COLOR(fg, bk),
 
 	.menu.f_selectorcolor = GET_COLOR(fg, bk) | A_REVERSE,
 	.menu.selectorcolor   = GET_COLOR(fg, bk),
 	.menu.f_desccolor     = GET_COLOR(fg, bk) | A_REVERSE,
 	.menu.desccolor       = GET_COLOR(fg, bk),
 	.menu.f_namecolor     = GET_COLOR(fg, bk) | A_REVERSE,
 	.menu.namecolor       = GET_COLOR(fg, bk),
 	.menu.namesepcolor    = GET_COLOR(fg, bk),
 	.menu.descsepcolor    = GET_COLOR(fg, bk),
 	.menu.f_shortcutcolor = GET_COLOR(fg, bk) | A_UNDERLINE | A_REVERSE,
 	.menu.shortcutcolor   = GET_COLOR(fg, bk) | A_UNDERLINE,
 	.menu.bottomdesccolor = GET_COLOR(fg, bk),
 
 	.form.f_fieldcolor    = GET_COLOR(fg, bk) | A_REVERSE,
 	.form.fieldcolor      = GET_COLOR(fg, bk),
 	.form.readonlycolor   = GET_COLOR(fg, bk),
 	.form.bottomdesccolor = GET_COLOR(fg, bk),
 
 	.bar.f_color = GET_COLOR(fg, bk) | A_REVERSE,
 	.bar.color   = GET_COLOR(fg, bk),
 
 	.button.minmargin       = 1,
 	.button.maxmargin       = 5,
 	.button.leftdelim       = '[',
 	.button.rightdelim      = ']',
 	.button.f_delimcolor    = GET_COLOR(fg, bk),
 	.button.delimcolor      = GET_COLOR(fg, bk),
 	.button.f_color         = GET_COLOR(fg, bk) | A_UNDERLINE | A_REVERSE,
 	.button.color           = GET_COLOR(fg, bk) | A_UNDERLINE,
 	.button.f_shortcutcolor = GET_COLOR(fg, bk) | A_UNDERLINE | A_REVERSE,
 	.button.shortcutcolor   = GET_COLOR(fg, bk) | A_UNDERLINE
 };
 
 static struct bsddialog_theme dialogtheme = {
 	.screen.color = GET_COLOR(COLOR_CYAN, COLOR_BLUE) | A_BOLD,
 
 	.shadow.color   = GET_COLOR(COLOR_BLACK, COLOR_BLACK),
 	.shadow.y       = 1,
 	.shadow.x       = 2,
 
 	.dialog.delimtitle       = false,
 	.dialog.titlecolor       = GET_COLOR(COLOR_BLUE,  COLOR_WHITE) | A_BOLD,
 	.dialog.lineraisecolor   = GET_COLOR(COLOR_WHITE, COLOR_WHITE) | A_BOLD,
 	.dialog.linelowercolor   = GET_COLOR(COLOR_BLACK, COLOR_WHITE) | A_BOLD,
 	.dialog.color            = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.dialog.bottomtitlecolor = GET_COLOR(COLOR_BLACK, COLOR_WHITE) | A_BOLD,
 	.dialog.arrowcolor       = GET_COLOR(COLOR_BLUE,  COLOR_WHITE),
 
 	.menu.f_selectorcolor = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 	.menu.selectorcolor   = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.menu.f_desccolor     = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 	.menu.desccolor       = GET_COLOR(COLOR_BLACK, COLOR_WHITE),
 	.menu.f_namecolor     = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 	.menu.namecolor       = GET_COLOR(COLOR_BLUE,  COLOR_WHITE),
 	.menu.namesepcolor    = GET_COLOR(COLOR_RED,   COLOR_WHITE),
 	.menu.descsepcolor    = GET_COLOR(COLOR_RED,   COLOR_WHITE),
 	.menu.f_shortcutcolor = GET_COLOR(COLOR_RED,   COLOR_BLUE),
 	.menu.shortcutcolor   = GET_COLOR(COLOR_RED,   COLOR_WHITE),
 	.menu.bottomdesccolor = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 
 	.form.f_fieldcolor    = GET_COLOR(COLOR_WHITE, COLOR_BLUE) | A_BOLD,
 	.form.fieldcolor      = GET_COLOR(COLOR_WHITE, COLOR_CYAN) | A_BOLD,
 	.form.readonlycolor   = GET_COLOR(COLOR_CYAN,  COLOR_WHITE)| A_BOLD,
 	.form.bottomdesccolor = GET_COLOR(COLOR_WHITE, COLOR_BLUE),
 
 	.bar.f_color = GET_COLOR(COLOR_WHITE, COLOR_BLUE)  | A_BOLD,
 	.bar.color   = GET_COLOR(COLOR_BLUE,  COLOR_WHITE) | A_BOLD,
 
 	.button.minmargin       = 1,
 	.button.maxmargin       = 5,
 	.button.leftdelim       = '<',
 	.button.rightdelim      = '>',
 	.button.f_delimcolor    = GET_COLOR(COLOR_WHITE,  COLOR_BLUE)  | A_BOLD,
 	.button.delimcolor      = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.button.f_color         = GET_COLOR(COLOR_YELLOW, COLOR_BLUE)  | A_BOLD,
 	.button.color           = GET_COLOR(COLOR_BLACK,  COLOR_WHITE),
 	.button.f_shortcutcolor = GET_COLOR(COLOR_WHITE,  COLOR_BLUE)  | A_BOLD,
 	.button.shortcutcolor   = GET_COLOR(COLOR_RED,    COLOR_WHITE) | A_BOLD
 };
 
 static void
 set_theme(struct bsddialog_theme *dst, struct bsddialog_theme *src)
 {
 	dst->screen.color = src->screen.color;
 
 	dst->shadow.color = src->shadow.color;
 	dst->shadow.y     = src->shadow.y;
 	dst->shadow.x     = src->shadow.x;
 
 	dst->dialog.delimtitle       = src->dialog.delimtitle;
 	dst->dialog.titlecolor       = src->dialog.titlecolor;
 	dst->dialog.lineraisecolor   = src->dialog.lineraisecolor;
 	dst->dialog.linelowercolor   = src->dialog.linelowercolor;
 	dst->dialog.color            = src->dialog.color;
 	dst->dialog.bottomtitlecolor = src->dialog.bottomtitlecolor;
 	dst->dialog.arrowcolor       = src->dialog.arrowcolor;
 
 	dst->menu.f_selectorcolor = src->menu.f_selectorcolor;
 	dst->menu.selectorcolor   = src->menu.selectorcolor;
 	dst->menu.f_desccolor     = src->menu.f_desccolor;
 	dst->menu.desccolor       = src->menu.desccolor;
 	dst->menu.f_namecolor     = src->menu.f_namecolor;
 	dst->menu.namecolor       = src->menu.namecolor;
 	dst->menu.namesepcolor    = src->menu.namesepcolor;
 	dst->menu.descsepcolor    = src->menu.descsepcolor;
 	dst->menu.f_shortcutcolor = src->menu.f_shortcutcolor;
 	dst->menu.shortcutcolor   = src->menu.shortcutcolor;
 	dst->menu.bottomdesccolor = src->menu.bottomdesccolor;
 
 	dst->form.f_fieldcolor    = src->form.f_fieldcolor;
 	dst->form.fieldcolor      = src->form.fieldcolor;
 	dst->form.readonlycolor   = src->form.readonlycolor;
 	dst->form.bottomdesccolor = src->form.bottomdesccolor;
 
 	dst->bar.f_color = src->bar.f_color;
 	dst->bar.color   = src->bar.color;
 
 	dst->button.minmargin       = src->button.minmargin;
 	dst->button.maxmargin       = src->button.maxmargin;
 	dst->button.leftdelim       = src->button.leftdelim;
 	dst->button.rightdelim      = src->button.rightdelim;
 	dst->button.f_delimcolor    = src->button.f_delimcolor;
 	dst->button.delimcolor      = src->button.delimcolor;
 	dst->button.f_color         = src->button.f_color;
 	dst->button.color           = src->button.color;
 	dst->button.f_shortcutcolor = src->button.f_shortcutcolor;
 	dst->button.shortcutcolor   = src->button.shortcutcolor;
 
 	bkgd(dst->screen.color);
 	refresh();
 }
 
 /* API */
 int bsddialog_get_theme(struct bsddialog_theme *theme)
 {
 	if (theme == NULL)
 		RETURN_ERROR("theme is NULL");
 	if (sizeof(*theme) != sizeof(struct bsddialog_theme))
 		RETURN_ERROR("Bad suze struct bsddialog_theme");
 
 	set_theme(theme, &t);
 
 	return (BSDDIALOG_OK);
 }
 
 int bsddialog_set_theme(struct bsddialog_theme *theme)
 {
 	if (theme == NULL)
 		RETURN_ERROR("theme is NULL");
 	if (sizeof(*theme) != sizeof(struct bsddialog_theme))
 		RETURN_ERROR("Bad size struct bsddialog_theme");
 
 	set_theme(&t, theme);
 
 	return (BSDDIALOG_OK);
 }
 
 int bsddialog_set_default_theme(enum bsddialog_default_theme newtheme)
 {
-
 	if (newtheme == BSDDIALOG_THEME_FLAT) {
 		bsddialog_set_theme(&dialogtheme);
 		t.dialog.lineraisecolor = t.dialog.linelowercolor;
 		t.dialog.delimtitle     = true;
 		t.button.leftdelim      = '[';
 		t.button.rightdelim     = ']';
 		t.dialog.bottomtitlecolor = GET_COLOR(COLOR_BLACK, COLOR_WHITE);
 	}
 	else if (newtheme == BSDDIALOG_THEME_BSDDIALOG)
 		bsddialog_set_theme(&bsddialogtheme);
 	else if (newtheme == BSDDIALOG_THEME_BLACKWHITE)
 		bsddialog_set_theme(&blackwhite);
 	else if (newtheme == BSDDIALOG_THEME_DIALOG)
 		bsddialog_set_theme(&dialogtheme);
 	else
 		RETURN_ERROR("Unknow default theme");
 
 	return (BSDDIALOG_OK);
 }
 
 int
 bsddialog_color(enum bsddialog_color foreground,
     enum bsddialog_color background, unsigned int flags)
 {
 	unsigned int cursesflags = 0;
 
 	if (flags & BSDDIALOG_BOLD)
 		cursesflags |= A_BOLD;
 	if (flags & BSDDIALOG_REVERSE)
 		cursesflags |= A_REVERSE;
 	if (flags & BSDDIALOG_UNDERLINE)
 		cursesflags |= A_UNDERLINE;
 
 	return (GET_COLOR(foreground, background) | cursesflags);
 }
 
 int
 bsddialog_color_attrs(int color, enum bsddialog_color *foreground,
     enum bsddialog_color *background, unsigned int *flags)
 {
 	unsigned int flag;
 	short f, b;
 
 	flag = 0U;
 	flag |= (color & A_BOLD) ? BSDDIALOG_BOLD : 0U;
 	flag |= (color & A_REVERSE) ? BSDDIALOG_REVERSE : 0U;
 	flag |= (color & A_UNDERLINE) ? BSDDIALOG_UNDERLINE : 0U;
 	if (flags != NULL)
 		*flags = flag;
 
 	if (pair_content(PAIR_NUMBER(color), &f, &b) != OK)
 		RETURN_ERROR("Cannot get color attributes");
 	if (foreground != NULL)
 		*foreground = f;
 	if (background != NULL)
 		*background = b;
 
 	return (BSDDIALOG_OK);
 }
 
 bool bsddialog_hascolors(void)
 {
 	return hastermcolors;
 }
\ No newline at end of file
diff --git a/lib/timebox.c b/lib/timebox.c
index 529563b49bca..53989bb97157 100644
--- a/lib/timebox.c
+++ b/lib/timebox.c
@@ -1,542 +1,540 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021-2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 
 #include <ctype.h>
 #include <curses.h>
 #include <string.h>
 
 #include "bsddialog.h"
 #include "bsddialog_theme.h"
 #include "lib_util.h"
 
 #define MINWDATE   23 /* 3 windows and their borders */
 #define MINWTIME   14 /* 3 windows and their borders */
 
 static void
-drawquare(struct bsddialog_conf *conf, WINDOW *win, const char *fmt,
+drawsquare(struct bsddialog_conf *conf, WINDOW *win, const char *fmt,
     const void *value, bool focus)
 {
 	int h, l, w;
 
 	getmaxyx(win, h, w);
 	draw_borders(conf, win, h, w, LOWERED);
 	if (focus) {
 		l = 2 + w%2;
 		wattron(win, t.dialog.arrowcolor);
 		mvwhline(win, 0, w/2 - l/2,
 		    conf->ascii_lines ? '^' : ACS_UARROW, l);
 		mvwhline(win, h-1, w/2 - l/2,
 		    conf->ascii_lines ? 'v' : ACS_DARROW, l);
 		wattroff(win, t.dialog.arrowcolor);
 	}
 
 	if (focus)
 		wattron(win, t.menu.f_namecolor);
 	if (strchr(fmt, 's') != NULL)
 		mvwprintw(win, 1, 1, fmt, (const char*)value);
 	else
 		mvwprintw(win, 1, 1, fmt, *((const int*)value));
 	if (focus)
 		wattroff(win, t.menu.f_namecolor);
 
 	wrefresh(win);
 }
 
 static int
 datetime_autosize(struct bsddialog_conf *conf, int rows, int cols, int *h,
     int *w, int minw, const char *text, struct buttons bs)
 {
 	int htext, wtext;
 
 	if (cols == BSDDIALOG_AUTOSIZE || rows == BSDDIALOG_AUTOSIZE) {
 		if (text_size(conf, rows, cols, text, &bs, 3, minw, &htext,
 		    &wtext) != 0)
 			return (BSDDIALOG_ERROR);
 	}
 
 	if (cols == BSDDIALOG_AUTOSIZE)
 		*w = widget_min_width(conf, wtext, minw, &bs);
 
 	if (rows == BSDDIALOG_AUTOSIZE)
 		*h = widget_min_height(conf, htext, 3 /* windows */, true);
 
 	return (0);
 }
 
 static int
 datetime_checksize(int rows, int cols, int minw, struct buttons bs)
 {
 	int mincols;
 
 	mincols = VBORDERS;
 	mincols += buttons_min_width(bs);
 	mincols = MAX(minw, mincols);
 
 	if (cols < mincols)
 		RETURN_ERROR("Few cols for this timebox/datebox");
 
 	if (rows < 7) /* 2 button + 2 borders + 3 windows */
 		RETURN_ERROR("Few rows for this timebox/datebox, at least 7");
 
 	return (0);
 }
 
 int
 bsddialog_timebox(struct bsddialog_conf *conf, const char* text, int rows,
     int cols, unsigned int *hh, unsigned int *mm, unsigned int *ss)
 {
 	bool loop, focusbuttons;
 	int i, retval, y, x, h, w, sel;
 	wint_t input;
 	WINDOW *widget, *textpad, *shadow;
 	struct buttons bs;
 	struct myclockstruct {
 		unsigned int max;
 		unsigned int value;
 		WINDOW *win;
 	};
 
 	if (hh == NULL || mm == NULL || ss == NULL)
 		RETURN_ERROR("hh / mm / ss cannot be NULL");
 
 	struct myclockstruct c[3] = {
 		{23, *hh, NULL},
 		{59, *mm, NULL},
 		{59, *ss, NULL}
 	};
 
 	for (i = 0 ; i < 3; i++) {
 		if (c[i].value > c[i].max)
 			c[i].value = c[i].max;
 	}
 
 	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return (BSDDIALOG_ERROR);
 	if (datetime_autosize(conf, rows, cols, &h, &w, MINWTIME, text,
 	    bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (datetime_checksize(h, w, MINWTIME, bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
 	    true) != 0)
 		return (BSDDIALOG_ERROR);
 
 	pnoutrefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
 	doupdate();
 
 	c[0].win = new_boxed_window(conf, y+h-6, x + w/2 - 7, 3, 4, LOWERED);
 	mvwaddch(widget, h - 5, w/2 - 3, ':');
 	c[1].win = new_boxed_window(conf, y+h-6, x + w/2 - 2, 3, 4, LOWERED);
 	mvwaddch(widget, h - 5, w/2 + 2, ':');
 	c[2].win = new_boxed_window(conf, y+h-6, x + w/2 + 3, 3, 4, LOWERED);
 
 	wrefresh(widget);
 
 	sel = -1;
 	loop = focusbuttons = true;
 	while (loop) {
 		for (i = 0; i < 3; i++)
-			drawquare(conf, c[i].win, "%02d", &c[i].value,
+			drawsquare(conf, c[i].win, "%02d", &c[i].value,
 			    sel == i);
 
 		if (get_wch(&input) == ERR)
 			continue;
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			if (focusbuttons || conf->button.always_active) {
 				retval = bs.value[bs.curr];
 				loop = false;
 			}
 			break;
 		case 27: /* Esc */
 			if (conf->key.enable_esc) {
 				retval = BSDDIALOG_ESC;
 				loop = false;
 			}
 			break;
 		case KEY_RIGHT:
 		case '\t': /* TAB */
 			if (focusbuttons) {
 				bs.curr++;
 				focusbuttons = bs.curr < (int)bs.nbuttons ?
 				    true : false;
 				if (focusbuttons == false) {
 					sel = 0;
 					bs.curr = conf->button.always_active ? 0 : -1;
 				}
 			} else {
 				sel++;
 				focusbuttons = sel > 2 ? true : false;
 				if (focusbuttons) {
 					bs.curr = 0;
 				}
 			}
 			draw_buttons(widget, bs, true);
 			wrefresh(widget);
 			break;
 		case KEY_LEFT:
 			if (focusbuttons) {
 				bs.curr--;
 				focusbuttons = bs.curr < 0 ? false : true;
 				if (focusbuttons == false) {
 					sel = 2;
 					bs.curr = conf->button.always_active ? 0 : -1;
 				}
 			} else {
 				sel--;
 				focusbuttons = sel < 0 ? true : false;
 				if (focusbuttons)
 					bs.curr = (int)bs.nbuttons - 1;
 			}
 			draw_buttons(widget, bs, true);
 			wrefresh(widget);
 			break;
 		case KEY_UP:
 			if (focusbuttons) {
 				sel = 0;
 				focusbuttons = false;
 				bs.curr = conf->button.always_active ? 0 : -1;
 				draw_buttons(widget, bs, true);
 				wrefresh(widget);
 			} else { c[sel].value = c[sel].value > 0 ?
 			    c[sel].value - 1 : c[sel].max;
 			}
 			break;
 		case KEY_DOWN:
 			if (focusbuttons)
 				break;
 			c[sel].value = c[sel].value < c[sel].max ?
 			    c[sel].value + 1 : 0;
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return (BSDDIALOG_ERROR);
 			/* No break, screen size can change */
 		case KEY_RESIZE:
 			/* Important for decreasing screen */
 			hide_widget(y, x, h, w, conf->shadow);
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return (BSDDIALOG_ERROR);
 			if (datetime_autosize(conf, rows, cols, &h, &w,
 			    MINWTIME, text, bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (datetime_checksize(h, w, MINWTIME, bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return (BSDDIALOG_ERROR);
 
 			if (update_dialog(conf, shadow, widget, y, x, h, w,
 			    textpad, text, &bs, true) != 0)
 				return (BSDDIALOG_ERROR);
 
 			doupdate();
 
 			mvwaddch(widget, h - 5, w/2 - 3, ':');
 			mvwaddch(widget, h - 5, w/2 + 2, ':');
 			wrefresh(widget);
 
 			prefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
 
 			wclear(c[0].win);
 			mvwin(c[0].win, y + h - 6, x + w/2 - 7);
 			wclear(c[1].win);
 			mvwin(c[1].win, y + h - 6, x + w/2 - 2);
 			wclear(c[2].win);
 			mvwin(c[2].win, y + h - 6, x + w/2 + 3);
 
 			/* Important to avoid grey lines expanding screen */
 			refresh();
 			break;
 		default:
 			if (shortcut_buttons(input, &bs)) {
 				retval = bs.value[bs.curr];
 				loop = false;
 			}
 		}
 	}
 
 	if (retval == BSDDIALOG_OK) {
 		*hh = c[0].value;
 		*mm = c[1].value;
 		*ss = c[2].value;
 	}
 
 	for (i = 0; i < 3; i++)
 		delwin(c[i].win);
 	end_dialog(conf, shadow, widget, textpad);
 
 	return (retval);
 }
 
 int
 bsddialog_datebox(struct bsddialog_conf *conf, const char *text, int rows,
     int cols, unsigned int *yy, unsigned int *mm, unsigned int *dd)
 {
 	bool loop, focusbuttons;
 	int i, retval, y, x, h, w, sel;
 	wint_t input;
 	WINDOW *widget, *textpad, *shadow;
 	struct buttons bs;
 	struct calendar {
 		int max;
 		int value;
 		WINDOW *win;
 		unsigned int x;
 	};
 	struct month {
 		const char *name;
 		unsigned int days;
 	};
 
 	if (yy == NULL || mm == NULL || dd == NULL)
 		RETURN_ERROR("yy / mm / dd cannot be NULL");
 
 	struct calendar c[3] = {
 		{9999, *yy, NULL, 4 },
 		{12,   *mm, NULL, 9 },
 		{31,   *dd, NULL, 2 }
 	};
 
 	struct month m[12] = {
 		{ "January", 31 }, { "February", 28 }, { "March",     31 },
 		{ "April",   30 }, { "May",      31 }, { "June",      30 },
 		{ "July",    31 }, { "August",   31 }, { "September", 30 },
 		{ "October", 31 }, { "November", 30 }, { "December",  31 }
 	};
 
-#define ISLEAF(year) ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
-
 	for (i = 0 ; i < 3; i++) {
 		if (c[i].value > c[i].max)
 			c[i].value = c[i].max;
 		if (c[i].value < 1)
 			c[i].value = 1;
 	}
 	c[2].max = m[c[1].value -1].days;
-	if (c[1].value == 2 && ISLEAF(c[0].value))
+	if (c[1].value == 2 && ISLEAP(c[0].value))
 		c[2].max = 29;
 	if (c[2].value > c[2].max)
 		c[2].value = c[2].max;
 
 	get_buttons(conf, &bs, BUTTON_OK_LABEL, BUTTON_CANCEL_LABEL);
 
 	if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 		return (BSDDIALOG_ERROR);
 	if (datetime_autosize(conf, rows, cols, &h, &w, MINWDATE, text,
 	    bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (datetime_checksize(h, w, MINWDATE, bs) != 0)
 		return (BSDDIALOG_ERROR);
 	if (set_widget_position(conf, &y, &x, h, w) != 0)
 		return (BSDDIALOG_ERROR);
 
 	if (new_dialog(conf, &shadow, &widget, y, x, h, w, &textpad, text, &bs,
 	    true) != 0)
 		return (BSDDIALOG_ERROR);
 
 	pnoutrefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
 	doupdate();
 
 	c[0].win = new_boxed_window(conf, y+h-6, x + w/2 - 11, 3, 6, LOWERED);
 	mvwaddch(widget, h - 5, w/2 - 5, '/');
 	c[1].win = new_boxed_window(conf, y+h-6, x + w/2 - 4, 3, 11, LOWERED);
 	mvwaddch(widget, h - 5, w/2 + 7, '/');
 	c[2].win = new_boxed_window(conf, y+h-6, x + w/2 + 8, 3, 4, LOWERED);
 
 	wrefresh(widget);
 
 	sel = -1;
 	loop = focusbuttons = true;
 	while (loop) {
-		drawquare(conf, c[0].win, "%4d", &c[0].value, sel == 0);
-		drawquare(conf, c[1].win, "%9s", m[c[1].value-1].name,
+		drawsquare(conf, c[0].win, "%4d", &c[0].value, sel == 0);
+		drawsquare(conf, c[1].win, "%9s", m[c[1].value-1].name,
 		    sel == 1);
-		drawquare(conf, c[2].win, "%02d", &c[2].value, sel == 2);
+		drawsquare(conf, c[2].win, "%02d", &c[2].value, sel == 2);
 
 		if (get_wch(&input) == ERR)
 			continue;
 		switch(input) {
 		case KEY_ENTER:
 		case 10: /* Enter */
 			if (focusbuttons || conf->button.always_active) {
 				retval = bs.value[bs.curr];
 				loop = false;
 			}
 			break;
 		case 27: /* Esc */
 			if (conf->key.enable_esc) {
 				retval = BSDDIALOG_ESC;
 				loop = false;
 			}
 			break;
 		case KEY_RIGHT:
 		case '\t': /* TAB */
 			if (focusbuttons) {
 				bs.curr++;
 				focusbuttons = bs.curr < (int)bs.nbuttons ?
 				    true : false;
 				if (focusbuttons == false) {
 					sel = 0;
 					bs.curr = conf->button.always_active ? 0 : -1;
 				}
 			} else {
 				sel++;
 				focusbuttons = sel > 2 ? true : false;
 				if (focusbuttons) {
 					bs.curr = 0;
 				}
 			}
 			draw_buttons(widget, bs, true);
 			wrefresh(widget);
 			break;
 		case KEY_LEFT:
 			if (focusbuttons) {
 				bs.curr--;
 				focusbuttons = bs.curr < 0 ? false : true;
 				if (focusbuttons == false) {
 					sel = 2;
 					bs.curr = conf->button.always_active ? 0 : -1;
 				}
 			} else {
 				sel--;
 				focusbuttons = sel < 0 ? true : false;
 				if (focusbuttons)
 					bs.curr = (int)bs.nbuttons - 1;
 			}
 			draw_buttons(widget, bs, true);
 			wrefresh(widget);
 			break;
 		case KEY_UP:
 			if (focusbuttons) {
 				sel = 0;
 				focusbuttons = false;
 				bs.curr = conf->button.always_active ? 0 : -1;
 				draw_buttons(widget, bs, true);
 				wrefresh(widget);
 			} else {
 				c[sel].value = c[sel].value > 1 ?
 				    c[sel].value - 1 : c[sel].max ;
 				/* if mount change */
 				c[2].max = m[c[1].value -1].days;
 				/* if year change */
-				if (c[1].value == 2 && ISLEAF(c[0].value))
+				if (c[1].value == 2 && ISLEAP(c[0].value))
 					c[2].max = 29;
 				/* set new day */
 				if (c[2].value > c[2].max)
 					c[2].value = c[2].max;
 			}
 			break;
 		case KEY_DOWN:
 			if (focusbuttons)
 				break;
 			c[sel].value = c[sel].value < c[sel].max ?
 			    c[sel].value + 1 : 1;
 			/* if mount change */
 			c[2].max = m[c[1].value -1].days;
 			/* if year change */
-			if (c[1].value == 2 && ISLEAF(c[0].value))
+			if (c[1].value == 2 && ISLEAP(c[0].value))
 				c[2].max = 29;
 			/* set new day */
 			if (c[2].value > c[2].max)
 				c[2].value = c[2].max;
 			break;
 		case KEY_F(1):
 			if (conf->key.f1_file == NULL &&
 			    conf->key.f1_message == NULL)
 				break;
 			if (f1help(conf) != 0)
 				return (BSDDIALOG_ERROR);
 			/* No break, screen size can change */
 		case KEY_RESIZE:
 			/* Important for decreasing screen */
 			hide_widget(y, x, h, w, conf->shadow);
 			refresh();
 
 			if (set_widget_size(conf, rows, cols, &h, &w) != 0)
 				return (BSDDIALOG_ERROR);
 			if (datetime_autosize(conf, rows, cols, &h, &w,
 			    MINWDATE, text, bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (datetime_checksize(h, w, MINWDATE, bs) != 0)
 				return (BSDDIALOG_ERROR);
 			if (set_widget_position(conf, &y, &x, h, w) != 0)
 				return (BSDDIALOG_ERROR);
 
 			if (update_dialog(conf, shadow, widget, y, x, h, w,
 			    textpad, text, &bs, true) != 0)
 				return (BSDDIALOG_ERROR);
 			doupdate();
 
 			mvwaddch(widget, h - 5, w/2 - 5, '/');
 			mvwaddch(widget, h - 5, w/2 + 7, '/');
 			wrefresh(widget);
 
 			prefresh(textpad, 0, 0, y+1, x+2, y+h-7, x+w-2);
 
 			wclear(c[0].win);
 			mvwin(c[0].win, y + h - 6, x + w/2 - 11);
 			wclear(c[1].win);
 			mvwin(c[1].win, y + h - 6, x + w/2 - 4);
 			wclear(c[2].win);
 			mvwin(c[2].win, y + h - 6, x + w/2 + 8);
 
 			/* Important to avoid grey lines expanding screen */
 			refresh();
 			break;
 		default:
 			if (shortcut_buttons(input, &bs)) {
 				retval = bs.value[bs.curr];
 				loop = false;
 			}
 		}
 	}
 
 	if (retval == BSDDIALOG_OK) {
 		*yy = c[0].value;
 		*mm = c[1].value;
 		*dd = c[2].value;
 	}
 
 	for (i = 0; i < 3; i++)
 		delwin(c[i].win);
 	end_dialog(conf, shadow, widget, textpad);
 
 	return (retval);
-}
+}
\ No newline at end of file
diff --git a/util_theme.c b/util_theme.c
index e003e2c3d05f..caf62852e9f3 100644
--- a/util_theme.c
+++ b/util_theme.c
@@ -1,356 +1,353 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include <bsddialog.h>
 #include <bsddialog_theme.h>
 
 #include "util_theme.h"
 
 static struct bsddialog_theme t;
 static char title[1024];
 
 enum typeprop {
 	BOOL,
 	CHAR,
 	INT,
 	UINT,
 	COLOR
 };
 
 struct property {
 	const char* name;
 	enum typeprop type;
 	void *value;
 };
 
 #define NPROPERTY 38
 static struct property p[NPROPERTY] = {
 	{ "theme.screen.color", COLOR, &t.screen.color },
 
 	{ "theme.shadow.color", COLOR, &t.shadow.color },
 	{ "theme.shadow.y", UINT, &t.shadow.y },
 	{ "theme.shadow.x", UINT, &t.shadow.x },
 
 	{ "theme.dialog.color", COLOR, &t.dialog.color },
 	{ "theme.dialog.delimtitle", BOOL, &t.dialog.delimtitle },
 	{ "theme.dialog.titlecolor", COLOR, &t.dialog.titlecolor },
 	{ "theme.dialog.lineraisecolor", COLOR, &t.dialog.lineraisecolor },
 	{ "theme.dialog.linelowercolor", COLOR, &t.dialog.linelowercolor },
 	{ "theme.dialog.bottomtitlecolor", COLOR, &t.dialog.bottomtitlecolor },
 	{ "theme.dialog.arrowcolor", COLOR, &t.dialog.arrowcolor },
 
 	{ "theme.menu.f_selectorcolor", COLOR, &t.menu.f_selectorcolor},
 	{ "theme.menu.selectorcolor", COLOR, &t.menu.selectorcolor},
 	{ "theme.menu.f_namecolor", COLOR, &t.menu.f_namecolor},
 	{ "theme.menu.namecolor", COLOR, &t.menu.namecolor},
 	{ "theme.menu.f_desccolor", COLOR, &t.menu.f_desccolor},
 	{ "theme.menu.desccolor", COLOR, &t.menu.desccolor},
 	{ "theme.menu.namesepcolor", COLOR, &t.menu.namesepcolor},
 	{ "theme.menu.descsepcolor", COLOR, &t.menu.descsepcolor},
 	{ "theme.menu.f_shortcutcolor", COLOR, &t.menu.f_shortcutcolor},
 	{ "theme.menu.shortcutcolor", COLOR, &t.menu.shortcutcolor},
 	{ "theme.menu.bottomdesccolor", COLOR, &t.menu.bottomdesccolor},
 
 	{ "theme.form.f_fieldcolor", COLOR, &t.form.f_fieldcolor},
 	{ "theme.form.fieldcolor", COLOR, &t.form.fieldcolor},
 	{ "theme.form.readonlycolor", COLOR, &t.form.readonlycolor},
 	{ "theme.form.bottomdesccolor", COLOR, &t.form.bottomdesccolor},
 
 	{ "theme.bar.f_color", COLOR, &t.bar.f_color},
 	{ "theme.bar.color", COLOR, &t.bar.color},
 
 	{ "theme.button.minmargin", UINT, &t.button.minmargin},
 	{ "theme.button.maxmargin", UINT, &t.button.maxmargin},
 	{ "theme.button.leftdelim", CHAR, &t.button.leftdelim},
 	{ "theme.button.rightdelim", CHAR, &t.button.rightdelim},
 	{ "theme.button.delimcolor", COLOR, &t.button.delimcolor},
 	{ "theme.button.f_delimcolor", COLOR, &t.button.f_delimcolor},
 	{ "theme.button.color", COLOR, &t.button.color},
 	{ "theme.button.f_color", COLOR, &t.button.f_color},
 	{ "theme.button.shortcutcolor", COLOR, &t.button.shortcutcolor},
 	{ "theme.button.f_shortcutcolor", COLOR, &t.button.f_shortcutcolor}
 };
 
-static char *color[8] = {
+static const char *color[8] = {
 	"black",
 	"red",
 	"green",
 	"yellow",
 	"blue",
 	"magenta",
 	"cyan",
 	"white"
 };
 
-int savetheme(const char *file, char *errbuf, const char *version)
+#define EXIT_FMTERROR(fmt, ...) do {                                           \
+	bsddialog_end();                                                       \
+	printf("Error: ");                                                     \
+	printf(fmt, __VA_ARGS__);                                              \
+	printf(".\n");                                                         \
+	exit (255);                                                            \
+} while (0)
+
+void savetheme(const char *file, const char *version)
 {
 	int i;
 	unsigned int flags;
 	enum bsddialog_color bg, fg;
 	time_t clock;
 	FILE *fp;
 
-	if (bsddialog_get_theme(&t) != BSDDIALOG_OK) {
-		sprintf(errbuf, "Cannot save theme: %s", bsddialog_geterror());
-		return (BSDDIALOG_ERROR);
-	}
+	if (bsddialog_get_theme(&t) != BSDDIALOG_OK)
+		EXIT_FMTERROR("cannot save theme: %s", bsddialog_geterror());
 
-	if(time(&clock) < 0) {
-		sprintf(errbuf, "Cannot save profile (getting current time)");
-		return (BSDDIALOG_ERROR);
-	}
+	if(time(&clock) < 0)
+		EXIT_FMTERROR("%s", "cannot save profile getting current time");
 
-	if ((fp = fopen(file, "w")) == NULL) {
-		sprintf(errbuf, "Cannot open %s to save profile", file);
-		return (BSDDIALOG_ERROR);
-	}
+	if ((fp = fopen(file, "w")) == NULL)
+		EXIT_FMTERROR("cannot open %s to save profile", file);
 
 	fprintf(fp, "### bsddialog theme - %s", ctime(&clock));
 	fputs("# Refer to bsddialog(3) manual for theme.* properties\n", fp);
 	fprintf(fp, "version %s\n", version);
 
 	for (i = 0; i < NPROPERTY; i++) {
 		switch (p[i].type) {
 		case CHAR:
 			fprintf(fp, "%s %c\n", p[i].name, *((char*)p[i].value));
 			break;
 		case INT:
 			fprintf(fp, "%s %d\n", p[i].name, *((int*)p[i].value));
 			break;
 		case UINT:
 			fprintf(fp, "%s %u\n", p[i].name,
 			    *((unsigned int*)p[i].value));
 			break;
 		case BOOL:
 			fprintf(fp, "%s %s\n", p[i].name,
 			    *((bool*)p[i].value) ? "true" : "false");
 			break;
 		case COLOR:
 			bsddialog_color_attrs(*(int*)p[i].value, &fg, &bg,
 			    &flags);
 			fprintf(fp, "%s %s %s%s%s%s\n",
 			    p[i].name, color[fg], color[bg],
 			    flags & BSDDIALOG_BOLD ? " bold" : "",
 			    flags & BSDDIALOG_REVERSE ? " reverse" : "",
 			    flags & BSDDIALOG_UNDERLINE ? " underline" : "");
 			break;
 		}
 	}
 
 	fclose(fp);
+}
 
-	return (BSDDIALOG_OK);
+void setdeftheme(enum bsddialog_default_theme theme)
+{
+	if (bsddialog_set_default_theme(theme) != BSDDIALOG_OK)
+		EXIT_FMTERROR("%s", bsddialog_geterror());
 }
 
-int loadtheme(const char *file, char *errbuf)
+void loadtheme(const char *file)
 {
 	bool boolvalue;
 	char charvalue, *value;
 	char line[BUFSIZ], name[BUFSIZ], c1[BUFSIZ], c2[BUFSIZ];
 	int i, j, intvalue, flags;
 	unsigned int uintvalue;
 	enum bsddialog_color bg, fg;
 	FILE *fp;
 
-	if (bsddialog_get_theme(&t) != BSDDIALOG_OK) {
-		sprintf(errbuf, "Cannot get current theme: %s",
+	if (bsddialog_get_theme(&t) != BSDDIALOG_OK)
+		EXIT_FMTERROR("Cannot get current theme: %s",
 		    bsddialog_geterror());
-		return (BSDDIALOG_ERROR);
-	}
 
-	if((fp = fopen(file, "r")) == NULL) {
-		sprintf(errbuf, "Cannot open theme \"%s\"", file);
-		return (BSDDIALOG_ERROR);
-	}
+	if((fp = fopen(file, "r")) == NULL)
+		EXIT_FMTERROR("Cannot open theme \"%s\"", file);
 
-#define RETURN_ERROR(name, error) do {                                         \
-	sprintf(errbuf, "%s for \"%s\"", error, name);                         \
+#define EXIT_ERROR(name, error) do {                                           \
 	fclose(fp);                                                            \
-	return (BSDDIALOG_ERROR);                                              \
+	EXIT_FMTERROR("%s for \"%s\"", error, name);                           \
 } while (0)
 
 	while(fgets(line, BUFSIZ, fp) != NULL) {
 		if(line[0] == '#' || line[0] == '\n')
 			continue;  /* superfluous, only for efficiency */
 		sscanf(line, "%s", name);
 		for (i = 0; i < NPROPERTY; i++) {
 			if (strcmp(name, p[i].name) == 0) {
 				value = &line[strlen(name)];
 				break;
 			}
 		}
 		if (i >= NPROPERTY) {
 			if (strcmp(name, "version") == 0)
 				continue;
-			RETURN_ERROR(name, "Unknown theme property name");
+			EXIT_ERROR(name, "Unknown theme property name");
 		}
 		switch (p[i].type) {
 		case CHAR:
 			while (value[0] == ' ' || value[0] == '\n' ||
 			    value[0] == '\0')
 				value++;
 			if (sscanf(value, "%c", &charvalue) != 1)
-				RETURN_ERROR(p[i].name, "Cannot get a char");
+				EXIT_ERROR(p[i].name, "Cannot get a char");
 			*((int*)p[i].value) = charvalue;
 			break;
 		case INT:
 			if (sscanf(value, "%d", &intvalue) != 1)
-				RETURN_ERROR(p[i].name, "Cannot get a int");
+				EXIT_ERROR(p[i].name, "Cannot get a int");
 			*((int*)p[i].value) = intvalue;
 			break;
 		case UINT:
 			if (sscanf(value, "%u", &uintvalue) != 1)
-				RETURN_ERROR(p[i].name, "Cannot get a uint");
+				EXIT_ERROR(p[i].name, "Cannot get a uint");
 			*((unsigned int*)p[i].value) = uintvalue;
 			break;
 		case BOOL:
 			boolvalue = (strstr(value, "true") != NULL) ?
 			    true :false;
 			*((bool*)p[i].value) = boolvalue;
 			break;
 		case COLOR:
 			if (sscanf(value, "%s %s", c1, c2) != 2)
-				RETURN_ERROR(p[i].name, "Cannot get 2 colors");
+				EXIT_ERROR(p[i].name, "Cannot get 2 colors");
 			/* Foreground */
 			for (j = 0; j < 8 ; j++)
 				if ((strstr(c1, color[j])) != NULL)
 					break;
 			if ((fg = j) > 7)
-				RETURN_ERROR(p[i].name, "Bad foreground");
+				EXIT_ERROR(p[i].name, "Bad foreground");
 			/* Background */
 			for (j = 0; j < 8 ; j++)
 				if ((value = strstr(c2, color[j])) != NULL)
 					break;
 			if ((bg = j) > 7)
-				RETURN_ERROR(p[i].name, "Bad background");
+				EXIT_ERROR(p[i].name, "Bad background");
 			/* Flags */
 			flags = 0;
 			if (strstr(value, "bold") != NULL)
 				flags |= BSDDIALOG_BOLD;
 			if (strstr(value, "reverse") != NULL)
 				flags |= BSDDIALOG_REVERSE;
 			if (strstr(value, "underline") != NULL)
 				flags |= BSDDIALOG_UNDERLINE;
 			*((int*)p[i].value) = bsddialog_color(fg, bg, flags);
 			break;
 		}
 	}
 
 	fclose(fp);
 
 	bsddialog_set_theme(&t);
-
-	return (BSDDIALOG_OK);
 }
 
-int bikeshed(struct bsddialog_conf *conf, char *errbuf)
+void bikeshed(struct bsddialog_conf *conf)
 {
 	int margin, i;
 	int colors[8] = {0, 0, 0, 0 ,0 ,0 , 0, 0};
 	enum bsddialog_color col[6];
 	time_t clock;
 
 	time(&clock);
 	srand(clock);
 
 	/* theme */
 	if (bsddialog_get_theme(&t) != BSDDIALOG_OK)
-		return (BSDDIALOG_ERROR);
+		EXIT_FMTERROR("%s", bsddialog_geterror());
 
 	for (i = 0; i < 6; i++) {
 		do {
 			col[i] = rand() % 8;
 		} while (colors[col[i]] == 1);
 		colors[col[i]] = 1;
 	}
 
 	t.screen.color = bsddialog_color(col[4], col[3], 0);
 
 	t.shadow.color   = bsddialog_color(col[0], col[0], 0);
 	t.shadow.y       = 1,
 	t.shadow.x       = 2,
 
 	t.dialog.delimtitle       = (rand() % 2 == 0) ? true : false;
 	t.dialog.titlecolor       = bsddialog_color(col[3], col[5], 0);
 	t.dialog.lineraisecolor   = bsddialog_color(col[0], col[5], 0);
 	t.dialog.linelowercolor   = bsddialog_color(col[0], col[5], 0);
 	t.dialog.color            = bsddialog_color(col[0], col[5], 0);
 	t.dialog.bottomtitlecolor = bsddialog_color(col[0], col[5], 0);
 	t.dialog.arrowcolor       = bsddialog_color(col[3], col[5], 0);
 
 	t.menu.f_selectorcolor = bsddialog_color(col[5], col[3], 0);
 	t.menu.selectorcolor   = bsddialog_color(col[0], col[5], 0);
 	t.menu.f_desccolor     = bsddialog_color(col[5], col[3], 0);
 	t.menu.desccolor       = bsddialog_color(col[0], col[5], 0);
 	t.menu.f_namecolor     = bsddialog_color(col[5], col[3], 0);
 	t.menu.namecolor       = bsddialog_color(col[3], col[5], 0);
 	t.menu.namesepcolor    = bsddialog_color(col[1], col[5], 0);
 	t.menu.descsepcolor    = bsddialog_color(col[1], col[5], 0);
 	t.menu.f_shortcutcolor = bsddialog_color(col[1], col[3], 0);
 	t.menu.shortcutcolor   = bsddialog_color(col[1], col[5], 0);
 	t.menu.bottomdesccolor = bsddialog_color(col[4], col[3], 0);
 
 	t.form.f_fieldcolor    = bsddialog_color(col[5], col[3], 0);
 	t.form.fieldcolor      = bsddialog_color(col[5], col[4], 0);
 	t.form.readonlycolor   = bsddialog_color(col[4], col[5], 0);
 	t.form.bottomdesccolor = bsddialog_color(col[4], col[3], 0);
 
 	t.bar.f_color = bsddialog_color(col[5], col[3], 0);
 	t.bar.color   = bsddialog_color(col[3], col[5], 0);
 
 	t.button.minmargin       = 1,
 	t.button.maxmargin       = 5,
 	t.button.leftdelim       = '[',
 	t.button.rightdelim      = ']',
 	t.button.f_delimcolor    = bsddialog_color(col[5], col[3], 0);
 	t.button.delimcolor      = bsddialog_color(col[0], col[5], 0);
 	t.button.f_color         = bsddialog_color(col[2], col[3], 0);
 	t.button.color           = bsddialog_color(col[0], col[5], 0);
 	t.button.f_shortcutcolor = bsddialog_color(col[5], col[3], 0);
 	t.button.shortcutcolor   = bsddialog_color(col[1], col[5], 0);
 
 	if (bsddialog_set_theme(&t))
-		return (BSDDIALOG_ERROR);
+		EXIT_FMTERROR("%s", bsddialog_geterror());
 
 	/* conf */
 	conf->button.always_active = (rand() % 2 == 0) ? true : false;
 	if (conf->title != NULL) {
 		memset(title, 0, 1024);
 		margin = rand() % 5;
 		memset(title, ' ', margin);
 		strcpy(title + margin, conf->title);
 		memset(title + strlen(title), ' ', margin);
 		conf->title = title;
 	}
-
-	return (BSDDIALOG_OK);
 }
diff --git a/util_theme.h b/util_theme.h
index fd9b32db1204..bf51447dfb2c 100644
--- a/util_theme.h
+++ b/util_theme.h
@@ -1,35 +1,36 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2022 Alfonso Sabato Siciliano
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _BSDDIALOG_UTILITY_THEME_H_
 #define _BSDDIALOG_UTILITY_THEME_H_
 
-int savetheme(const char *file, char *errbuf, const char *version);
-int loadtheme(const char *file, char *errbuf);
-int bikeshed(struct bsddialog_conf *conf, char *errbuf);
+void savetheme(const char *file, const char *version);
+void loadtheme(const char *file);
+void setdeftheme(enum bsddialog_default_theme theme);
+void bikeshed(struct bsddialog_conf *conf);
 
 #endif