diff --git a/dialog/di_newt.py b/dialog/di_newt.py
index bd4ef4e..0f18537 100644
--- a/dialog/di_newt.py
+++ b/dialog/di_newt.py
@@ -513,7 +513,7 @@ class MountPoint(Screen):
 		Screen.label_mp = Label('mountpoint : ')
 		Screen.label_fs = Label('File System Type : ')
 		Screen.widget_label('')
-		fs_list = ['ext2','ext3', 'ext4', 'swap', 'reiserfs', 'xfs', 'jfs']
+		fs_list = ['ext2','ext3', 'ext4', 'linux-swap', 'reiserfs', 'xfs', 'jfs']
 		Screen.widget_listbox(3, *fs_list)
 		Screen.widget_checkbox('Format the partition')
 		Screen.listbox.setCurrent('ext3')
diff --git a/interface/ri_inst_cli.py b/interface/ri_inst_cli.py
index ab5b5cc..62d454a 100644
--- a/interface/ri_inst_cli.py
+++ b/interface/ri_inst_cli.py
@@ -27,7 +27,7 @@ def set_task_scale():
     print "%.2f" %float(Rate.value)
 
 def set_task_over():
-    string = raw_input("Rocky system installation successfully, do you want to reboot?[Y]")
+    string = raw_input("Rocky system installation successfully, do you want to reboot?[Y/n]")
     if string.lower() == "y" or string == "":
         return True
     return False
diff --git a/main/setup b/main/setup
index b8c71a3..eda4e4f 100755
--- a/main/setup
+++ b/main/setup
@@ -23,7 +23,7 @@
 #===================================================================================
 #Set variables
 #===================================================================================
-workdir="/usr/lib/new_install/interface"
+workdir="/usr/lib/new_install/dialog"
 exec_file='xinitrc_setup'
 work_write_dir='/var/install'
 configfile="../xml/config.xml"
@@ -31,10 +31,10 @@ configfile="../xml/config.xml"
 #Performance function
 #===================================================================================
 usage(){
-    echo "usage: $0 [-s|--style style] [-l|--language language][-n|--noXserver][-h|--help]"
+    echo "usage: $0 [-s|--style style][-g|--graph][-l|--language language][-n|--noXserver][-h|--help]"
     echo "style [text|graph]"
     echo "language [english|chinese]"
-    echo "default Xserver start"
+    echo "default text install"
 }
 
 config_execfile(){
@@ -55,12 +55,13 @@ config_execfile(){
 }
       
 main(){
-    local style='graph'
+    local style='dialog'
     local language='chinese'
-    local xstart='yes'
+    local xstart='no'
     local dialog=''
 
-    tmp=$(getopt -o c:dsl:nh --long style:,configfile:,language:,noXserver,help -- "$@")
+    #tmp=$(getopt -o c:dsl:nh --long style:,configfile:,language:,noXserver,help -- "$@")
+    tmp=$(getopt -o c:sgl:nh --long configfile:,style,graph,language:,noXserver,help -- "$@")
     eval set -- "$tmp"
 
     mkdir -p $work_write_dir
@@ -68,6 +69,7 @@ main(){
     while true;do
 	case "$1" in
         '-c'|'--configfile') configfile="$2" ; shift 2;;
+        '-g'|'--graph') xstart='yes';style="graph" ;workdir="/usr/lib/new_install/interface";shift ;;
         '-s'|'--style') xstart='no';style="dialog" ;workdir="/usr/lib/new_install/dialog";shift ;;
 	    '-l'|'--language') language="$2" ;shift 2;;
 	    '-n'|'--noXserver') xstart='no' ;shift ;;