diff --git a/.mlvwm/.initrc b/.mlvwm/.initrc
new file mode 100644
index 0000000..c864421
--- /dev/null
+++ b/.mlvwm/.initrc
@@ -0,0 +1,6 @@
+Read initrc
+InitFunction
+Desk 0
+Exec "xterm" xterm -ls -geometry 80x25 &
+Wait xterm
+END
\ No newline at end of file
diff --git a/.mlvwm/.mlvwmrc b/.mlvwm/.mlvwmrc
index 533111f..376fde7 100644
--- a/.mlvwm/.mlvwmrc
+++ b/.mlvwm/.mlvwmrc
@@ -27,18 +27,6 @@ IconifyShade
 ## Show the window as shade, when hide shaded window is shown
 #ShadeMap
 
-## Enable MacOS 8 decoration feauture
-System8
-
-## Enable Opaque Move
-OpaqueMove
-
-## Enable Opaque Resize
-# OpaqueResize
-
-## Enable one click menu
-#OneClickMenu
-
 # Double click time
 DoubleClickTime 300
 
@@ -48,9 +36,6 @@ EdgeResistance 50 50
 ## Show window name with desktop number on window list
 #DisplayDeskNumber
 
-## Draw move/resize line with dotted line
-Compatible
-
 # Set icon search path. It needs before "Style".
 IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
 IconMenuIcon label2.xpm
@@ -76,117 +61,19 @@ Escape  M       Restart mlvwm
 Escape  SM      Exit 
 END
 
-# Register the menu
-Menu Apple, Icon label1.xpm, Stick
-"About this Workstation..." NonSelect, Gray, Action About
-"" NonSelect
-"Terminal"	Icon mini-display.xpm, Action Exec "kterm" exec kterm -ls
-"Editor"  Action Exec "mule" exec mule, Icon mini-edit.xpm
-"calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
-END
+# Load Theme from themes/ ('System7', 'MacOS8', or 'MacOS9')
+Read themes/System7
 
-Menu def-File, Label "File", Left
-"New Folder" NonSelect, Gray, Action Nop
-"Open" NonSelect, Gray, Action Nop
-"Print" NonSelect, Gray, Action Nop
-"Close Window" NonSelect, Gray, Action Nop
-"" NonSelect
-"Get Info"  NonSelect, Gray,Action Nop
-"Duplicate" NonSelect, Gray, Action Nop
-"" NonSelect
-"Find..." NonSelect, Gray, Action Nop
-"Find Again" NonSelect, Gray, Action Nop
-"" NonSelect
-"Page Setup..." NonSelect, Gray, Action Nop
-"Print Desktop..." NonSelect, Gray, Action Nop
-END
-
-Menu def-Edit, Label "Edit"
-"Undo" NonSelect, Gray, Action Nop
-"" NonSelect
-"Cut" NonSelect, Gray
-"Copy" NonSelect, Gray
-"Paste" NonSelect, Gray
-"Clear" NonSelect, Gray
-"Select All" NonSelect, Gray
-"" NonSelect
-"Show Clipboard" NonSelect, Gray
-END
-
-Menu def-View, Label "View"
-"by Small Icon" NonSelect, Gray
-"by Icon" NonSelect, Gray
-"by Name" NonSelect, Gray
-"by Size" NonSelect, Gray
-"by Kind" NonSelect, Gray
-"by Date" NonSelect, Gray
-"by Version" NonSelect, Gray
-END
-
-Menu def-Label, Label "Label"
-"None" NonSelect, Gray
-"" NonSelect
-"Essential" NonSelect, Gray
-"Hot" NonSelect, Gray
-"In Progress" NonSelect, Gray
-"Cool" NonSelect, Gray
-"Personal" NonSelect, Gray
-"Project 1" NonSelect, Gray
-"Project 2" NonSelect, Gray
-END
-
-Menu restart-sub
-"Start twm"  Action Restart twm
-"Start fvwm" Action Restart fvwm
-END
-
-Menu def-Special, Label "Special"
-"Clean Up Desktop" Action Refresh
-"Empty Trash" NonSelect, Gray
-"" NonSelect
-"Eject Disk" NonSelect, Gray
-"Erase Disk..." NonSelect, Gray
-"" NonSelect
-"Start" SubMenu restart-sub
-"Restart" Action Restart mlvwm
-"Shut down" Action Exit
-END
-
-Menu def-Window
-"Move" Action MoveWindow
-"Resize" Action ResizeWindow
-"Toggle Scroll" Action ToggleScroll
-"" NonSelect
-"Quit" Action KillWindow
-END
-
-# Swallow the application at menu
-#Swallow "XEyes"	Action Exec "xeyes" exec xeyes -geometry 25
-Swallow "XClock" Action Exec "xclock" exec xclock -geometry 180x25 -digital -padding 5 -update 1
-
-# Definition MenuBar
-MenuBar default
-def-File
-def-Edit
-def-View
-def-Label
-def-Special
-def-Window
-END
+# Load the default menu bar
+# (IMPORTANT: The Apple menu is defined in the theme, so _must_ be loaded before
+# the default menu bar)
+Read MenuBar
 
 # Define the initial function
