diff --git a/AUTHORS.txt b/AUTHORS.txt
index 577f7839b..26124f666 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -9,6 +9,7 @@ Developement contributors, in last name alphabetical order:
 	Michael Ezra
 	Jean-Christophe Frisch
 	Steve Herrell
+	Wolfgang Kuehnel
 	Guokai Ma
 	Emil Martinec
 	Wyatt Olson
diff --git a/ProcessorTargets.cmake b/ProcessorTargets.cmake
index fab751b6e..2f932f71f 100644
--- a/ProcessorTargets.cmake
+++ b/ProcessorTargets.cmake
@@ -29,5 +29,8 @@ set(PROC_TARGET_7_FLAGS "-march=athlon-4" CACHE STRING "Processor-7 flags")
 set(PROC_TARGET_8_LABEL athlon64 CACHE STRING "Processor-8 label - use it to provide a athlon64 optimized build, if you have this processor")
 set(PROC_TARGET_8_FLAGS "-march=pentium2 -mtune=athlon64" CACHE STRING "Processor-8 flags")
 
+set(PROC_TARGET_9_LABEL phenomX4 CACHE STRING "Processor-9 label - use it to provide a phenomX4 optimized build, if you have this processor")
+set(PROC_TARGET_9_FLAGS "-march=amdfam10" CACHE STRING "Processor-9 flags")
+
 #set(PROC_TARGET__LABEL procLabel CACHE STRING "Processor- label")
 #set(PROC_TARGET__FLAGS "procFlags" CACHE STRING "Processor- flags")
