diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh
index 9cac48ff..9067aac3 100644
--- a/nls/fluxbox-nls.hh
+++ b/nls/fluxbox-nls.hh
@@ -1,4 +1,4 @@
-// This file generated by nlsinfo -H -N FBNLS ../src ../util, on Tue Jun  8 23:00:01 2004
+// This file generated by nlsinfo -H -N FBNLS ../src ../util, on Mon Jun 21 00:15:24 2004
 
 #ifndef FLUXBOX_NLS_HH
 #define FLUXBOX_NLS_HH
@@ -6,206 +6,206 @@
 namespace FBNLS {
 
 enum {
-	AlignSet = 0x1,
-	AlignBottomCenter = 0x1,
-	AlignBottomLeft = 0x2,
-	AlignBottomRight = 0x3,
-	AlignHorizontal = 0x4,
-	AlignLeft = 0x5,
-	AlignLeftBottom = 0x6,
-	AlignLeftCenter = 0x7,
-	AlignLeftTop = 0x8,
-	AlignRelative = 0x9,
-	AlignRight = 0xa,
-	AlignRightBottom = 0xb,
-	AlignRightCenter = 0xc,
-	AlignRightTop = 0xd,
-	AlignTopCenter = 0xe,
-	AlignTopLeft = 0xf,
-	AlignTopRight = 0x10,
-	AlignVertical = 0x11,
+	AlignSet = 1,
+	AlignBottomCenter = 1,
+	AlignBottomLeft = 2,
+	AlignBottomRight = 3,
+	AlignHorizontal = 4,
+	AlignLeft = 5,
+	AlignLeftBottom = 6,
+	AlignLeftCenter = 7,
+	AlignLeftTop = 8,
+	AlignRelative = 9,
+	AlignRight = 10,
+	AlignRightBottom = 11,
+	AlignRightCenter = 12,
+	AlignRightTop = 13,
+	AlignTopCenter = 14,
+	AlignTopLeft = 15,
+	AlignTopRight = 16,
+	AlignVertical = 17,
 
-	BaseDisplaySet = 0x2,
-	BaseDisplayAborting = 0x1,
-	BaseDisplayShuttingDown = 0x2,
-	BaseDisplaySignalCaught = 0x3,
+	BaseDisplaySet = 2,
+	BaseDisplayAborting = 1,
+	BaseDisplayShuttingDown = 2,
+	BaseDisplaySignalCaught = 3,
 
-	CommonSet = 0x3,
-	CommonAlpha = 0x1,
-	CommonAutoHide = 0x2,
-	CommonCompiled = 0x3,
-	CommonCompiledOptions = 0x4,
-	CommonCompiler = 0x5,
-	CommonCompilerVersion = 0x6,
-	CommonDefaultInitFile = 0x7,
-	CommonDefaultKeyFile = 0x8,
-	CommonDefaultMenuFile = 0x9,
-	CommonDefaultStyle = 0xa,
-	CommonDefaults = 0xb,
-	CommonDisabled = 0xc,
-	CommonError = 0xd,
-	CommonFluxboxVersion = 0xe,
-	CommonMaximizeOver = 0xf,
-	CommonVisible = 0x10,
+	CommonSet = 3,
+	CommonAlpha = 1,
+	CommonAutoHide = 2,
+	CommonCompiled = 3,
+	CommonCompiledOptions = 4,
+	CommonCompiler = 5,
+	CommonCompilerVersion = 6,
+	CommonDefaultInitFile = 7,
+	CommonDefaultKeyFile = 8,
+	CommonDefaultMenuFile = 9,
+	CommonDefaultStyle = 10,
+	CommonDefaults = 11,
+	CommonDisabled = 12,
+	CommonError = 13,
+	CommonFluxboxVersion = 14,
+	CommonMaximizeOver = 15,
+	CommonVisible = 16,
 
-	ConfigmenuSet = 0x4,
-	ConfigmenuAntiAlias = 0x1,
-	ConfigmenuAutoRaise = 0x2,
-	ConfigmenuClickRaises = 0x3,
-	ConfigmenuClickToFocus = 0x4,
-	ConfigmenuDecorateTransient = 0x5,
-	ConfigmenuDesktopWheeling = 0x6,
-	ConfigmenuFocusLast = 0x7,
-	ConfigmenuFocusModel = 0x8,
-	ConfigmenuFocusNew = 0x9,
-	ConfigmenuFullMax = 0xa,
-	ConfigmenuImageDithering = 0xb,
-	ConfigmenuOpaqueMove = 0xc,
-	ConfigmenuSemiSloppyFocus = 0xd,
-	ConfigmenuSloppyFocus = 0xe,
-	ConfigmenuWorkspaceWarping = 0xf,
+	ConfigmenuSet = 4,
+	ConfigmenuAntiAlias = 1,
+	ConfigmenuAutoRaise = 2,
+	ConfigmenuClickRaises = 3,
+	ConfigmenuClickToFocus = 4,
+	ConfigmenuDecorateTransient = 5,
+	ConfigmenuDesktopWheeling = 6,
+	ConfigmenuFocusLast = 7,
+	ConfigmenuFocusModel = 8,
+	ConfigmenuFocusNew = 9,
+	ConfigmenuFullMax = 10,
+	ConfigmenuImageDithering = 11,
+	ConfigmenuOpaqueMove = 12,
+	ConfigmenuSemiSloppyFocus = 13,
+	ConfigmenuSloppyFocus = 14,
+	ConfigmenuWorkspaceWarping = 15,
 
-	EwmhSet = 0x5,
-	EwmhOutOfMemoryClientList = 0x1,
+	EwmhSet = 5,
+	EwmhOutOfMemoryClientList = 1,
 
-	FbTkErrorSet = 0x6,
-	FbTkErrorBigHeight = 0x1,
-	FbTkErrorBigWidth = 0x2,
-	FbTkErrorCantFallbackFont = 0x3,
-	FbTkErrorColorAllocation = 0x4,
-	FbTkErrorCreatePixmap = 0x5,
-	FbTkErrorCreateXImage = 0x6,
-	FbTkErrorFailedRead = 0x7,
-	FbTkErrorNoRenderFormat = 0x8,
-	FbTkErrorNoRenderPicture = 0x9,
-	FbTkErrorNoRenderPixmap = 0xa,
-	FbTkErrorNoRenderVisualFormat = 0xb,
-	FbTkErrorOutOfMemory = 0xc,
-	FbTkErrorOutOfMemoryBlue = 0xd,
-	FbTkErrorOutOfMemoryGreen = 0xe,
-	FbTkErrorOutOfMemoryRed = 0xf,
-	FbTkErrorThemeItem = 0x10,
-	FbTkErrorUnsupportedVisual = 0x11,
-	FbTkErrorUsingDefault = 0x12,
+	FbTkErrorSet = 6,
+	FbTkErrorBigHeight = 1,
+	FbTkErrorBigWidth = 2,
+	FbTkErrorCantFallbackFont = 3,
+	FbTkErrorColorAllocation = 4,
+	FbTkErrorCreatePixmap = 5,
+	FbTkErrorCreateXImage = 6,
+	FbTkErrorFailedRead = 7,
+	FbTkErrorNoRenderFormat = 8,
+	FbTkErrorNoRenderPicture = 9,
+	FbTkErrorNoRenderPixmap = 10,
+	FbTkErrorNoRenderVisualFormat = 11,
+	FbTkErrorOutOfMemory = 12,
+	FbTkErrorOutOfMemoryBlue = 13,
+	FbTkErrorOutOfMemoryGreen = 14,
+	FbTkErrorOutOfMemoryRed = 15,
+	FbTkErrorThemeItem = 16,
+	FbTkErrorUnsupportedVisual = 17,
+	FbTkErrorUsingDefault = 18,
 
-	FluxboxSet = 0x7,
-	FluxboxBadRCFile = 0x1,
-	FluxboxCantLoadGroupFile = 0x2,
-	FluxboxCantLoadRCFile = 0x3,
-	FluxboxCantLoadRCFileTrying = 0x4,
-	FluxboxCantMapWindow = 0x5,
-	FluxboxErrorCreatingDirectory = 0x6,
-	FluxboxErrorNoScreens = 0x7,
-	FluxboxErrorRegexp = 0x8,
-	FluxboxFatalSingleton = 0x9,
-	FluxboxNoDisplay = 0xa,
-	FluxboxWarningLocale = 0xb,
-	FluxboxWarningLocaleModifiers = 0xc,
+	FluxboxSet = 7,
+	FluxboxBadRCFile = 1,
+	FluxboxCantLoadGroupFile = 2,
+	FluxboxCantLoadRCFile = 3,
+	FluxboxCantLoadRCFileTrying = 4,
+	FluxboxCantMapWindow = 5,
+	FluxboxErrorCreatingDirectory = 6,
+	FluxboxErrorNoScreens = 7,
+	FluxboxErrorRegexp = 8,
+	FluxboxFatalSingleton = 9,
+	FluxboxNoDisplay = 10,
+	FluxboxWarningLocale = 11,
+	FluxboxWarningLocaleModifiers = 12,
 
-	GnomeSet = 0x8,
-	GnomeOutOfMemoryClientList = 0x1,
+	GnomeSet = 8,
+	GnomeOutOfMemoryClientList = 1,
 
-	KeysSet = 0x9,
-	KeysBadLine = 0x1,
-	KeysBadMerge = 0x2,
-	KeysInvalidKeyMod = 0x3,
+	KeysSet = 9,
+	KeysBadLine = 1,
+	KeysBadMerge = 2,
+	KeysInvalidKeyMod = 3,
 
-	MenuSet = 0xa,
-	MenuConfiguration = 0x1,
-	MenuDefaultRootMenu = 0x2,
-	MenuExit = 0x3,
-	MenuIcons = 0x4,
-	MenuLayer = 0x5,
-	MenuOnHead = 0x6,
-	MenuPlacement = 0x7,
-	MenuReconfigure = 0x8,
-	MenuRestart = 0x9,
-	Menuxterm = 0xa,
+	MenuSet = 10,
+	MenuConfiguration = 1,
+	MenuDefaultRootMenu = 2,
+	MenuExit = 3,
+	MenuIcons = 4,
+	MenuLayer = 5,
+	MenuOnHead = 6,
+	MenuPlacement = 7,
+	MenuReconfigure = 8,
+	MenuRestart = 9,
+	Menuxterm = 10,
 
-	RememberSet = 0xb,
-	RememberDecorations = 0x1,
-	RememberDimensions = 0x2,
-	RememberJumpToWorkspace = 0x3,
-	RememberLayer = 0x4,
-	RememberMenuItemName = 0x5,
-	RememberPosition = 0x6,
-	RememberSaveOnClose = 0x7,
-	RememberShaded = 0x8,
-	RememberSticky = 0x9,
-	RememberUnknown = 0xa,
-	RememberWorkspace = 0xb,
+	RememberSet = 11,
+	RememberDecorations = 1,
+	RememberDimensions = 2,
+	RememberJumpToWorkspace = 3,
+	RememberLayer = 4,
+	RememberMenuItemName = 5,
+	RememberPosition = 6,
+	RememberSaveOnClose = 7,
+	RememberShaded = 8,
+	RememberSticky = 9,
+	RememberUnknown = 10,
+	RememberWorkspace = 11,
 
-	ScreenSet = 0xc,
-	ScreenAnotherWMRunning = 0x1,
-	ScreenGeometryFormat = 0x2,
-	ScreenGeometryLength = 0x3,
-	ScreenManagingScreen = 0x4,
-	ScreenPositionFormat = 0x5,
-	ScreenPositionLength = 0x6,
+	ScreenSet = 12,
+	ScreenAnotherWMRunning = 1,
+	ScreenGeometryFormat = 2,
+	ScreenGeometryLength = 3,
+	ScreenManagingScreen = 4,
+	ScreenPositionFormat = 5,
+	ScreenPositionLength = 6,
 
-	SlitSet = 0xd,
-	SlitClientsMenu = 0x1,
-	SlitCycleDown = 0x2,
-	SlitCycleUp = 0x3,
-	SlitDirection = 0x4,
-	SlitLayer = 0x5,
-	SlitOnHead = 0x6,
-	SlitPlacement = 0x7,
-	SlitSlit = 0x8,
+	SlitSet = 13,
+	SlitClientsMenu = 1,
+	SlitCycleDown = 2,
+	SlitCycleUp = 3,
+	SlitDirection = 4,
+	SlitLayer = 5,
+	SlitOnHead = 6,
+	SlitPlacement = 7,
+	SlitSlit = 8,
 
-	ToolbarSet = 0xe,
-	ToolbarEditWkspcName = 0x1,
-	ToolbarIconbarMode = 0x2,
-	ToolbarIconbarModeAllWindows = 0x3,
-	ToolbarIconbarModeIcons = 0x4,
-	ToolbarIconbarModeNone = 0x5,
-	ToolbarIconbarModeWorkspace = 0x6,
-	ToolbarIconbarModeWorkspaceIcons = 0x7,
-	ToolbarLayer = 0x8,
-	ToolbarOnHead = 0x9,
-	ToolbarPlacement = 0xa,
-	ToolbarToolbar = 0xb,
-	ToolbarWidthPercent = 0xc,
+	ToolbarSet = 14,
+	ToolbarEditWkspcName = 1,
+	ToolbarIconbarMode = 2,
+	ToolbarIconbarModeAllWindows = 3,
+	ToolbarIconbarModeIcons = 4,
+	ToolbarIconbarModeNone = 5,
+	ToolbarIconbarModeWorkspace = 6,
+	ToolbarIconbarModeWorkspaceIcons = 7,
+	ToolbarLayer = 8,
+	ToolbarOnHead = 9,
+	ToolbarPlacement = 10,
+	ToolbarToolbar = 11,
+	ToolbarWidthPercent = 12,
 
-	WindowSet = 0xf,
-	WindowUnnamed = 0x1,
+	WindowSet = 15,
+	WindowUnnamed = 1,
 
-	WindowmenuSet = 0x10,
-	WindowmenuClose = 0x1,
-	WindowmenuIconify = 0x2,
-	WindowmenuLayer = 0x3,
-	WindowmenuLower = 0x4,
-	WindowmenuMaximize = 0x5,
-	WindowmenuRaise = 0x6,
-	WindowmenuSendTo = 0x7,
-	WindowmenuShade = 0x8,
-	WindowmenuStick = 0x9,
+	WindowmenuSet = 16,
+	WindowmenuClose = 1,
+	WindowmenuIconify = 2,
+	WindowmenuLayer = 3,
+	WindowmenuLower = 4,
+	WindowmenuMaximize = 5,
+	WindowmenuRaise = 6,
+	WindowmenuSendTo = 7,
+	WindowmenuShade = 8,
+	WindowmenuStick = 9,
 
-	WorkspaceSet = 0x11,
-	WorkspaceDefaultNameFormat = 0x1,
-	WorkspaceMenuTitle = 0x2,
-	WorkspaceNewWorkspace = 0x3,
-	WorkspaceRemoveLast = 0x4,
+	WorkspaceSet = 17,
+	WorkspaceDefaultNameFormat = 1,
+	WorkspaceMenuTitle = 2,
+	WorkspaceNewWorkspace = 3,
+	WorkspaceRemoveLast = 4,
 
-	bsetrootSet = 0x12,
-	bsetrootMustSpecify = 0x1,
-	bsetrootNoPixmapAtoms = 0x2,
-	bsetrootUsage = 0x3,
+	bsetrootSet = 18,
+	bsetrootMustSpecify = 1,
+	bsetrootNoPixmapAtoms = 2,
+	bsetrootUsage = 3,
 
-	mainSet = 0x13,
-	mainDISPLAYRequiresArg = 0x1,
-	mainErrorBadAlloc = 0x2,
-	mainErrorBadCast = 0x3,
-	mainErrorOutOfRange = 0x4,
-	mainErrorRuntime = 0x5,
-	mainErrorStandardException = 0x6,
-	mainErrorUnknown = 0x7,
-	mainLOGRequiresArg = 0x8,
-	mainLogFile = 0x9,
-	mainLoggingTo = 0xa,
-	mainRCRequiresArg = 0xb,
-	mainUsage = 0xc,
-	mainWarnDisplaySet = 0xd,
+	mainSet = 19,
+	mainDISPLAYRequiresArg = 1,
+	mainErrorBadAlloc = 2,
+	mainErrorBadCast = 3,
+	mainErrorOutOfRange = 4,
+	mainErrorRuntime = 5,
+	mainErrorStandardException = 6,
+	mainErrorUnknown = 7,
+	mainLOGRequiresArg = 8,
+	mainLogFile = 9,
+	mainLoggingTo = 10,
+	mainRCRequiresArg = 11,
+	mainUsage = 12,
+	mainWarnDisplaySet = 13,
 
 	dummy_not_used = 0 // just for the end
 
diff --git a/nls/nlsinfo b/nls/nlsinfo
index 2a3eec73..6693e9fa 100644
--- a/nls/nlsinfo
+++ b/nls/nlsinfo
@@ -278,12 +278,12 @@ sub mode_header {
     my $setnum = 0;
     foreach my $set (sort keys %sets) {
         $setnum++;
-        printf "\t%s = 0x%x,\n", $set, $setnum; 
+        printf "\t%s = %d,\n", $set, $setnum; 
 
         my $strnum = 0;
         foreach my $str (sort keys %{$sets{$set}}) {
             $strnum++;
-            printf "\t%s = 0x%x,\n", $str, $strnum; 
+            printf "\t%s = %d,\n", $str, $strnum; 
         }
         print "\n";
     }