-InitFunction
-Desk 1
-Exec "xterm" xterm -ls -geometry 80x25 &
-Wait xterm
-Desk 0
-Exec "xterm" xterm -ls -geometry 80x25 &
-Wait xterm
-END
+Read .initrc
 
 # Define the restart function
-RestartFunction
-END
+Read .restartrc
 
 # Define the default window decoration
 Style
@@ -208,5 +95,5 @@ Style
 END
 
 # Read other configuration
-Read Mlvwmrc-Xterm
-Read Mlvwmrc-Netscape
+#Read Mlvwmrc-Xterm
+#Read Mlvwmrc-Netscape
diff --git a/.mlvwm/.restartrc b/.mlvwm/.restartrc
new file mode 100644
index 0000000..0068408
--- /dev/null
+++ b/.mlvwm/.restartrc
@@ -0,0 +1,2 @@
+RestartFunction
+END
\ No newline at end of file
diff --git a/.mlvwm/MenuBar b/.mlvwm/MenuBar
new file mode 100644
index 0000000..dfa7677
--- /dev/null
+++ b/.mlvwm/MenuBar
@@ -0,0 +1,88 @@
+Menu def-File, Label "File", Left
+"New Folder" NonSelect, Gray, Action Nop
+"Open" NonSelect, Gray, Action Nop
+"Print" NonSelect, Gray, Action Nop
+"Close Window" NonSelect, Gray, Action Nop
+"" NonSelect
+"Get Info"  NonSelect, Gray,Action Nop
+"Duplicate" NonSelect, Gray, Action Nop
+"" NonSelect
+"Find..." NonSelect, Gray, Action Nop
+"Find Again" NonSelect, Gray, Action Nop
+"" NonSelect
+"Page Setup..." NonSelect, Gray, Action Nop
+"Print Desktop..." NonSelect, Gray, Action Nop
+END
+
+Menu def-Edit, Label "Edit"
+"Undo" NonSelect, Gray, Action Nop
+"" NonSelect
+"Cut" NonSelect, Gray
+"Copy" NonSelect, Gray
+"Paste" NonSelect, Gray
+"Clear" NonSelect, Gray
+"Select All" NonSelect, Gray
+"" NonSelect
+"Show Clipboard" NonSelect, Gray
+END
+
+Menu def-View, Label "View"
+"by Small Icon" NonSelect, Gray
+"by Icon" NonSelect, Gray
+"by Name" NonSelect, Gray
+"by Size" NonSelect, Gray
+"by Kind" NonSelect, Gray
+"by Date" NonSelect, Gray
+"by Version" NonSelect, Gray
+END
+
+Menu def-Label, Label "Label"
+"None" NonSelect, Gray
+"" NonSelect
+"Essential" NonSelect, Gray
+"Hot" NonSelect, Gray
+"In Progress" NonSelect, Gray
+"Cool" NonSelect, Gray
+"Personal" NonSelect, Gray
+"Project 1" NonSelect, Gray
+"Project 2" NonSelect, Gray
+END
+
+Menu restart-sub
+"Start twm"  Action Restart twm
+"Start fvwm" Action Restart fvwm
+END
+
+Menu def-Special, Label "Special"
+"Clean Up Desktop" Action Refresh
+"Empty Trash" NonSelect, Gray
+"" NonSelect
+"Eject Disk" NonSelect, Gray
+"Erase Disk..." NonSelect, Gray
+"" NonSelect
+"Start" SubMenu restart-sub
+"Restart" Action Restart mlvwm
+"Shut down" Action Exit
+END
+
+Menu def-Window
+"Move" Action MoveWindow
+"Resize" Action ResizeWindow
+"Toggle Scroll" Action ToggleScroll
+"" NonSelect
+"Quit" Action KillWindow
+END
+
+# Swallow the application at menu
+#Swallow "XEyes"	Action Exec "xeyes" exec xeyes -geometry 25
+Swallow "XClock" Action Exec "xclock" exec xclock -geometry 180x25 -digital -padding 5 -update 1
+
+# Definition MenuBar
+MenuBar default
+def-File
+def-Edit
+def-View
+def-Label
+def-Special
+def-Window
+END
diff --git a/.mlvwm/initrc b/.mlvwm/initrc
new file mode 100644
index 0000000..c864421
--- /dev/null
+++ b/.mlvwm/initrc
@@ -0,0 +1,6 @@
+Read initrc
+InitFunction
+Desk 0
+Exec "xterm" xterm -ls -geometry 80x25 &
+Wait xterm
+END
\ No newline at end of file
diff --git a/.mlvwm/themes/MacOS8 b/.mlvwm/themes/MacOS8
new file mode 100644
index 0000000..b49592c
--- /dev/null
+++ b/.mlvwm/themes/MacOS8
@@ -0,0 +1,26 @@
+## Enable MacOS 8 decoration feature
+System8
+
+## Draw move/resize line with dotted line
+Compatible
+
+## Enable Opaque Move
+OpaqueMove
+
+## Enable Opaque Resize
+# OpaqueResize
+
+## Enable one click menu
+OneClickMenu
+
+################################################################################
+# Apple Menu
+################################################################################
+
+Menu Apple, Icon label1.xpm, Stick
+"About This Computer..." NonSelect, Gray, Action About
+"" NonSelect
+"Terminal"	Icon mini-display.xpm, Action Exec "xterm" exec xterm
+"Editor"  Action Exec "mule" exec mule, Icon mini-edit.xpm
+"calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
+END
\ No newline at end of file
diff --git a/.mlvwm/themes/MacOS9 b/.mlvwm/themes/MacOS9
new file mode 100644
index 0000000..af2c579
--- /dev/null
+++ b/.mlvwm/themes/MacOS9
@@ -0,0 +1,23 @@
+## Enable MacOS 8 decoration feature
+System8
+
+## Enable Opaque Move
+OpaqueMove
+
+## Enable Opaque Resize
+OpaqueResize
+
+## Enable one click menu
+OneClickMenu
+
+################################################################################
+# Apple Menu
+################################################################################
+
+Menu Apple, Icon label1.xpm, Stick
+"About This Computer..." NonSelect, Gray, Action About
+"" NonSelect
+"Terminal"	Icon mini-display.xpm, Action Exec "xterm" exec xterm
+"Editor"  Action Exec "mule" exec mule, Icon mini-edit.xpm
+"calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
+END
\ No newline at end of file
diff --git a/.mlvwm/themes/System7 b/.mlvwm/themes/System7
new file mode 100644
index 0000000..11282f2
--- /dev/null
+++ b/.mlvwm/themes/System7
@@ -0,0 +1,14 @@
+## Draw move/resize line with dotted line
+Compatible
+
+################################################################################
+# Apple Menu
+################################################################################
+
+Menu Apple, Icon label1.xpm, Stick
+"About This Computer..." NonSelect, Gray, Action About
+"" NonSelect
+"Terminal"	Icon mini-display.xpm, Action Exec "xterm" exec xterm
+"Editor"  Action Exec "mule" exec mule, Icon mini-edit.xpm
+"calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
+END
\ No newline at end of file