diff --git a/Win32CMakeOptions-Sample.txt b/Win32CMakeOptions-Sample.txt
index 02e04f103..eeef6b46e 100644
--- a/Win32CMakeOptions-Sample.txt
+++ b/Win32CMakeOptions-Sample.txt
@@ -42,7 +42,7 @@ set(CMAKE_C_FLAGS_RELEASE "-mwindows -DNDEBUG -O2" CACHE STRING "Compiler option
 set(CMAKE_C_FLAGS_MINSIZEREL "-mwindows -DNDEBUG -Os" CACHE STRING "Compiler options for C source files and MinSizeRel target")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Compiler options for C source files and RelWithDebInfo target")
 
-set(CMAKE_EXE_LINKER_FLAGS "-mwin32 -mthreads -mthread -static-libgcc -static-libstdc++" CACHE STRING "Linker options")
+set(CMAKE_EXE_LINKER_FLAGS "-mwin32 -mthreads -mthread -static-libgcc -static-libstdc++ --large-address-aware" CACHE STRING "Linker options")
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-O0" CACHE STRING "Linkage options for the Debug target")
 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-mwindows -s -O2" CACHE STRING "Linkage options for the Release target")
 set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-mwindows -s -Os" CACHE STRING "Linkage options for the MinSizeRel target")
diff --git a/rtdata/options/options.lin b/rtdata/options/options.lin
index 40e48920e..31b97add0 100644
--- a/rtdata/options/options.lin
+++ b/rtdata/options/options.lin
@@ -103,7 +103,6 @@ ColorCorrection=1
 [Crop Settings]
 Ratio=3:2
 FixRatio=true
-DPI=600
 PPI=300
 
 [Color Management]
diff --git a/rtdata/options/options.osx b/rtdata/options/options.osx
index 7ce93aee4..d677b7363 100644
--- a/rtdata/options/options.osx
+++ b/rtdata/options/options.osx
@@ -103,7 +103,6 @@ ColorCorrection=1
 [Crop Settings]
 Ratio=3:2
 FixRatio=true
-DPI=600
 PPI=300
 
 [Color Management]
diff --git a/rtdata/options/options.win b/rtdata/options/options.win
index 533946083..1ce47d113 100644
--- a/rtdata/options/options.win
+++ b/rtdata/options/options.win
@@ -104,7 +104,6 @@ ColorCorrection=1
 [Crop Settings]
 Ratio=3:2
 FixRatio=true
-DPI=600
 PPI=300
 
 [Color Management]
diff --git a/rtdata/profiles/crisp.pp3 b/rtdata/profiles/crisp.pp3
index d95bcd2e7..28c949dec 100644
--- a/rtdata/profiles/crisp.pp3
+++ b/rtdata/profiles/crisp.pp3
@@ -1,6 +1,5 @@
-
 [Version]
-Version=20101111
+Version=300
 
 [Exposure]
 Auto=true
diff --git a/rtdata/profiles/default.pp3 b/rtdata/profiles/default.pp3
index 3f2c0a5c2..85dcb0c28 100644
--- a/rtdata/profiles/default.pp3
+++ b/rtdata/profiles/default.pp3
@@ -1,6 +1,5 @@
-
 [Version]
-Version=20101111
+Version=300
 
 [Exposure]
 Auto=true
diff --git a/rtdata/profiles/neutral.pp3 b/rtdata/profiles/neutral.pp3
index 31d0b85a7..d2f97c2f5 100644
--- a/rtdata/profiles/neutral.pp3
+++ b/rtdata/profiles/neutral.pp3
@@ -1,5 +1,5 @@
 [Version]
-Version=20101111
+Version=300
 
 [Exposure]
 Auto=false
diff --git a/rtdata/themes/Dark b/rtdata/themes/Dark
index 06ddc5e25..a47b35b21 100644
--- a/rtdata/themes/Dark
+++ b/rtdata/themes/Dark
@@ -29,6 +29,7 @@ style "clearlooks-default" {
   GtkComboBox    ::default_border    = { 0, 0, 0, 0 }
   GtkRange       ::trough_border     = 0
   GtkPaned       ::handle_size       = 6
+  GtkScale       ::slider-width      = 10
   GtkRange       ::slider_width      = 12
   GtkRange       ::stepper_size      = 12
   GtkScrollbar   ::min_slider_length = 30
@@ -44,19 +45,19 @@ style "clearlooks-default" {
   fg[PRELIGHT]      = "#d0d0d0"
   fg[ACTIVE]        = "#808080"
   fg[SELECTED]      = "#404040"
-  fg[INSENSITIVE]   = "#2d2d2d"
+  fg[INSENSITIVE]   = "#2b2b2b"
 
-  bg[NORMAL]        = "#2d2d2d"
+  bg[NORMAL]        = "#2b2b2b"
   bg[PRELIGHT]      = "#404040"
-  bg[ACTIVE]        = "#2d2d2d"
+  bg[ACTIVE]        = "#2b2b2b"
   bg[SELECTED]      = "#606060"
-  bg[INSENSITIVE]   = "#2d2d2d"
+  bg[INSENSITIVE]   = "#2b2b2b"
    
   base[NORMAL]      = "#404040"
   base[PRELIGHT]    = "#404040"
   base[ACTIVE]      = "#404040"
   base[SELECTED]    = "#606060"
-  base[INSENSITIVE] = "#2d2d2d"
+  base[INSENSITIVE] = "#2b2b2b"
    
   text[NORMAL]      = "#a0a0a0"
   text[PRELIGHT]    = "#d0d0d0"
@@ -69,7 +70,7 @@ style "clearlooks-default" {
     menuitemstyle     = 0       # 0 = flat, 1 = 3d-ish (button)
     listviewitemstyle = 0       # 0 = flat, 1 = 3d-ish (gradient)
     progressbarstyle  = 1       # 0 = candy bar, 1 = flat
-    radius = 10.0
+    radius = 5.0
   }
 }
 
@@ -79,26 +80,23 @@ style "clearlooks-wide" = "clearlooks-default"
   ythickness = 1
 }
 
-style "clearlooks-toggle" = "clearlooks-default"
+style "clearlooks-button" = "clearlooks-default"
+{
+  bg[NORMAL] = "#353535"
+}
+
+style "clearlooks-toggle" = "clearlooks-button"
 {
   xthickness = 1
   ythickness = 1
 
-  bg[ACTIVE]        = "#606060"
-  text[ACTIVE]      = "#000000"
-  bg[SELECTED]        = "#606060"
-  text[SELECTED]      = "#000000"
+  bg[ACTIVE] = "#505050"
 }
 
-style "clearlooks-combo" = "clearlooks-default"
+style "clearlooks-frame" = "clearlooks-default"
 {
-  xthickness = 0
-  ythickness = 0
-}
-
-style "clearlooks-notebook" = "clearlooks-wide"
-{
-  bg[NORMAL] = "#2d2d2d"
+  xthickness = 4
+  ythickness = 4
 }
 
 style "clearlooks-tasklist" = "clearlooks-default"
@@ -111,15 +109,12 @@ style "clearlooks-menu" = "clearlooks-default"
 {
   xthickness = 2
   ythickness = 1
-  bg[NORMAL] = "#2d2d2d"
 }
 
 style "clearlooks-menu-item" = "clearlooks-default"
 {
   xthickness = 1
   ythickness = 1
-  fg[PRELIGHT] = "#404040"
-  text[PRELIGHT] = "#000000"
 }
 
 style "clearlooks-menu-itembar" = "clearlooks-default"
@@ -134,9 +129,53 @@ style "clearlooks-tree" = "clearlooks-default"
   ythickness = 1
 }
 
