diff --git a/.config/openbox/rc.xml b/.config/openbox/rc.xml
index 2859d3c..f4cc9d6 100644
--- a/.config/openbox/rc.xml
+++ b/.config/openbox/rc.xml
@@ -113,10 +113,12 @@
   <number>4</number>
   <firstdesk>1</firstdesk>
   <names>
-    <!-- set names up here if you want to, like this:
+      <!-- set names up here if you want to, like this:
     <name>desktop 1</name>
     <name>desktop 2</name>
-    -->
+    <name>desktop 3</name>
+    <name>desktop 4</name>-->
+    
   </names>
   <popupTime>875</popupTime>
   <!-- The number of milliseconds to show the popup for when switching
@@ -275,6 +277,12 @@
       <command>/usr/bin/gmrun</command>
     </action>
   </keybind>
+  <keybind key="A-F3">
+    <action name="Execute">
+      <name>Lance </name>
+      <command>gnome-terminal</command>
+    </action>
+  </keybind>
   <keybind key="W-e">
     <action name="Execute">
       <startupnotify>
diff --git a/.zsh/00_basic.zsh b/.zsh/00_basic.zsh
index ee63f69..f29514e 100644
--- a/.zsh/00_basic.zsh
+++ b/.zsh/00_basic.zsh
@@ -39,7 +39,7 @@ prompt bart green red
 # pushd pour cd
 setopt  autopushd
 # ne tue pas les processus quand zsh quitte
-setopt  nohup
+#setopt  nohup
 # auto cd avec le nom du dossier
 setopt  autocd
 
diff --git a/.zsh/host:kirkwood/Environment.zsh b/.zsh/host:kirkwood/Environment.zsh
index e60e107..930d456 100755
--- a/.zsh/host:kirkwood/Environment.zsh
+++ b/.zsh/host:kirkwood/Environment.zsh
@@ -7,7 +7,8 @@ export JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.12
 export ANDROID_HOME=/home/mathieu/Android/android-sdk-linux
 export ANDROID_SKD=/home/mathieu/Android/android-sdk-linux/platforms/android-1.6/
 export ECLIPSE_HOME=/home/mathieu/Eclipse/eclipse-modeling-galileo
-export PATH=$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_SKD/tools:$ECLIPSE_HOME:$PATH
+export NETBEANS_HOME=/home/mathieu/netbeans-6.8
+export PATH=$NETBEANS_HOME/bin:$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_SKD/tools:$ECLIPSE_HOME:$PATH
 
 #Perso Bin
 export PATH=$HOME/bin/bin:$HOME/bin:$PATH
diff --git a/xplanet.conf b/xplanet.conf
index d592ddb..f2b49a6 100644
--- a/xplanet.conf
+++ b/xplanet.conf
@@ -1,4 +1,10 @@
-[default]     
+# This file contains options you might want to customize for each
+# body.  It's best to leave this file alone and modify a copy. Use the
+# -config option to tell xplanet to read your copy.
+
+[default]                       # Values in this section apply to all
+				# bodies unless overridden below.   
+
 arc_color=white
 #arc_file=
 
@@ -7,143 +13,154 @@ bump_scale=1
 
 cloud_gamma=1
 #cloud_map=
-cloud_ssec=false              
+cloud_ssec=false                # true if the cloud map is from the
+				# University of Wisconsin Space
+				# Science and Engineering Center 
 cloud_threshold=90
 
-color={255,255,255}            
-draw_orbit=false               
+color={255,255,255}             # fallback color in case an image map
+				# isn't found 
+
+draw_orbit=false                # if true, draw this body's orbit
+                                # about its primary
+
 grid=false
 grid1=6
 grid2=15
 
 #image=
 
-magnify=1                      
-marker_color=yellow
+magnify=90                      # draw the body as if its radius were
+				# magnified by this factor 
+
+marker_color=red
 #marker_file=
 #marker_font=
 
-max_radius_for_label=3          
+max_radius_for_label=3          # don't draw a label if the body's
+				# radius in pixels is more than this  
 
-min_radius_for_label=.01         
+min_radius_for_label=.01        # don't draw a label if the body's
+				# radius in pixels is less than this  
 
-min_radius_for_markers=40      
+min_radius_for_markers=40       # don't draw markers if the body's
+				# radius in pixels is less than this  
 
 #night_map=
 
-orbit={-.5,.5,2}                
-orbit_color={255,255,255}      
-random_origin=true              
-random_target=true               
+orbit={-.5,.5,2}                # extent of orbit to draw, 
+				# {start, end, delta}, where 
+                                # start and end are in units of period
+				# of revolution and delta is angular
+				# increment in degrees to evaluate
+				# position 
+
+orbit_color={255,255,255}       # color for the orbit
+
+random_origin=true              # Can this body be considered if
+				# -origin random is used?  
+
+random_target=true              # Can this body be considered if
+				# -target random is used?  
+
 #satellite_file=
-shade=10                        
+
+shade=30                        # 0 = black, 100 = same as dayside
+
 #specular_map=
-text_color={255,0,0}            
-twilight=6                      
+
+text_color={255,0,0}            # color for text (markers & body label)
+
+twilight=6                      # blend the day and night images for
+                                # pixels within this many degrees of
+                                # the terminator 
 
 [sun]
 "Sun"
 color={255,255,166}
-max_radius_for_label=0       
-#shade=100			# No night side!
 
+max_radius_for_label=0          # never draw a label for the sun
 
+shade=100			# No night side!
 
 [mercury]
 "Mercury"
 color={100, 100, 100}
-min_radius_for_label=0          # always draw a label
 
+min_radius_for_label=0          # always draw a label
 
 [venus]
 "Venus"
 color={161, 129, 70}
-min_radius_for_label=0
 
+min_radius_for_label=0
 
 [earth]
 "Earth"
-map=earth1.jpg
 color={28, 82, 110}
-cloud_map=clouds_4096.jpg
-#marker_file=brightStars
+cloud_map=clouds.jpg
+#draw_orbit=true
+#bump_map=bump.jpg
+# I have day and night maps of Australia centered on Alice Springs,
+# which are cropped from higher resolution maps.
+#map=alice_springs.png
+#night_map=alice_springs_night.png
+#mapbounds={-1.2,98.7107,-46.2,169.023}  # lat1, lon1, lat2, lon2
+
 #marker_file=earth
-#marker_file=quake
-#arc_file=boundaries_i
-night_map=Night_huge.jpg
-specular_map=specular.jpg
-magnify=40
+
 min_radius_for_label=0
+
 #satellite_file=iss
-#satellite_file=hubble
-satellite_file=satellites/tm
 
 [moon]
 "Moon"
-map=moon.jpg
 color={100, 100, 100}
 #draw_orbit=true
-magnify=10
 
+#orbit={-.51,.5,2}
 
 [mars]
 "Mars"
 color={172, 123, 67}
-map=mars.jpg
+#draw_orbit=true
+
 min_radius_for_label=0
-magnify=40
 
 [phobos]
 "Phobos"
-map=phobos.jpg
-magnify=10
-
 
 [deimos]
 "Deimos"
-map=deimos.jpg
-magnify=10
-
 
 [jupiter]
 "Jupiter"
 color={204, 163, 133}
 min_radius_for_label=0
-map=jupiter_vgr2.jpg
 
 [io]
 "Io"
 color={212, 182, 52}
-map=io.jpg
-magnify=10
 
 [europa]
 "Europa"
 color={140, 140, 140}
-map=europa.jpg
-magnify=10
 
 [ganymede]
 "Ganymede"
 color={150, 150, 150}
-map=ganymede.jpg
-magnify=10
 
 [callisto]
 "Callisto"
 color={70, 70, 70}
-map=callisto.jpg
-magnify=10
 
 [saturn]
 "Saturn"
 color={244, 199, 134}
 min_radius_for_label=0
-map=saturn.jpg
 
 [mimas]
 "Mimas"
-map=mimas_bump.jpg
 
 [enceladus]
 "Enceladus"
@@ -196,7 +213,6 @@ min_radius_for_label=0
 [neptune]
 "Neptune"
 color={95, 133, 232}
-map=neptune.jpg
 
 min_radius_for_label=0