-style "clearlooks-frame-title" = "clearlooks-default"
+style "clearlooks-title" = "clearlooks-default"
 {
-  fg[NORMAL] = "#404040"
+  fg[NORMAL] = "#d0d0d0"
+}
+
+style "clearlooks-expander" = "clearlooks-default"
+{
+  fg[NORMAL]        = "#800000"
+  fg[PRELIGHT]      = "#800000"
+  fg[ACTIVE]        = "#800000"
+  fg[SELECTED]      = "#800000"
+  fg[INSENSITIVE]   = "#800000"
+
+  bg[NORMAL]        = "#700000"
+  bg[PRELIGHT]      = "#5a0000"
+  bg[ACTIVE]        = "#700000"
+  bg[SELECTED]      = "#700000"
+  bg[INSENSITIVE]   = "#700000"
+
+  base[NORMAL]      = "#800000"
+  base[PRELIGHT]    = "#800000"
+  base[ACTIVE]      = "#800000"
+  base[SELECTED]    = "#800000"
+  base[INSENSITIVE] = "#800000"
+}
+
+style "clearlooks-expander-title" = "clearlooks-default"
+{
+  fg[NORMAL]   = "#a0a0a0"
+  fg[PRELIGHT] = "#d0d0d0"
+}
+
+style "clearlooks-expander-frame" = "clearlooks-default"
+{
+  bg[NORMAL] = "#272727"
+}
+
+style "clearlooks-notebook" = "clearlooks-default"
+{
+  bg[ACTIVE] = "#202020"
+}
+
+style "clearlooks-scale" = "clearlooks-default"
+{
+  bg[NORMAL]   = "#404040"
+  bg[PRELIGHT] = "#707070"
+  bg[ACTIVE]   = "#272727"
 }
 
 style "clearlooks-panel" = "clearlooks-default"
@@ -175,8 +214,6 @@ style "clearlooks-tooltips" = "clearlooks-default"
   text[ACTIVE]      = "#000000"
   text[SELECTED]    = "#000000"
   text[INSENSITIVE] = "#000000"
-
-
 }
 
 style "clearlooks-progressbar" = "clearlooks-default"
@@ -188,24 +225,27 @@ style "clearlooks-progressbar" = "clearlooks-default"
 
 class "GtkWidget" style "clearlooks-default"
 class "GtkTreeView" style "clearlooks-default"
-class "GtkButton" style "clearlooks-wide"
+class "GtkButton" style "clearlooks-button"
 class "GtkToggleButton" style "clearlooks-toggle"
-class "GtkRange" style "clearlooks-wide"
-class "GtkFrame" style "clearlooks-wide"
+class "GtkScale" style "clearlooks-scale"
 class "GtkStatusbar" style "clearlooks-wide"
 class "GtkMenu" style "clearlooks-menu"
+class "GtkExpander" style "clearlooks-expander"
+class "GtkFrame" style "clearlooks-frame"
 class "GtkMenuItem" style "clearlooks-menu-item"
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
+class "GtkNotebook" style "clearlooks-notebook"
 class "GtkEntry" style "clearlooks-wide"
+class "GtkProgressBar" style "clearlooks-progressbar"
+widget_class "*MenuItem.*" style "clearlooks-menu-item"
 widget_class "*.tooltip.*.GtkToggleButton" style "clearlooks-tasklist"
 widget "gtk-tooltip" style "clearlooks-tooltips"
-widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
+widget_class "*GtkTreeView*GtkButton" style "clearlooks-tree"
+widget_class "*GtkCTree*GtkButton" style "clearlooks-tree"
+widget_class "*GtkList*GtkButton" style "clearlooks-tree"
+widget_class "*GtkCList*GtkButton" style "clearlooks-tree"
+widget_class "*GtkFrame.GtkLabel" style "clearlooks-title"
+widget_class "*GtkExpander.GtkLabel" style "clearlooks-expander-title"
+widget_class "*GtkExpander.GtkFrame.GtkBox" style "clearlooks-expander-frame"
+widget_class "*GtkNotebook.GtkLabel" style "clearlooks-title"
 widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "clearlooks-panel"
-class "GtkNotebook" style "clearlooks-notebook"
-class "GtkProgressBar" style "clearlooks-progressbar"
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo"
+widget "GtkFileChoserButton" style "clearlooks-button"