Merged changes in the trunk up to revision 52815.

179 files changed, 6505 insertions, 4657 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0954d5ce878..23e9eba0cf0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,7 +127,7 @@ option(WITH_PYTHON_MODULE "Enable building as a python module which runs without
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_IK_SOLVER     "Enable Legacy IK solver (only disable for development)" ON)
-option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
+option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" ON)
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
@@ -387,10 +387,6 @@ if(WITH_PYTHON_MODULE AND WITH_PYTHON_INSTALL)
 endif()
 
 
-if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
-	message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
-endif()
-
 # may as well build python module without a UI
 if(WITH_PYTHON_MODULE)
 	set(WITH_HEADLESS ON)
@@ -1670,6 +1666,10 @@ if(APPLE OR WIN32)
 	endif()
 endif()
 
+if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
+	message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
+endif()
+
 if(WITH_CYCLES)
 	if(NOT WITH_OPENIMAGEIO)
 		message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES")
@@ -1932,12 +1932,13 @@ if(WITH_PYTHON)
 
 	if(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
 		# set but invalid
+        # -- disabled until we make numpy bundled with blender - campbell
 		if(NOT ${PYTHON_NUMPY_PATH} STREQUAL "")
-			if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
-				message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' "
-				                "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
-				set(WITH_PYTHON_INSTALL_NUMPY OFF)
-			endif()
+#			if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
+#				message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' "
+#				                "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
+#				set(WITH_PYTHON_INSTALL_NUMPY OFF)
+#			endif()
 		# not set, so initialize
 		else()
 			string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
diff --git a/SConstruct b/SConstruct
index d6972de8cab..c2bae0459ca 100644
--- a/SConstruct
+++ b/SConstruct
@@ -700,6 +700,8 @@ if env['OURPLATFORM']!='darwin':
             source.remove('kernel.cpp')
             source.remove('CMakeLists.txt')
             source.remove('svm')
+            source.remove('closure')
+            source.remove('shaders')
             source.remove('osl')
             source=['intern/cycles/kernel/'+s for s in source]
             source.append('intern/cycles/util/util_color.h')
@@ -715,6 +717,14 @@ if env['OURPLATFORM']!='darwin':
             if '__pycache__' in source: source.remove('__pycache__')
             source=['intern/cycles/kernel/svm/'+s for s in source]
             scriptinstall.append(env.Install(dir=dir,source=source))
+            # closure
+            dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'closure')
+            source=os.listdir('intern/cycles/kernel/closure')
+            if '.svn' in source: source.remove('.svn')
+            if '_svn' in source: source.remove('_svn')
+            if '__pycache__' in source: source.remove('__pycache__')
+            source=['intern/cycles/kernel/closure/'+s for s in source]
+            scriptinstall.append(env.Install(dir=dir,source=source))
 
             # licenses
             dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'license')
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index f8cef63f301..072e999d827 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1,16 +1,27 @@
 #!/bin/bash
 
+# Parse command line!
+ARGS=$( \
+getopt \
+-o s:i:t:h \
+--long source:,install:,threads:,help,with-all,with-osl,all-static,force-all,force-python,\
+force-boost,force-ocio,force-oiio,force-llvm,force-osl,force-ffmpeg,\
+skip-python,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg \
+-- "$@" \
+)
+
 DISTRO=""
 SRC="$HOME/src/blender-deps"
 INST="/opt/lib"
 CWD=$PWD
 
-# OSL is horror for manual building even
-# i would want it to be setteled for manual build first,
-# and only then do it automatically
-BUILD_OSL=false
+# Do not install some optional, potentially conflicting libs by default...
+WITH_ALL=false
+
+# Do not yet enable osl, use --with-osl (or --with-all) option to try it.
+WITH_OSL=false
 
-# Try to link everything statically. Use this to produce protable versions of blender.
+# Try to link everything statically. Use this to produce portable versions of blender.
 ALL_STATIC=false
 
 THREADS=`cat /proc/cpuinfo | grep cores | uniq | sed -e "s/.*: *\(.*\)/\\1/"`
@@ -18,45 +29,140 @@ if [ -z "$THREADS" ]; then
   THREADS=1
 fi
 
-COMMON_INFO="Source code of dependencies needed to be compiled will be downloaded and extracted into '$SRC'.
-Built libs of dependencies needed to be compiled will be installed into '$INST'.
-Please edit \$SRC and/or \$INST variables at the begining of this script if you want to use other paths!
+COMMON_INFO="\"Source code of dependencies needed to be compiled will be downloaded and extracted into '\$SRC'.
+Built libs of dependencies needed to be compiled will be installed into '\$INST'.
+Please edit \\\$SRC and/or \\\$INST variables at the beginning of this script,
+or use --source/--install options, if you want to use other paths!
+
+Number of threads for building: \$THREADS (automatically detected, use --threads=<nbr> to override it).
+Full install: \$WITH_ALL (use --with-all option to enable it).
+Building OSL: \$WITH_OSL (use --with-osl option to enable it).
+All static linking: \$ALL_STATIC (use --all-static option to enable it).
+
+Use --help to show all available options!\""
+
+ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
+    -h, --help
+        Show this message and exit.
+
+    -s <path>, --source=<path>
+        Use a specific path where to store downloaded libraries sources (defaults to '\$SRC').
+
+    -i <path>, --install=<path>
+        Use a specific path where to install built libraries (defaults to '\$INST').
+
+    -t n, --threads=n
+        Use a specific number of threads when building the libraries (auto-detected as '\$THREADS').
+
+    --with-all
+        By default, a number of optional and not-so-often needed libraries are not installed.
+        This option will try to install them, at the cost of potential conflicts (depending on
+        how your package system is set…).
+        Note this option also implies all other (more specific) --with-foo options below.
+
+    --with-osl
+        Try to install or build the OpenShadingLanguage libraries (and their dependencies).
+        Still experimental!
+
+    --all-static
+        Build libraries as statically as possible, to create static builds of Blender.
+
+    --force-all
+        Force the rebuild of all built libraries.
+
+    --force-python
+        Force the rebuild of Python.
+
+    --force-boost
+        Force the rebuild of Boost.
+
+    --force-ocio
+        Force the rebuild of OpenColorIO.
+
+    --force-oiio
+        Force the rebuild of OpenImageIO.
 
-Number of threads for building: $THREADS.
-Building OSL: $BUILD_OSL (edit \$BUILD_OSL var to change this).
-All static linking: $ALL_STATIC (edit \$ALL_STATIC var to change this)."
+    --force-llvm
+        Force the rebuild of LLVM.
 
+    --force-osl
+        Force the rebuild of OpenShadingLanguage.
+
+    --force-ffmpeg
+        Force the rebuild of FFMpeg.
+
+    Note about the --force-foo options:
+        * They obviously only have an effect if those libraries are built by this script
+          (i.e. if there is no available and satisfactory package)!
+        * If the “force-rebuilt” library is a dependency of others, it will force the rebuild
+          of those libraries too (e.g. --force-boost will also rebuild oiio and osl...).
+        * Do not forget --with-osl if you built it and still want it!
+
+    --skip-python
+        Unconditionally skip Python installation/building.
+
+    --skip-boost
+        Unconditionally skip Boost installation/building.
+
+    --skip-ocio
+        Unconditionally skip OpenColorIO installation/building.
+
+    --skip-oiio
+        Unconditionally skip OpenImageIO installation/building.
+
+    --skip-llvm
+        Unconditionally skip LLVM installation/building.
+
+    --skip-osl
+        Unconditionally skip OpenShadingLanguage installation/building.
+
+    --skip-ffmpeg
+        Unconditionally skip FFMpeg installation/building.\""
 
 PYTHON_VERSION="3.3.0"
 PYTHON_VERSION_MIN="3.3"
 PYTHON_SOURCE="http://python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.bz2"
+PYTHON_FORCE_REBUILD=false
+PYTHON_SKIP=false
 
 BOOST_VERSION="1.51.0"
 _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
 BOOST_SOURCE="http://sourceforge.net/projects/boost/files/boost/$BOOST_VERSION/boost_$_boost_version_nodots.tar.bz2/download"
 BOOST_VERSION_MIN="1.49"
+BOOST_FORCE_REBUILD=false
+BOOST_SKIP=false
 
 OCIO_VERSION="1.0.7"
 OCIO_SOURCE="https://github.com/imageworks/OpenColorIO/tarball/v$OCIO_VERSION"
 OCIO_VERSION_MIN="1.0"
+OCIO_FORCE_REBUILD=false
+OCIO_SKIP=false
 
 OIIO_VERSION="1.1.1"
 OIIO_SOURCE="https://github.com/OpenImageIO/oiio/tarball/Release-$OIIO_VERSION"
 OIIO_VERSION_MIN="1.1"
+OIIO_FORCE_REBUILD=false
+OIIO_SKIP=false
 
 LLVM_VERSION="3.1"
 LLVM_VERSION_MIN="3.0"
 LLVM_VERSION_FOUND=""
 LLVM_SOURCE="http://llvm.org/releases/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.gz"
 LLVM_CLANG_SOURCE="http://llvm.org/releases/$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.gz"
+LLVM_FORCE_REBUILD=false
+LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
 OSL_VERSION="1.2.0"
 OSL_SOURCE="https://github.com/mont29/OpenShadingLanguage/archive/blender-fixes.tar.gz"
+OSL_FORCE_REBUILD=false
+OSL_SKIP=false
 
 FFMPEG_VERSION="1.0"
 FFMPEG_SOURCE="http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2"
 FFMPEG_VERSION_MIN="0.7.6"
+FFMPEG_FORCE_REBUILD=false
+FFMPEG_SKIP=false
 _ffmpeg_list_sep=";"
 
 # FFMPEG optional libs.
@@ -84,14 +190,126 @@ LANG_BACK=$LANG
 LANG=""
 export LANG
 
+
+_echo() {
+  if [ "X$1" = "X-n" ]; then
+     shift; printf "%s" "$@"
+  else
+     printf "%s\n" "$@"
+  fi
+}
+
 ERROR() {
-  echo "${@}"
+  _echo "$@"
 }
 
 INFO() {
-  echo "${@}"
+  _echo "$@"
 }
 
+# Finish parsing the commandline args.
+eval set -- "$ARGS"
+while true; do
+  case $1 in
+    -s|--source)
+      SRC="$2"; shift; shift; continue
+    ;;
+    -i|--install)
+      INST="$2"; shift; shift; continue
+    ;;
+    -t|--threads)
+      THREADS="$2"; shift; shift; continue
+    ;;
+    -h|--help)
+      INFO ""
+      INFO "USAGE:"
+      INFO ""
+      INFO "`eval _echo "$COMMON_INFO"`"
+      INFO ""
+      INFO "`eval _echo "$ARGUMENTS_INFO"`"
+      INFO ""
+      exit 0
+    ;;
+    --with-all)
+      WITH_ALL=true; shift; continue
+    ;;
+    --with-osl)
+      WITH_OSL=true; shift; continue
+    ;;
+    --all-static)
+      ALL_STATIC=true; shift; continue
+    ;;
+    --force-all)
+      PYTHON_FORCE_REBUILD=true
+      BOOST_FORCE_REBUILD=true
+      OCIO_FORCE_REBUILD=true
+      OIIO_FORCE_REBUILD=true
+      LLVM_FORCE_REBUILD=true
+      OSL_FORCE_REBUILD=true
+      FFMPEG_FORCE_REBUILD=true
+      shift; continue
+    ;;
+    --force-python)
+      PYTHON_FORCE_REBUILD=true; shift; continue
+    ;;
+    --force-boost)
+      BOOST_FORCE_REBUILD=true; shift; continue
+    ;;
+    --force-ocio)
+      OCIO_FORCE_REBUILD=true; shift; continue
+    ;;
+    --force-oiio)
+      OIIO_FORCE_REBUILD=true; shift; continue
+    ;;
+    --force-llvm)
+      LLVM_FORCE_REBUILD=true; shift; continue
+    ;;
+    --force-osl)
+      OSL_FORCE_REBUILD=true; shift; continue
+    ;;
+    --force-ffmpeg)
+      FFMPEG_FORCE_REBUILD=true; shift; continue
+    ;;
+    --skip-python)
+      PYTHON_SKIP=true; shift; continue
+    ;;
+    --skip-boost)
+      BOOST_SKIP=true; shift; continue
+    ;;
+    --skip-ocio)
+      OCIO_SKIP=true; shift; continue
+    ;;
+    --skip-oiio)
+      OIIO_SKIP=true; shift; continue
+    ;;
+    --skip-llvm)
+      LLVM_SKIP=true; shift; continue
+    ;;
+    --skip-osl)
+      OSL_SKIP=true; shift; continue
+    ;;
+    --skip-ffmpeg)
+      FFMPEG_SKIP=true; shift; continue
+    ;;
+    --)
+      # no more arguments to parse
+      break
+    ;;
+    *)
+      INFO ""
+      INFO "Wrong parameter! Usage:"
+      INFO ""
+      INFO "`eval _echo "$COMMON_INFO"`"
+      INFO ""
+      exit 1
+    ;;
+  esac
+done
+
+if $WITH_ALL; then
+  WITH_OSL=true
+fi
+
 # Return 0 if $1 = $2 (i.e. 1.01.0 = 1.1, but 1.1.1 != 1.1), else 1.
 # $1 and $2 should be version numbers made of numbers only.
 version_eq() {
@@ -139,7 +357,7 @@ version_eq() {
 # $1 and $2 should be version numbers made of numbers only.
 version_ge() {
   version_eq $1 $2
-  if [ $? -eq 1 -a $(echo -e "$1\n$2" | sort --version-sort | head --lines=1) = "$1" ]; then
+  if [ $? -eq 1 -a $(_echo "$1" "$2" | sort --version-sort | head --lines=1) = "$1" ]; then
     return 1
   else
     return 0
@@ -221,7 +439,7 @@ compile_Python() {
 
   # Clean install if needed!
   magic_compile_check python-$PYTHON_VERSION $py_magic
-  if [ $? -eq 1 ]; then
+  if [ $? -eq 1 -o $PYTHON_FORCE_REBUILD == true ]; then
     rm -rf $_inst
   fi
 
@@ -258,9 +476,10 @@ compile_Python() {
     magic_compile_set python-$PYTHON_VERSION $py_magic
 
     cd $CWD
+    INFO "Done compiling Python-$PYTHON_VERSION!"
   else
     INFO "Own Python-$PYTHON_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, delete the '$_src' and '$_inst' directories."
+    INFO "If you want to force rebuild of this lib, use the --force-python option."
   fi
 }
 
@@ -273,7 +492,7 @@ compile_Boost() {
 
   # Clean install if needed!
   magic_compile_check boost-$BOOST_VERSION $boost_magic
-  if [ $? -eq 1 ]; then
+  if [ $? -eq 1 -o $BOOST_FORCE_REBUILD == true ]; then
     rm -rf $_inst
   fi
 
@@ -307,10 +526,15 @@ compile_Boost() {
 
     magic_compile_set boost-$BOOST_VERSION $boost_magic
 
+    # Rebuild dependecies as well!
+    OIIO_FORCE_REBUILD=true
+    OSL_FORCE_REBUILD=true
+
     cd $CWD
+    INFO "Done compiling Boost-$BOOST_VERSION!"
   else
     INFO "Own Boost-$BOOST_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, delete the '$_src' and '$_inst' directories."
+    INFO "If you want to force rebuild of this lib, use the --force-boost option."
   fi
 }
 
@@ -323,7 +547,7 @@ compile_OCIO() {
 
   # Clean install if needed!
   magic_compile_check ocio-$OCIO_VERSION $ocio_magic
-  if [ $? -eq 1 ]; then
+  if [ $? -eq 1 -o $OCIO_FORCE_REBUILD == true ]; then
     rm -rf $_inst
   fi
 
@@ -387,9 +611,10 @@ compile_OCIO() {
     magic_compile_set ocio-$OCIO_VERSION $ocio_magic
 
     cd $CWD
+    INFO "Done compiling OpenColorIO-$OCIO_VERSION!"
   else
     INFO "Own OpenColorIO-$OCIO_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, delete the '$_src' and '$_inst' directories."
+    INFO "If you want to force rebuild of this lib, use the --force-ocio option."
   fi
 }
 
@@ -402,7 +627,7 @@ compile_OIIO() {
 
   # Clean install if needed!
   magic_compile_check oiio-$OIIO_VERSION $oiio_magic
-  if [ $? -eq 1 ]; then
+  if [ $? -eq 1 -o $OIIO_FORCE_REBUILD == true ]; then
     rm -rf $_inst
   fi
 
@@ -495,10 +720,14 @@ EOF
 
     magic_compile_set oiio-$OIIO_VERSION $oiio_magic
 
+    # Rebuild dependecies as well!
+    OSL_FORCE_REBUILD=true
+
     cd $CWD
+    INFO "Done compiling OpenImageIO-$OIIO_VERSION!"
   else
     INFO "Own OpenImageIO-$OIIO_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, delete the '$_src' and '$_inst' directories."
+    INFO "If you want to force rebuild of this lib, use the --force-oiio option."
   fi
 }
 
@@ -512,7 +741,7 @@ compile_LLVM() {
 
   # Clean install if needed!
   magic_compile_check llvm-$LLVM_VERSION $llvm_magic
-  if [ $? -eq 1 ]; then
+  if [ $? -eq 1 -o $LLVM_FORCE_REBUILD == true ]; then
     rm -rf $_inst
     rm -rf $_inst_clang
   fi
@@ -588,10 +817,14 @@ EOF
 
     magic_compile_set llvm-$LLVM_VERSION $llvm_magic
 
+    # Rebuild dependecies as well!
+    OSL_FORCE_REBUILD=true
+
     cd $CWD
+    INFO "Done compiling LLVM-$LLVM_VERSION (CLANG included)!"
   else
     INFO "Own LLVM-$LLVM_VERSION (CLANG included) is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, delete the '$_src' and '$_inst' directories."
+    INFO "If you want to force rebuild of this lib, use the --force-llvm option."
   fi
 }
 
@@ -604,7 +837,7 @@ compile_OSL() {
 
   # Clean install if needed!
   magic_compile_check osl-$OSL_VERSION $osl_magic
-  if [ $? -eq 1 ]; then
+  if [ $? -eq 1 -o $OSL_FORCE_REBUILD == true ]; then
     rm -rf $_inst
   fi
 
@@ -679,9 +912,10 @@ compile_OSL() {
     magic_compile_set osl-$OSL_VERSION $osl_magic
 
     cd $CWD
+    INFO "Done compiling OpenShadingLanguage-$OSL_VERSION!"
   else
     INFO "Own OpenShadingLanguage-$OSL_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, delete the '$_src' and '$_inst' directories."
+    INFO "If you want to force rebuild of this lib, use the --force-osl option."
   fi
 }
 
@@ -694,7 +928,7 @@ compile_FFmpeg() {
 
   # Clean install if needed!
   magic_compile_check ffmpeg-$FFMPEG_VERSION $ffmpeg_magic
-  if [ $? -eq 1 ]; then
+  if [ $? -eq 1 -o $FFMPEG_FORCE_REBUILD == true ]; then
     rm -rf $_inst
   fi
 
@@ -777,9 +1011,10 @@ compile_FFmpeg() {
     magic_compile_set ffmpeg-$FFMPEG_VERSION $ffmpeg_magic
 
     cd $CWD
+    INFO "Done compiling ffmpeg-$FFMPEG_VERSION!"
   else
     INFO "Own ffmpeg-$FFMPEG_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, delete the '$_src' and '$_inst' directories."
+    INFO "If you want to force rebuild of this lib, use the --force-ffmpeg option."
   fi
 }
 
@@ -819,10 +1054,19 @@ check_package_version_ge_DEB() {
   return $?
 }
 
+install_packages_DEB() {
+  sudo apt-get install -y $@
+  if [ $? -ge 1 ]; then
+    ERROR "apt-get failed to install requested packages, exiting."
+    exit 1
+  fi
+}
+
 install_DEB() {
   INFO ""
   INFO "Installing dependencies for DEB-based distribution"
-  INFO "$COMMON_INFO"
+  INFO ""
+  INFO "`eval _echo "$COMMON_INFO"`"
   INFO ""
 
   if [ ! -z "`cat /etc/debian_version | grep ^6`"  ]; then
@@ -845,6 +1089,7 @@ install_DEB() {
       INFO "Hit Enter to continue running the script, or hit Ctrl-C to abort the script"
 
       read
+      INFO ""
     fi
   fi
 
@@ -858,137 +1103,194 @@ install_DEB() {
   VORBIS_DEV="libvorbis-dev"
   THEORA_DEV="libtheora-dev"
 
-  sudo apt-get install -y gawk cmake scons gcc g++ libjpeg-dev libpng-dev libtiff-dev \
-    libfreetype6-dev libx11-dev libxi-dev wget libsqlite3-dev libbz2-dev libncurses5-dev \
-    libssl-dev liblzma-dev libreadline-dev $OPENJPEG_DEV libopenexr-dev libopenal-dev \
-    libglew-dev yasm $SCHRO_DEV $THEORA_DEV $VORBIS_DEV libsdl1.2-dev \
-    libfftw3-dev libjack-dev python-dev patch bzip2
-
+  _packages="gawk cmake scons build-essential libjpeg-dev libpng-dev libtiff-dev \
+             libfreetype6-dev libx11-dev libxi-dev wget libsqlite3-dev libbz2-dev \
+             libncurses5-dev libssl-dev liblzma-dev libreadline-dev $OPENJPEG_DEV \
+             libopenexr-dev libopenal-dev libglew-dev yasm $THEORA_DEV \
+             $VORBIS_DEV libsdl1.2-dev libfftw3-dev python-dev patch bzip2"
   OPENJPEG_USE=true
-  SCHRO_USE=true
   VORBIS_USE=true
   THEORA_USE=true
 
-  # Grmpf, debian is libxvidcore-dev and ubuntu libxvidcore4-dev!
-  XVID_DEV="libxvidcore-dev"
-  check_package_DEB $XVID_DEV
-  if [ $? -eq 0 ]; then
-    sudo apt-get install -y $XVID_DEV
-    XVID_USE=true
-  else
-    XVID_DEV="libxvidcore4-dev"
-    check_package_DEB $XVID_DEV
-    if [ $? -eq 0 ]; then
-      sudo apt-get install -y $XVID_DEV
-      XVID_USE=true
-    fi
+  if $WITH_ALL; then
+    _packages="$_packages $SCHRO_DEV libjack0 libjack-dev"
+    SCHRO_USE=true
   fi
 
-  MP3LAME_DEV="libmp3lame-dev"
-  check_package_DEB $MP3LAME_DEV
-  if [ $? -eq 0 ]; then
-    sudo apt-get install -y $MP3LAME_DEV
-    MP3LAME_USE=true
-  fi
+  INFO ""
+  install_packages_DEB $_packages
 
+  INFO ""
   X264_DEV="libx264-dev"
   check_package_version_ge_DEB $X264_DEV $X264_VERSION_MIN
   if [ $? -eq 0 ]; then
-    sudo apt-get install -y $X264_DEV
+    install_packages_DEB $X264_DEV
     X264_USE=true
   fi
 
-  VPX_DEV="libvpx-dev"
-  check_package_version_ge_DEB $VPX_DEV $VPX_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo apt-get install -y $VPX_DEV
-    VPX_USE=true
-  fi
+  if $WITH_ALL; then
+    INFO ""
+    # Grmpf, debian is libxvidcore-dev and ubuntu libxvidcore4-dev!
+    XVID_DEV="libxvidcore-dev"
+    check_package_DEB $XVID_DEV
+    if [ $? -eq 0 ]; then
+      install_packages_DEB $XVID_DEV
+      XVID_USE=true
+    else
+      XVID_DEV="libxvidcore4-dev"
+      check_package_DEB $XVID_DEV
+      if [ $? -eq 0 ]; then
+        install_packages_DEB $XVID_DEV
+        XVID_USE=true
+      fi
+    fi
 
-  check_package_DEB libspnav-dev
-  if [ $? -eq 0 ]; then
-    sudo apt-get install -y libspnav-dev
+    INFO ""
+    MP3LAME_DEV="libmp3lame-dev"
+    check_package_DEB $MP3LAME_DEV
+    if [ $? -eq 0 ]; then
+      install_packages_DEB $MP3LAME_DEV
+      MP3LAME_USE=true
+    fi
+
+    INFO ""
+    VPX_DEV="libvpx-dev"
+    check_package_version_ge_DEB $VPX_DEV $VPX_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_DEB $VPX_DEV
+      VPX_USE=true
+    fi
+
+    INFO ""
+    check_package_DEB libspnav-dev
+    if [ $? -eq 0 ]; then
+      install_packages_DEB libspnav-dev
+    fi
   fi
 
-  check_package_DEB python3.3-dev
-  if [ $? -eq 0 ]; then
-    sudo apt-get install -y python3.3-dev
+  INFO ""
+  if $PYTHON_SKIP; then
+    INFO "WARNING! Skipping Python installation, as requested..."
   else
-    compile_Python
+    check_package_DEB python3.3-dev
+    if [ $? -eq 0 ]; then
+      install_packages_DEB python3.3-dev
+    else
+      compile_Python
+    fi
   fi
 
-  check_package_version_ge_DEB libboost-dev $BOOST_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo apt-get install -y libboost-dev
+  INFO ""
+  if $BOOST_SKIP; then
+    INFO "WARNING! Skipping Boost installation, as requested..."
+  else
+    check_package_version_ge_DEB libboost-dev $BOOST_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_DEB libboost-dev
 
-    boost_version=$(echo `get_package_version_DEB libboost-dev` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')
+      boost_version=$(echo `get_package_version_DEB libboost-dev` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')
 
-    check_package_DEB libboost-locale$boost_version-dev
-    if [ $? -eq 0 ]; then
-      sudo apt-get install -y libboost-locale$boost_version-dev libboost-filesystem$boost_version-dev \
-                              libboost-regex$boost_version-dev libboost-system$boost_version-dev \
-                              libboost-thread$boost_version-dev
+      check_package_DEB libboost-locale$boost_version-dev
+      if [ $? -eq 0 ]; then
+        install_packages_DEB libboost-locale$boost_version-dev libboost-filesystem$boost_version-dev \
+                             libboost-regex$boost_version-dev libboost-system$boost_version-dev \
+                             libboost-thread$boost_version-dev
+      else
+        compile_Boost
+      fi
     else
       compile_Boost
     fi
-  else
-    compile_Boost
   fi
 
-  check_package_version_ge_DEB libopencolorio-dev $OCIO_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo apt-get install -y libopencolorio-dev
+  INFO ""
+  if $OCIO_SKIP; then
+    INFO "WARNING! Skipping OpenColorIO installation, as requested..."
   else
-    compile_OCIO
+    check_package_version_ge_DEB libopencolorio-dev $OCIO_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_DEB libopencolorio-dev
+    else
+      compile_OCIO
+    fi
   fi
 
-  check_package_version_ge_DEB libopenimageio-dev $OIIO_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo apt-get install -y libopenimageio-dev
+  INFO ""
+  if $OIIO_SKIP; then
+    INFO "WARNING! Skipping OpenImageIO installation, as requested..."
   else
-    compile_OIIO
+    check_package_version_ge_DEB libopenimageio-dev $OIIO_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_DEB libopenimageio-dev
+    else
+      compile_OIIO
+    fi
   fi
 
-  if $BUILD_OSL; then
+  if $WITH_OSL; then
     have_llvm=false
 
-    check_package_DEB llvm-$LLVM_VERSION-dev
-    if [ $? -eq 0 ]; then
-      sudo apt-get install -y llvm-$LLVM_VERSION-dev
-      have_llvm=true
-      LLVM_VERSION_FOUND=$LLVM_VERSION
+    if $LLVM_SKIP; then
+      INFO "WARNING! Skipping LLVM installation, as requested (this also implies skipping OSL!)..."
     else
-      check_package_DEB llvm-$LLVM_VERSION_MIN-dev
+      INFO ""
+      check_package_DEB llvm-$LLVM_VERSION-dev
       if [ $? -eq 0 ]; then
-        sudo apt-get install -y llvm-$LLVM_VERSION_MIN-dev
+        install_packages_DEB llvm-$LLVM_VERSION-dev
         have_llvm=true
-        LLVM_VERSION_FOUND=$LLVM_VERSION_MIN
+        LLVM_VERSION_FOUND=$LLVM_VERSION
+      else
+        check_package_DEB llvm-$LLVM_VERSION_MIN-dev
+        if [ $? -eq 0 ]; then
+          install_packages_DEB llvm-$LLVM_VERSION_MIN-dev
+          have_llvm=true
+          LLVM_VERSION_FOUND=$LLVM_VERSION_MIN
+        else
+          install_packages_DEB libffi-dev
+          INFO ""
+          compile_LLVM
+          have_llvm=true
+          LLVM_VERSION_FOUND=$LLVM_VERSION
+        fi
       fi
     fi
 
-    if $have_llvm; then
-      sudo apt-get install -y clang flex bison libtbb-dev git
-      # No package currently!
-      compile_OSL
+    if $OSL_SKIP; then
+      INFO ""
+      INFO "WARNING! Skipping OpenShadingLanguage installation, as requested..."
+    else
+      if $have_llvm; then
+        INFO ""
+        install_packages_DEB clang flex bison libtbb-dev git
+        # No package currently!
+        INFO ""
+        compile_OSL
+      fi
     fi
   fi
 
-#  XXX Debian features libav packages as ffmpeg, those are not really compatible with blender code currently :/
-#      So for now, always build our own ffmpeg.
-#  check_package_DEB ffmpeg
-#  if [ $? -eq 0 ]; then
-#    sudo apt-get install -y ffmpeg
-#    ffmpeg_version=`get_package_version_DEB ffmpeg`
-#    INFO "ffmpeg version: $ffmpeg_version"
-#    if [ ! -z "$ffmpeg_version" ]; then
-#      if  dpkg --compare-versions $ffmpeg_version gt 0.7.2; then
-#        sudo apt-get install -y libavfilter-dev libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev libswscale-dev
-#      else
-#        compile_FFmpeg
+
+  INFO ""
+  if $FFMPEG_SKIP; then
+    INFO "WARNING! Skipping FFMpeg installation, as requested..."
+  else
+#    XXX Debian features libav packages as ffmpeg, those are not really compatible with blender code currently :/
+#        So for now, always build our own ffmpeg.
+#    check_package_DEB ffmpeg
+#    if [ $? -eq 0 ]; then
+#      install_packages_DEB ffmpeg
+#      ffmpeg_version=`get_package_version_DEB ffmpeg`
+#      INFO "ffmpeg version: $ffmpeg_version"
+#      if [ ! -z "$ffmpeg_version" ]; then
+#        if  dpkg --compare-versions $ffmpeg_version gt 0.7.2; then
+#          install_packages_DEB libavfilter-dev libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev libswscale-dev
+#        else
+#          compile_FFmpeg
+#        fi
 #      fi
 #    fi
-#  fi
-  compile_FFmpeg
+    compile_FFmpeg
+  fi
 }
 
 get_package_version_RPM() {
@@ -1027,10 +1329,19 @@ check_package_version_ge_RPM() {
   return $?
 }
 
+install_packages_RPM() {
+  sudo yum install -y $@
+  if [ $? -ge 1 ]; then
+    ERROR "yum failed to install requested packages, exiting."
+    exit 1
+  fi
+}
+
 install_RPM() {
   INFO ""
   INFO "Installing dependencies for RPM-based distribution"
-  INFO "$COMMON_INFO"
+  INFO ""
+  INFO "`eval _echo "$COMMON_INFO"`"
   INFO ""
 
   sudo yum -y update
@@ -1041,113 +1352,162 @@ install_RPM() {
   VORBIS_DEV="libvorbis-devel"
   THEORA_DEV="libtheora-devel"
 
-  sudo yum -y install gawk gcc gcc-c++ cmake scons libpng-devel libtiff-devel \
-    freetype-devel libX11-devel libXi-devel wget libsqlite3x-devel ncurses-devel \
-    readline-devel $OPENJPEG_DEV openexr-devel openal-soft-devel \
-    glew-devel yasm $SCHRO_DEV $THEORA_DEV $VORBIS_DEV SDL-devel \
-    fftw-devel lame-libs jack-audio-connection-kit-devel libspnav-devel \
-    libjpeg-devel patch python-devel
-
+  _packages="gawk gcc gcc-c++ cmake scons libpng-devel libtiff-devel freetype-devel \
+             libX11-devel libXi-devel wget libsqlite3x-devel ncurses-devel \
+             readline-devel $OPENJPEG_DEV openexr-devel openal-soft-devel \
+             glew-devel yasm $THEORA_DEV $VORBIS_DEV SDL-devel fftw-devel \
+             lame-libs libjpeg-devel patch python-devel"
   OPENJPEG_USE=true
-  SCHRO_USE=true
   VORBIS_USE=true
   THEORA_USE=true
 
+  if $WITH_ALL; then
+    _packages="$_packages $SCHRO_DEV jack-audio-connection-kit-devel libspnav-devel"
+    SCHRO_USE=true
+  fi
+
+  INFO ""
+  install_packages_RPM $_packages
+
+  INFO ""
   X264_DEV="x264-devel"
   check_package_version_ge_RPM $X264_DEV $X264_VERSION_MIN
   if [ $? -eq 0 ]; then
-    sudo yum install -y $X264_DEV
+    install_packages_RPM $X264_DEV
     X264_USE=true
   fi
 
-  XVID_DEV="xvidcore-devel"
-  check_package_RPM $XVID_DEV
-  if [ $? -eq 0 ]; then
-    sudo yum install -y $XVID_DEV
-    XVID_USE=true
-  fi
+  if $WITH_ALL; then
+    INFO ""
+    XVID_DEV="xvidcore-devel"
+    check_package_RPM $XVID_DEV
+    if [ $? -eq 0 ]; then
+      install_packages_RPM $XVID_DEV
+      XVID_USE=true
+    fi
 
-  VPX_DEV="libvpx-devel"
-  check_package_version_ge_RPM $VPX_DEV $VPX_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo yum install -y $VPX_DEV
-    VPX_USE=true
-  fi
+    INFO ""
+    VPX_DEV="libvpx-devel"
+    check_package_version_ge_RPM $VPX_DEV $VPX_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_RPM $VPX_DEV
+      VPX_USE=true
+    fi
 
-  MP3LAME_DEV="lame-devel"
-  check_package_RPM $MP3LAME_DEV
-  if [ $? -eq 0 ]; then
-    sudo yum install -y $MP3LAME_DEV
-    MP3LAME_USE=true
+    INFO ""
+    MP3LAME_DEV="lame-devel"
+    check_package_RPM $MP3LAME_DEV
+    if [ $? -eq 0 ]; then
+      install_packages_RPM $MP3LAME_DEV
+      MP3LAME_USE=true
+    fi
   fi
 
-  check_package_version_match_RPM python3-devel $PYTHON_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo yum install -y python3-devel
+  INFO ""
+  if $PYTHON_SKIP; then
+    INFO "WARNING! Skipping Python installation, as requested..."
   else
-    compile_Python
+    check_package_version_match_RPM python3-devel $PYTHON_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_RPM python3-devel
+    else
+      compile_Python
+    fi
   fi
 
-  check_package_version_ge_RPM boost-devel $BOOST_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo yum install -y boost-devel
+  INFO ""
+  if $BOOST_SKIP; then
+    INFO "WARNING! Skipping Boost installation, as requested..."
   else
-    compile_Boost
+    check_package_version_ge_RPM boost-devel $BOOST_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_RPM boost-devel
+    else
+      compile_Boost
+    fi
   fi
 
-  check_package_version_ge_RPM OpenColorIO-devel $OCIO_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo yum install -y OpenColorIO-devel
+  INFO ""
+  if $OCIO_SKIP; then
+    INFO "WARNING! Skipping OpenColorIO installation, as requested..."
   else
-    compile_OCIO
+    check_package_version_ge_RPM OpenColorIO-devel $OCIO_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_RPM OpenColorIO-devel
+    else
+      compile_OCIO
+    fi
   fi
 
-  check_package_version_ge_RPM OpenImageIO-devel $OIIO_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo yum install -y OpenImageIO-devel
+  INFO ""
+  if $OIIO_SKIP; then
+    INFO "WARNING! Skipping OpenImageIO installation, as requested..."
   else
-    compile_OIIO
+    check_package_version_ge_RPM OpenImageIO-devel $OIIO_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_RPM OpenImageIO-devel
+    else
+      compile_OIIO
+    fi
   fi
 
-  if $BUILD_OSL; then
+  if $WITH_OSL; then
     have_llvm=false
 
-    check_package_RPM llvm-$LLVM_VERSION-devel
-    if [ $? -eq 0 ]; then
-      sudo yum install -y llvm-$LLVM_VERSION-devel
-      have_llvm=true
-      LLVM_VERSION_FOUND=$LLVM_VERSION
+    INFO ""
+    if $LLVM_SKIP; then
+      INFO "WARNING! Skipping LLVM installation, as requested (this also implies skipping OSL!)..."
     else
-#      check_package_RPM llvm-$LLVM_VERSION_MIN-devel
-#      if [ $? -eq 0 ]; then
-#        sudo yum install -y llvm-$LLVM_VERSION_MIN-devel
-#        have_llvm=true
-#        LLVM_VERSION_FOUND=$LLVM_VERSION_MIN
-#      else
-#        check_package_version_ge_RPM llvm-devel $LLVM_VERSION_MIN
+      check_package_RPM llvm-$LLVM_VERSION-devel
+      if [ $? -eq 0 ]; then
+        install_packages_RPM llvm-$LLVM_VERSION-devel
+        have_llvm=true
+        LLVM_VERSION_FOUND=$LLVM_VERSION
+      else
+#        check_package_RPM llvm-$LLVM_VERSION_MIN-devel
 #        if [ $? -eq 0 ]; then
-#          sudo yum install -y llvm-devel
+#          install_packages_RPM llvm-$LLVM_VERSION_MIN-devel
 #          have_llvm=true
-#          LLVM_VERSION_FOUND=`get_package_version_RPM llvm-devel`
+#          LLVM_VERSION_FOUND=$LLVM_VERSION_MIN
+#        else
+#          check_package_version_ge_RPM llvm-devel $LLVM_VERSION_MIN
+#          if [ $? -eq 0 ]; then
+#            install_packages_RPM llvm-devel
+#            have_llvm=true
+#            LLVM_VERSION_FOUND=`get_package_version_RPM llvm-devel`
+#          fi
 #        fi
-#      fi
-    sudo yum install -y libffi-devel
-    # XXX Stupid fedora puts ffi header into a darn stupid dir!
-    _FFI_INCLUDE_DIR=`rpm -ql libffi-devel | grep -e ".*/ffi.h" | sed -r 's/(.*)\/ffi.h/\1/'`
-    compile_LLVM
-    have_llvm=true
-    LLVM_VERSION_FOUND=$LLVM_VERSION
+      install_packages_RPM libffi-devel
+      # XXX Stupid fedora puts ffi header into a darn stupid dir!
+      _FFI_INCLUDE_DIR=`rpm -ql libffi-devel | grep -e ".*/ffi.h" | sed -r 's/(.*)\/ffi.h/\1/'`
+      INFO ""
+      compile_LLVM
+      have_llvm=true
+      LLVM_VERSION_FOUND=$LLVM_VERSION
+      fi
     fi
 
-    if $have_llvm; then
-      sudo yum install -y flex bison clang tbb-devel git
-      # No package currently!
-      compile_OSL
+    if $OSL_SKIP; then
+      INFO ""
+      INFO "WARNING! Skipping OpenShadingLanguage installation, as requested..."
+    else
+      if $have_llvm; then
+        INFO ""
+        install_packages_RPM flex bison clang tbb-devel git
+        # No package currently!
+        INFO ""
+        compile_OSL
+      fi
     fi
   fi
 
-  # Always for now, not sure which packages should be installed
-  compile_FFmpeg
+  INFO ""
+  if $FFMPEG_SKIP; then
+    INFO "WARNING! Skipping FFMpeg installation, as requested..."
+  else
+    # Always for now, not sure which packages should be installed
+    compile_FFmpeg
+  fi
 }
 
 get_package_version_SUSE() {
@@ -1186,10 +1546,20 @@ check_package_version_ge_SUSE() {
   return $?
 }
 
+install_packages_SUSE() {
+  sudo zypper --non-interactive install --auto-agree-with-licenses $@
+  if [ $? -ge 1 ]; then
+    ERROR "zypper failed to install requested packages, exiting."
+    exit 1
+  fi
+}
+
+
 install_SUSE() {
   INFO ""
   INFO "Installing dependencies for SuSE-based distribution"
-  INFO "$COMMON_INFO"
+  INFO ""
+  INFO "`eval _echo "$COMMON_INFO"`"
   INFO ""
 
   sudo zypper --non-interactive update --auto-agree-with-licenses
@@ -1200,90 +1570,143 @@ install_SUSE() {
   VORBIS_DEV="libvorbis-devel"
   THEORA_DEV="libtheora-devel"
 
-  sudo zypper --non-interactive install --auto-agree-with-licenses \
-    gawk gcc gcc-c++ cmake scons libpng12-devel libtiff-devel \
-    freetype-devel libX11-devel libXi-devel wget sqlite3-devel ncurses-devel \
-    readline-devel $OPENJPEG_DEV libopenexr-devel openal-soft-devel \
-    glew-devel yasm $SCHRO_DEV $THEORA_DEV $VORBIS_DEV libSDL-devel \
-    fftw3-devel libjack-devel libspnav-devel \
-    libjpeg62-devel patch python-devel
+  _packages="gawk gcc gcc-c++ cmake scons libpng12-devel libtiff-devel freetype-devel \
+             libX11-devel libXi-devel wget sqlite3-devel ncurses-devel \
+             readline-devel $OPENJPEG_DEV libopenexr-devel openal-soft-devel \
+             glew-devel yasm $THEORA_DEV $VORBIS_DEV libSDL-devel fftw3-devel \
+             libjpeg62-devel patch python-devel"
+  OPENJPEG_USE=true
+  VORBIS_USE=true
+  THEORA_USE=true
+
+  if $WITH_ALL; then
+    _packages="$_packages $SCHRO_DEV libjack-devel libspnav-devel"
+    SCHRO_USE=true
+  fi
+
+  INFO ""
+  install_packages_SUSE $_packages
 
   OPENJPEG_USE=true
   SCHRO_USE=true
   VORBIS_USE=true
   THEORA_USE=true
 
+  INFO ""
   X264_DEV="x264-devel"
   check_package_version_ge_SUSE $X264_DEV $X264_VERSION_MIN
   if [ $? -eq 0 ]; then
-    sudo zypper --non-interactive install --auto-agree-with-licenses $X264_DEV
+    install_packages_SUSE $X264_DEV
     X264_USE=true
   fi
 
-  XVID_DEV="xvidcore-devel"
-  check_package_SUSE $XVID_DEV
-  if [ $? -eq 0 ]; then
-    sudo zypper --non-interactive install --auto-agree-with-licenses $XVID_DEV
-    XVID_USE=true
-  fi
+  if $WITH_ALL; then
+    INFO ""
+    XVID_DEV="xvidcore-devel"
+    check_package_SUSE $XVID_DEV
+    if [ $? -eq 0 ]; then
+      install_packages_SUSE $XVID_DEV
+      XVID_USE=true
+    fi
 
-  VPX_DEV="libvpx-devel"
-  check_package_version_ge_SUSE $VPX_DEV $VPX_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    sudo zypper --non-interactive install --auto-agree-with-licenses $VPX_DEV
-    VPX_USE=true
-  fi
+    INFO ""
+    VPX_DEV="libvpx-devel"
+    check_package_version_ge_SUSE $VPX_DEV $VPX_VERSION_MIN
+    if [ $? -eq 0 ]; then
+      install_packages_SUSE $VPX_DEV
+      VPX_USE=true
+    fi
 
-  # No mp3 in suse, it seems.
-  MP3LAME_DEV="lame-devel"
-  check_package_SUSE $MP3LAME_DEV
-  if [ $? -eq 0 ]; then
-    sudo zypper --non-interactive install --auto-agree-with-licenses $MP3LAME_DEV
-    MP3LAME_USE=true
+    INFO ""
+    # No mp3 in suse, it seems.
+    MP3LAME_DEV="lame-devel"
+    check_package_SUSE $MP3LAME_DEV
+    if [ $? -eq 0 ]; then
+      install_packages_SUSE $MP3LAME_DEV
+      MP3LAME_USE=true
+    fi
   fi
 
-  check_package_version_match_SUSE python3-devel 3.3.
-  if [ $? -eq 0 ]; then
-    sudo zypper --non-interactive install --auto-agree-with-licenses python3-devel
+  INFO ""
+  if $PYTHON_SKIP; then
+    INFO "WARNING! Skipping Python installation, as requested..."
   else
-    compile_Python
+    check_package_version_match_SUSE python3-devel 3.3.
+    if [ $? -eq 0 ]; then
+      install_packages_SUSE python3-devel
+    else
+      compile_Python
+    fi
   fi
 
-  # No boost_locale currently available, so let's build own boost.
-  compile_Boost
+  INFO ""
+  if $BOOST_SKIP; then
+    INFO "WARNING! Skipping Boost installation, as requested..."
+  else
+    # No boost_locale currently available, so let's build own boost.
+    compile_Boost
+  fi
 
-  # No ocio currently available, so let's build own boost.
-  compile_OCIO
+  INFO ""
+  if $OCIO_SKIP; then
+    INFO "WARNING! Skipping OpenColorIO installation, as requested..."
+  else
+    # No ocio currently available, so let's build own boost.
+    compile_OCIO
+  fi
 
-  # No oiio currently available, so let's build own boost.
-  compile_OIIO
+  INFO ""
+  if $OIIO_SKIP; then
+    INFO "WARNING! Skipping OpenImageIO installation, as requested..."
+  else
+    # No oiio currently available, so let's build own boost.
+    compile_OIIO
+  fi
 
-  if $BUILD_OSL; then
+  if $WITH_OSL; then
     have_llvm=false
 
-    # Suse llvm package *_$SUCKS$_* (tm) !!!
-#    check_package_version_ge_SUSE llvm-devel $LLVM_VERSION_MIN
-#    if [ $? -eq 0 ]; then
-#      sudo zypper --non-interactive install --auto-agree-with-licenses llvm-devel
-#      have_llvm=true
-#      LLVM_VERSION_FOUND=`get_package_version_SUSE llvm-devel`
-#    fi
+    INFO ""
+    if $LLVM_SKIP; then
+      INFO "WARNING! Skipping LLVM installation, as requested (this also implies skipping OSL!)..."
+    else
+      # Suse llvm package *_$SUCKS$_* (tm) !!!
+#      check_package_version_ge_SUSE llvm-devel $LLVM_VERSION_MIN
+#      if [ $? -eq 0 ]; then
+#        install_packages_SUSE llvm-devel
+#        have_llvm=true
+#        LLVM_VERSION_FOUND=`get_package_version_SUSE llvm-devel`
+#      fi
 
-    sudo zypper --non-interactive install --auto-agree-with-licenses libffi47-devel
-    compile_LLVM
-    have_llvm=true
-    LLVM_VERSION_FOUND=$LLVM_VERSION
+      install_packages_SUSE libffi47-devel
+      INFO ""
+      compile_LLVM
+      have_llvm=true
+      LLVM_VERSION_FOUND=$LLVM_VERSION
+    fi
 
-    if $have_llvm; then
-      # XXX No tbb lib!
-      sudo zypper --non-interactive install --auto-agree-with-licenses flex bison git
-      # No package currently!
-      compile_OSL
+    if $OSL_SKIP; then
+      INFO ""
+      INFO "WARNING! Skipping OpenShaderLanguage installation, as requested..."
+    else
+      if $have_llvm; then
+        INFO ""
+        # XXX No tbb lib!
+        install_packages_SUSE flex bison git
+        # No package currently!
+        INFO ""
+        compile_OSL
+      fi
     fi
   fi
 
-  # No ffmpeg currently available, so let's build own boost.
-  compile_FFmpeg
+  INFO ""
+  if $FFMPEG_SKIP; then
+    INFO "WARNING! Skipping FFMpeg installation, as requested..."
+  else
+    # No ffmpeg currently available, so let's build own boost.
+    compile_FFmpeg
+  fi
 }
 
 print_info_ffmpeglink_DEB() {
@@ -1348,7 +1771,7 @@ print_info_ffmpeglink() {
     _packages="$_packages $OPENJPEG_DEV"
   fi
 
-  # XXX At least under Debian, static schro give problem at blender linking time... :/
+  # XXX At least under Debian, static schro gives problem at blender linking time... :/
   if $SCHRO_USE && ! $ALL_STATIC; then
     _packages="$_packages $SCHRO_DEV"
   fi
@@ -1379,7 +1802,7 @@ print_info() {
     INFO "  -D Boost_USE_ICU=ON"
   fi
 
-  if [ -d $INST/osl ]; then
+  if [ -d $INST/osl -a $WITH_OSL == true ]; then
     INFO "  -D CYCLES_OSL=$INST/osl"
     INFO "  -D WITH_CYCLES_OSL=ON"
     INFO "  -D LLVM_VERSION=$LLVM_VERSION_FOUND"
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 6f6308867b6..19c27d0c6bc 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -651,7 +651,7 @@ def AppIt(target=None, source=None, env=None):
             commands.getoutput(cmd)
             cmd = 'cp -R %s/kernel/*.h %s/kernel/*.cl %s/kernel/*.cu %s/kernel/' % (croot, croot, croot, cinstalldir)
             commands.getoutput(cmd)
-            cmd = 'cp -R %s/kernel/svm %s/util/util_color.h %s/util/util_math.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' % (croot, croot, croot, croot, croot, cinstalldir)
+            cmd = 'cp -R %s/kernel/svm %s/kernel/closure %s/util/util_color.h %s/util/util_math.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' % (croot, croot, croot, croot, croot, croot, cinstalldir)
             commands.getoutput(cmd)
             cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir)
             commands.getoutput(cmd)
diff --git a/doc/manpage/blender.1 b/doc/manpage/blender.1
index e7164fcb96b..2addb60c5f7 100644
--- a/doc/manpage/blender.1
+++ b/doc/manpage/blender.1
@@ -1,4 +1,4 @@
-.TH "BLENDER" "1" "October 04, 2012" "Blender Blender 2\&.64 (sub 0)"
+.TH "BLENDER" "1" "December 04, 2012" "Blender Blender 2\&.65"
 
 .SH NAME
 blender \- a 3D modelling and rendering package
@@ -15,7 +15,7 @@ Use Blender to create TV commercials, to make technical visualizations, business
 http://www.blender.org
 .SH OPTIONS
 
-Blender 2.64 (sub 0)
+Blender 2.65
 Usage: blender [args ...] [file] [args ...]
 .br
 .SS "Render Options:"
@@ -145,6 +145,10 @@ Playback <file(s)>, only operates this way when not running in background.
 .br
     \-j <frame> Set frame step to <frame>
 .br
+    \-s <frame> Play from <frame>
+.br
+    \-e <frame> Play until <frame>
+.br
 
 .IP
 
@@ -345,6 +349,12 @@ Enable debug messages for the event system
 .br
 
 .TP
+.B \-\-debug\-handlers
+.br
+Enable debug messages for event handling
+.br
+
+.TP
 .B \-\-debug\-wm
 .br
 Enable debug messages for the window manager
diff --git a/doc/python_api/examples/bmesh.ops.1.py b/doc/python_api/examples/bmesh.ops.1.py
index 2eefb63a23d..abce087ceb3 100644
--- a/doc/python_api/examples/bmesh.ops.1.py
+++ b/doc/python_api/examples/bmesh.ops.1.py
@@ -95,6 +95,8 @@ bmesh.ops.rotate(
 # Finish up, write the bmesh into a new mesh
 me = bpy.data.meshes.new("Mesh")
 bm.to_mesh(me)
+bm.free()
+
 
 # Add the mesh to the scene
 scene = bpy.context.scene
diff --git a/doc/python_api/rst/include__bmesh.rst b/doc/python_api/rst/include__bmesh.rst
index a55bf71b60f..ef4a1c272b4 100644
--- a/doc/python_api/rst/include__bmesh.rst
+++ b/doc/python_api/rst/include__bmesh.rst
@@ -4,6 +4,13 @@
    ./blender.bin -b -noaudio -P doc/python_api/sphinx_doc_gen.py -- --partial bmesh* ; cd doc/python_api ; sphinx-build sphinx-in sphinx-out ; cd ../../
 
 
+Submodules:
+
+* :mod:`bmesh.ops`
+* :mod:`bmesh.types`
+* :mod:`bmesh.utils`
+
+
 Intro
 -----
 
@@ -35,7 +42,6 @@ For an overview of BMesh data types and how they reference each other see:
    TODO items are...
 
    * add access to BMesh **walkers**
-   * add api for calling BMesh operators (unrelated to bpy.ops)
    * add custom-data manipulation functions add/remove/rename.
 
 Example Script
diff --git a/doc/python_api/rst/info_api_reference.rst b/doc/python_api/rst/info_api_reference.rst
new file mode 100644
index 00000000000..ddee46dce11
--- /dev/null
+++ b/doc/python_api/rst/info_api_reference.rst
@@ -0,0 +1,305 @@
+
+*******************
+Reference API Usage
+*******************
+
+Blender has many interlinking data types which have an auto-generated reference api which often has the information
+you need to write a script, but can be difficult to use.
+
+This document is designed to help you understand how to use the reference api.
+
+
+Reference API Scope
+===================
+
+The reference API covers :mod:`bpy.types`, which stores types accessed via :mod:`bpy.context` - *The user context*
+or :mod:`bpy.data` - *Blend file data*.
+
+Other modules such as :mod:`bge`, :mod:`bmesh` and :mod:`aud` are not using Blenders data API
+so this document doesn't apply to those modules.
+
+
+Data Access
+===========
+
+The most common case for using the reference API is to find out how to access data in the blend file.
+
+Before going any further its best to be aware of ID Data-Blocks in Blender since you will often find properties
+relative to them.
+
+
+ID Data
+-------
+
+ID Data-Blocks are used in Blender as top-level data containers.
+
+From the user interface this isn't so obvious, but when developing you need to know about ID Data-Blocks.
+
+ID data types include Scene, Group, Object, Mesh, Screen, World, Armature, Image and Texture.
+for a full list see the sub-classes of :class:`bpy.types.ID`
+
+Here are some characteristics ID Data-Blocks share.
+
+- ID's are blend file data, so loading a new blend file reloads an entire new set of Data-Blocks.
+- ID's can be accessed in Python from ``bpy.data.*``
+- Each data-block has a unique ``.name`` attribute, displayed in the interface.
+- Animation data is stored in ID's ``.animation_data``.
+- ID's are the only data types that can be linked between blend files.
+- ID's can be added/copied and removed via Python.
+- ID's have their own garbage-collection system which frees unused ID's when saving.
+- When a data-block has a reference to some external data, this is typically an ID Data-Block.
+
+
+Simple Data Access
+------------------
+
+Lets start with a simple case, say you wan't a python script to adjust the objects location.
+
+Start by finding this setting in the interface ``Properties Window -> Object -> Transform -> Location``
+
+From the button you can right click and select **Online Python Reference**, this will link you to:
+:class:`bpy.types.Object.location`
+
+Being an API reference, this link often gives little more information then the tool-tip, though some of the pages
+include examples (normally at the top of the page).
+
+At this point you may say *Now what?* - you know that you have to use ``.location`` and that its an array of 3 floats
+but you're still left wondering how to access this in a script.
+
+So the next step is to find out where to access objects, go down to the bottom of the page to the **References**
+section, for objects there are many references, but one of the most common places to access objects is via the context.
+
+It's easy to be overwhelmed at this point since there ``Object`` get referenced in so many places - modifiers,
+functions, textures and constraints.
+
+But if you want to access any data the user has selected
+you typically only need to check the :mod:`bpy.context` references.
+
+Even then, in this case there are quite a few though if you read over these - most are mode specific.
+If you happen to be writing a tool that only runs in weight paint mode, then using ``weight_paint_object``
+would be appropriate.
+However to access an item the user last selected, look for the ``active`` members,
+Having access to a single active member the user selects is a convention in Blender: eg. ``active_bone``,
+``active_pose_bone``, ``active_node`` ... and in this case we can use - ``active_object``.
+
+
+So now we have enough information to find the location of the active object.
+
+.. code-block:: python
+
+   bpy.context.active_object.location
+
+You can type this into the python console to see the result.
+
+The other common place to access objects in the reference is :class:`bpy.types.BlendData.objects`.
+
+.. note::
+
+   This is **not** listed as :mod:`bpy.data.objects`,
+   this is because :mod:`bpy.data` is an instance of the :class:`bpy.types.BlendData` class,
+   so the documentation points there.
+
+
+With :mod:`bpy.data.objects`, this is a collection of objects so you need to access one of its members.
+
+.. code-block:: python
+
+   bpy.data.objects["Cube"].location
+
+
+Nested Properties
+-----------------
+
+The previous example is quite straightforward because ``location`` is a property of ``Object`` which can be accessed
+from the context directly.
+
+Here are some more complex examples:
+
+.. code-block:: python
+
+   # access a render layers samples
+   bpy.context.scene.render.layers["RenderLayer"].samples
+
+   # access to the current weight paint brush size
+   bpy.context.tool_settings.weight_paint.brush.size  
+
+   # check if the window is fullscreen
+   bpy.context.window.screen.show_fullscreen
+
+
+As you can see there are times when you want to access data which is nested
+in a way that causes you to go through a few indirections.
+
+The properties are arranged to match how data is stored internally (in blenders C code) which is often logical but
+not always quite what you would expect from using Blender.
+
+So this takes some time to learn, it helps you understand how data fits together in Blender which is important
+to know when writing scripts.
+
+
+When starting out scripting you will often run into the problem where you're not sure how to access the data you want.
+
+There are a few ways to do this.
+
+- Use the Python console's auto-complete to inspect properties. *This can be hit-and-miss but has the advantage
+  that you can easily see the values of properties and assign them to interactively see the results.*
+
+- Copy the Data-Path from the user interface. *Explained further in :ref:`Copy Data Path <info_data_path_copy>`*
+
+- Using the documentation to follow references. *Explained further in :ref:`Indirect Data Access <info_data_path_indirect>`*
+
+
+.. _info_data_path_copy
+
+Copy Data Path
+--------------
+
+Blender can compute the Python string to a property which is shown in the tool-tip, on the line below ``Python: ...``,
+This saves having to use the API reference to click back up the references to find where data is accessed from.
+
+There is a user-interface feature to copy the data-path which gives the path from an :class:`bpy.types.ID` data-block,
+to its property.
+
+To see how this works we'll get the path to the Subdivision-Surface modifiers subdivision setting.
+
+Start with the default scene and select the **Modifiers** tab, then add a **Subdivision-Surface** modifier to the cube.
+
+Now hover your mouse over the button labeled **View**, The tool-tip includes :class:`bpy.types.SubsurfModifier.levels`
+but we want the path from the object to this property.
+
+Note that the text copied won't include the ``bpy.data.collection["name"].`` component since its assumed that
+you won't be doing collection look-ups on every access and typically you'll want to use the context rather
+then access each :class:`bpy.types.ID` instance by name.
+
+
+Type in the ID path into a Python console :mod:`bpy.context.active_object`. Include the trailing dot and don't hit "enter", yet. 
+
+Now right-click on the button and select **Copy Data Path**, then paste the result into the console.
+
+So now you should have the answer:
+
+.. code-block:: python
+
+   bpy.context.active_object.modifiers["Subsurf"].levels
+
+Hit "enter" and you'll get the current value of 1. Now try changing the value to 2:
+
+.. code-block:: python
+
+  bpy.context.active_object.modifiers["Subsurf"].levels = 2
+
+You can see the value update in the Subdivision-Surface modifier's UI as well as the cube.
+
+
+.. _info_data_path_indirect
+
+Indirect Data Access
+--------------------
+
+For this example we'll go over something more involved, showing the steps to access the active sculpt brushes texture.
+
+Lets say we want to access the texture of a brush via Python, to adjust its ``contrast`` for example.
+
+- Start in the default scene and enable 'Sculpt' mode from the 3D-View header.
+
+- From the toolbar expand the **Texture** panel and add a new texture.
+
+  *Notice the texture button its self doesn't have very useful links (you can check the tool-tips).*
+
+- The contrast setting isn't exposed in the sculpt toolbar, so view the texture in the properties panel...
+
+  - In the properties button select the Texture context.
+
+  - Select the Brush icon to show the brush texture.
+
+  - Expand the **Colors** panel to locate the **Contrast** button.
+
+- Right click on the contrast button and select **Online Python Reference** This takes you to ``bpy.types.Texture.contrast``
+
+- Now we can see that ``contrast`` is a property of texture, so next we'll check on how to access the texture from the brush.
+
+- Check on the **References** at the bottom of the page, sometimes there are many references, and it may take
+  some guess work to find the right one, but in this case its obviously ``Brush.texture``.
+
+  *Now we know that the texture can be accessed from* ``bpy.data.brushes["BrushName"].texture``
+  *but normally you won't want to access the brush by name, so we'll see now to access the active brush instead.*
+
+- So the next step is to check on where brushes are accessed from via the **References**.
+  In this case there is simply ``bpy.context.brush`` which is all we need.
+  
+
+Now you can use the Python console to form the nested properties needed to access brush textures contrast,
+logically we now know.
+
+*Context -> Brush -> Texture -> Contrast*
+
+Since the attribute for each is given along the way we can compose the data path in the python console:
+
+.. code-block:: python
+
+   bpy.context.brush.texture.contrast
+
+
+There can be multiple ways to access the same data, which you choose often depends on the task.
+
+An alternate path to access the same setting is...
+
+.. code-block:: python
+
+   bpy.context.sculpt.brush.texture.contrast
+
+Or access the brush directly...
+
+.. code-block:: python
+
+   bpy.data.brushes["BrushName"].texture.contrast
+
+
+If you are writing a user tool normally you want to use the :mod:`bpy.context` since the user normally expects
+the tool to operate on what they have selected.
+
+For automation you are more likely to use :mod:`bpy.data` since you want to be able to access specific data and manipulate
+it, no matter what the user currently has the view set at.
+
+
+Operators
+=========
+
+Most key-strokes and buttons in Blender call an operator which is also exposed to python via :mod:`bpy.ops`,
+
+To see the Python equivalent hover your mouse over the button and see the tool-tip,
+eg ``Python: bpy.ops.render.render()``,
+If there is no tool-tip or the ``Python:`` line is missing then this button is not using an operator and
+can't be accessed from Python.
+
+
+If you want to use this in a script you can press :kbd:`Control-C` while your mouse is over the button to copy it to the
+clipboard.
+
+You can also right click on the button and view the **Online Python Reference**, this mainly shows arguments and
+their defaults however operators written in Python show their file and line number which may be useful if you
+are interested to check on the source code.
+
+.. note::
+
+   Not all operators can be called usefully from Python, for more on this see :ref:`using operators <using_operators>`.
+
+
+Info View
+---------
+
+Blender records operators you run and displays them in the **Info** space.
+This is located above the file-menu which can be dragged down to display its contents.
+
+Select the **Script** screen that comes default with Blender to see its output.
+You can perform some actions and see them show up - delete a vertex for example.
+
+Each entry can be selected (Right-Mouse-Button), then copied :kbd:`Control-C`, usually to paste in the text editor or python console.
+
+.. note::
+
+   Not all operators get registered for display,
+   zooming the view for example isn't so useful to repeat so its excluded from the output.
+
+   To display *every* operator that runs see :ref:`Show All Operators <info_show_all_operators>`
+
diff --git a/doc/python_api/rst/info_gotcha.rst b/doc/python_api/rst/info_gotcha.rst
index e60f1e256cd..34145c2ac49 100644
--- a/doc/python_api/rst/info_gotcha.rst
+++ b/doc/python_api/rst/info_gotcha.rst
@@ -5,6 +5,8 @@ Gotchas
 This document attempts to help you work with the Blender API in areas that can be troublesome and avoid practices that are known to give instability.
 
 
+.. _using_operators:
+
 Using Operators
 ===============
 
@@ -494,7 +496,7 @@ Heres an example of threading supported by Blender:
        t.join()
 
 
-This an example of a timer which runs many times a second and moves the default cube continuously while Blender runs (Unsupported).
+This an example of a timer which runs many times a second and moves the default cube continuously while Blender runs **(Unsupported)**.
 
 .. code-block:: python
 
@@ -517,7 +519,7 @@ So far, no work has gone into making Blender's python integration thread safe, s
 
 .. note::
 
-   Pythons threads only allow co-currency and won't speed up your scripts on multi-processor systems, the ``subprocess`` and ``multiprocess`` modules can be used with blender and make use of multiple CPU's too.
+   Pythons threads only allow co-currency and won't speed up your scripts on multi-processor systems, the ``subprocess`` and ``multiprocess`` modules can be used with Blender and make use of multiple CPU's too.
 
 
 Help! My script crashes Blender
@@ -537,11 +539,18 @@ Here are some general hints to avoid running into these problems.
 
 * Crashes may not happen every time, they may happen more on some configurations/operating-systems.
 
+.. note::
+
+   To find the line of your script that crashes you can use the ``faulthandler`` module.
+   See `faulthandler docs <http://docs.python.org/dev/library/faulthandler.html>`_.
+
+   While the crash may be in Blenders C/C++ code, this can help a lot to track down the area of the script that causes the crash.
+
 
 Undo/Redo
 ---------
 
-Undo invalidates all :class:`bpy.types.ID` instances (Object, Scene, Mesh etc).
+Undo invalidates all :class:`bpy.types.ID` instances (Object, Scene, Mesh, Lamp... etc).
 
 This example shows how you can tell undo changes the memory locations.
 
@@ -659,9 +668,9 @@ But take care because this is limited to scripts accessing the variable which is
 sys.exit
 ========
 
-Some python modules will call sys.exit() themselves when an error occurs, while not common behavior this is something to watch out for because it may seem as if blender is crashing since sys.exit() will quit blender immediately.
+Some python modules will call ``sys.exit()`` themselves when an error occurs, while not common behavior this is something to watch out for because it may seem as if blender is crashing since ``sys.exit()`` will quit blender immediately.
 
 For example, the ``optparse`` module will print an error and exit if the arguments are invalid.
 
-An ugly way of troubleshooting this is to set ``sys.exit = None`` and see what line of python code is quitting, you could of course replace ``sys.exit``/ with your own function but manipulating python in this way is bad practice.
+An ugly way of troubleshooting this is to set ``sys.exit = None`` and see what line of python code is quitting, you could of course replace ``sys.exit`` with your own function but manipulating python in this way is bad practice.
 
diff --git a/doc/python_api/rst/info_overview.rst b/doc/python_api/rst/info_overview.rst
index 818eb692be9..b2d524b74af 100644
--- a/doc/python_api/rst/info_overview.rst
+++ b/doc/python_api/rst/info_overview.rst
@@ -1,3 +1,5 @@
+.. _info_overview:
+
 *******************
 Python API Overview
 *******************
diff --git a/doc/python_api/rst/info_quickstart.rst b/doc/python_api/rst/info_quickstart.rst
index 62ad4e9c4d8..e1264ae9d52 100644
--- a/doc/python_api/rst/info_quickstart.rst
+++ b/doc/python_api/rst/info_quickstart.rst
@@ -1,3 +1,5 @@
+.. _info_quickstart:
+
 ***********************
 Quickstart Introduction
 ***********************
diff --git a/doc/python_api/rst/info_tips_and_tricks.rst b/doc/python_api/rst/info_tips_and_tricks.rst
index 521031f5e61..75e8ef61f6f 100644
--- a/doc/python_api/rst/info_tips_and_tricks.rst
+++ b/doc/python_api/rst/info_tips_and_tricks.rst
@@ -44,15 +44,17 @@ if this can't be generated, only the property name is copied.
 
 .. note::
 
-   This uses the same method for creating the animation path used by :class:`FCurve.data_path` and :class:`DriverTarget.data_path` drivers.
+   This uses the same method for creating the animation path used by :class:`bpy.types.FCurve.data_path` and :class:`bpy.types.DriverTarget.data_path` drivers.
 
 
+.. _info_show_all_operators
+
 Show All Operators
 ==================
 
 While blender logs operators in the Info space, this only reports operators with the ``REGISTER`` option enabeld so as not to flood the Info view with calls to ``bpy.ops.view3d.smoothview`` and ``bpy.ops.view3d.zoom``.
 
-However, for testing it can be useful to see **every** operator called in a terminal, do this by enabling the debug option either by passing the ``--debug`` argument when starting blender or by setting :mod:`bpy.app.debug` to True while blender is running.
+However, for testing it can be useful to see **every** operator called in a terminal, do this by enabling the debug option either by passing the ``--debug-wm`` argument when starting blender or by setting :mod:`bpy.app.debug_wm` to True while blender is running.
 
 
 Use an External Editor
@@ -218,6 +220,14 @@ The next example is an equivalent single line version of the script above which
 ``code.interact`` can be added at any line in the script and will pause the script an launch an interactive interpreter in the terminal, when you're done you can quit the interpreter and the script will continue execution.
 
 
+If you have **IPython** installed you can use their ``embed()`` function which will implicitly use the current namespace, this has autocomplete and some useful features that the standard python eval-loop doesn't have.
+
+.. code-block:: python
+
+   import IPython
+   IPython.embed()
+
+
 Admittedly this highlights the lack of any python debugging support built into blender, but its still handy to know.
 
 .. note::
diff --git a/doc/python_api/rst/info_tutorial_addon.rst b/doc/python_api/rst/info_tutorial_addon.rst
new file mode 100644
index 00000000000..2a101041227
--- /dev/null
+++ b/doc/python_api/rst/info_tutorial_addon.rst
@@ -0,0 +1,645 @@
+
+Addon Tutorial
+##############
+
+************
+Introduction
+************
+
+
+Intended Audience
+=================
+
+This tutorial is designed to help technical artists or developers learn to extend Blender.
+An understanding of the basics of Python is expected for those working through this tutorial.
+
+
+Prerequisites
+-------------
+
+Before going through the tutorial you should...
+
+* Familiarity with the basics of working in Blender.
+
+* Know how to run a script in Blender's text editor (as documented in the quick-start)
+
+* Have an understanding of Python primitive types (int, boolean, string, list, tuple, dictionary, and set).
+
+* Be familiar with the concept of Python modules.
+
+* Basic understanding of classes (object orientation) in Python.
+
+
+Suggested reading before starting this tutorial.
+
+* `Dive Into Python <http://getpython3.com/diveintopython3/index.html>`_ sections (1, 2, 3, 4, and 7).
+* :ref:`Blender API Quickstart <info_quickstart>`
+  to help become familiar with Blender/Python basics.
+
+
+To best troubleshoot any error message Python prints while writing scripts you run blender with from a terminal,
+see :ref:`Use The Terminal <use_the_terminal>`.
+
+Documentation Links
+===================
+
+While going through the tutorial you may want to look into our reference documentation.
+
+* :ref:`Blender API Overview <info_overview>`. -
+  *This document is rather detailed but helpful if you want to know more on a topic.*
+
+* :mod:`bpy.context` api reference. -
+  *Handy to have a list of available items your script may operate on.*
+
+* :class:`bpy.types.Operator`. -
+  *The following addons define operators, these docs give details and more examples of operators.*
+
+
+******
+Addons
+******
+
+
+What is an Addon?
+=================
+
+An addon is simply a Python module with some additional requirements so Blender can display it in a list with useful
+information.
+
+To give an example, here is the simplest possible addon.
+
+
+.. code-block:: python
+
+   bl_info = {"name": "My Test Addon", "category": "Object"}
+   def register():
+       print("Hello World")
+   def unregister():
+       print("Goodbye World")
+
+
+* ``bl_info`` is a dictionary containing addon meta-data such as the title, version and author to be displayed in the
+  user preferences addon list.
+* ``register`` is a function which only runs when enabling the addon, this means the module can be loaded without
+  activating the addon.
+* ``unregister`` is a function to unload anything setup by ``register``, this is called when the addon is disabled.
+
+
+
+Notice this addon does not do anything related to Blender, (the :mod:`bpy` module is not imported for example).
+
+This is a contrived example of an addon that serves to illustrate the point
+that the base requirements of an addon are simple.
+
+An addon will typically register operators, panels, menu items etc, but its worth noting that _any_ script can do this,
+when executed from the text editor or even the interactive console - there is nothing inherently different about an
+addon that allows it to integrate with Blender, such functionality is just provided by the :mod:`bpy` module for any
+script to access.
+
+So an addon is just a way to encapsulate a Python module in a way a user can easily utilize.
+
+.. note::
+
+   Running this script within the text editor won't print anything,
+   to see the output it must be installed through the user preferences.
+   Messages will be printed when enabling and disabling.
+
+
+Your First Addon
+================
+
+The simplest possible addon above was useful as an example but not much else.
+This next addon is simple but shows how to integrate a script into Blender using an ``Operator``
+which is the typical way to define a tool accessed from menus, buttons and keyboard shortcuts.
+
+For the first example we'll make a script that simply moves all objects in a scene.
+
+
+Write The Script
+----------------
+
+Add the following script to the text editor in Blender.
+
+.. code-block:: python
+
+   import bpy
+
+   scene = bpy.context.scene
+   for obj in scene.objects:
+       obj.location.x += 1.0
+
+
+.. image:: run_script.png
+   :width: 924px
+   :align: center
+   :height: 574px
+   :alt: Run Script button
+
+Click the Run Script button, all objects in the active scene are moved by 1.0 Blender unit.
+Next we'll make this script into an addon.
+
+
+Write the Addon (Simple)
+------------------------
+
+This addon takes the body of the script above, and adds them to an operator's ``execute()`` function.
+
+
+.. code-block:: python
+
+   bl_info = {
+       "name": "Move X Axis",
+       "category": "Object",
+   }
+
+   import bpy
+
+
+   class ObjectMoveX(bpy.types.Operator):
+       """My Object Moving Script"""      # blender will use this as a tooltip for menu items and buttons.
+       bl_idname = "object.move_x"        # unique identifier for buttons and menu items to reference.
+       bl_label = "Move X by One"         # display name in the interface.
+       bl_options = {'REGISTER', 'UNDO'}  # enable undo for the operator.
+
+       def execute(self, context):        # execute() is called by blender when running the operator.
+
+           # The original script
+           scene = context.scene
+           for obj in scene.objects:
+               obj.location.x += 1.0
+
+           return {'FINISHED'}            # this lets blender know the operator finished successfully.
+
+   def register():
+       bpy.utils.register_class(ObjectMoveX)
+
+
+   def unregister():
+       bpy.utils.unregister_class(ObjectMoveX)
+
+
+   # This allows you to run the script directly from blenders text editor
+   # to test the addon without having to install it.
+   if __name__ == "__main__":
+       register()
+
+
+.. note:: ``bl_info`` is split across multiple lines, this is just a style convention used to more easily add items.
+
+.. note:: Rather than using ``bpy.context.scene``, we use the ``context.scene`` argument passed to ``execute()``.
+          In most cases these will be the same however in some cases operators will be passed a custom context
+          so script authors should prefer the ``context`` argument passed to operators.
+   
+
+To test the script you can copy and paste this into Blender text editor and run it, this will execute the script
+directly and call register immediately.
+
+However running the script wont move any objects, for this you need to execute the newly registered operator.
+
+.. image:: spacebar.png
+   :width: 924px
+   :align: center
+   :height: 574px
+   :alt: Spacebar
+
+Do this by pressing ``SpaceBar`` to bring up the operator search dialog and type in "Move X by One" (the ``bl_label``),
+then press ``Enter``.
+
+
+
+The objects should move as before.
+
+*Keep this addon open in Blender for the next step - Installing.*
+
+Install The Addon
+-----------------
+
+Once you have your addon within in Blender's text editor, you will want to be able to install it so it can be enabled in
+the user preferences to load on startup.
+
+Even though the addon above is a test, lets go through the steps anyway so you know how to do it for later.
+
+To install the Blender text as an addon you will first have to save it to disk, take care to obey the naming
+restrictions that apply to Python modules and end with a ``.py`` extension.
+
+Once the file is on disk, you can install it as you would for an addon downloaded online.
+
+Open the user **File -> User Preferences**, Select the **Addon** section, press **Install Addon...** and select the file. 
+
+Now the addon will be listed and you can enable it by pressing the check-box, if you want it to be enabled on restart,
+press **Save as Default**.
+
+.. note::
+
+   The destination of the addon depends on your Blender configuration.
+   When installing an addon the source and destination path are printed in the console.
+   You can also find addon path locations by running this in the Python console.
+
+   .. code-block:: python
+
+      import addon_utils
+      print(addon_utils.paths())
+
+   More is written on this topic here:
+   `Directory Layout <http://wiki.blender.org/index.php/Doc:2.6/Manual/Introduction/Installing_Blender/DirectoryLayout>`_
+
+
+Your Second Addon
+=================
+
+For our second addon, we will focus on object instancing - this is - to make linked copies of an object in a
+similar way to what you may have seen with the array modifier.
+
+
+Write The Script
+----------------
+
+As before, first we will start with a script, develop it, then convert into an addon.
+
+.. code-block:: python
+
+   import bpy
+   from bpy import context
+
+   # Get the current scene
+   scene = context.scene
+
+   # Get the 3D cursor
+   cursor = scene.cursor_location
+
+   # Get the active object (assume we have one)
+   obj = scene.objects.active
+
+   # Now make a copy of the object
+   obj_new = obj.copy()
+
+   # The object won't automatically get into a new scene
+   scene.objects.link(obj_new)
+
+   # Now we can place the object
+   obj_new.location = cursor
+
+
+Now try copy this script into Blender and run it on the default cube.
+Make sure you click to move the 3D cursor before running as the duplicate will appear at the cursor's location.
+
+
+... go off and test ...
+
+
+After running, notice that when you go into edit-mode to change the cube - all of the copies change,
+in Blender this is known as *Linked-Duplicates*.
+
+
+Next, we're going to do this in a loop, to make an array of objects between the active object and the cursor.
+
+
+.. code-block:: python
+
+   import bpy
+   from bpy import context
+
+   scene = context.scene
+   cursor = scene.cursor_location
+   obj = scene.objects.active
+
+   # Use a fixed value for now, eventually make this user adjustable
+   total = 10
+
+   # Add 'total' objects into the scene
+   for i in range(total):
+       obj_new = obj.copy()
+       scene.objects.link(obj_new)
+
+       # Now place the object in between the cursor
+       # and the active object based on 'i'
+       factor = i / total
+       obj_new.location = (obj.location * factor) + (cursor * (1.0 - factor))
+
+
+Try run this script with with the active object and the cursor spaced apart to see the result.
+
+With this script you'll notice we're doing some math with the object location and cursor, this works because both are
+3D :class:`mathutils.Vector` instances, a convenient class provided by the :mod:`mathutils` module and
+allows vectors to be multiplied by numbers and matrices.
+
+If you are interested in this area, read into :class:`mathutils.Vector` - there are many handy utility functions
+such as getting the angle between vectors, cross product, dot products
+as well as more advanced functions in :mod:`mathutils.geometry` such as bezier spline interpolation and
+ray-triangle intersection.
+
+For now we'll focus on making this script an addon, but its good to know that this 3D math module is available and
+can help you with more advanced functionality later on.
+
+
+Write the Addon
+---------------
+
+The first step is to convert the script as-is into an addon.
+
+
+.. code-block:: python
+
+   bl_info = {
+       "name": "Cursor Array",
+       "category": "Object",
+   }
+
+   import bpy
+
+
+   class ObjectCursorArray(bpy.types.Operator):
+       """Object Cursor Array"""
+       bl_idname = "object.cursor_array"
+       bl_label = "Cursor Array"
+       bl_options = {'REGISTER', 'UNDO'}
+
+       def execute(self, context):
+           scene = context.scene
+           cursor = scene.cursor_location
+           obj = scene.objects.active
+
+           total = 10
+
+           for i in range(total):
+               obj_new = obj.copy()
+               scene.objects.link(obj_new)
+
+               factor = i / total
+               obj_new.location = (obj.location * factor) + (cursor * (1.0 - factor))
+
+           return {'FINISHED'}
+
+   def register():
+       bpy.utils.register_class(ObjectCursorArray)
+
+
+   def unregister():
+       bpy.utils.unregister_class(ObjectCursorArray)
+
+
+   if __name__ == "__main__":
+       register()
+
+
+Everything here has been covered in the previous steps, you may want to try run the addon still
+and consider what could be done to make it more useful.
+
+
+... go off and test ...
+
+
+The two of the most obvious missing things are - having the total fixed at 10, and having to access the operator from
+space-bar is not very convenient.
+
+Both these additions are explained next, with the final script afterwards.
+
+
+Operator Property
+^^^^^^^^^^^^^^^^^
+
+There are a variety of property types that are used for tool settings, common property types include:
+int, float, vector, color, boolean and string.
+
+These properties are handled differently to typical Python class attributes
+because Blender needs to be display them in the interface,
+store their settings in key-maps and keep settings for re-use.
+
+While this is handled in a fairly Pythonic way, be mindful that you are in fact defining tool settings that
+are loaded into Blender and accessed by other parts of Blender, outside of Python.
+
+
+To get rid of the literal 10 for `total`, we'll us an operator property.
+Operator properties are defined via bpy.props module, this is added to the class body.
+
+.. code-block:: python
+
+   # moved assignment from execute() to the body of the class...
+   total = bpy.props.IntProperty(name="Steps", default=2, min=1, max=100)
+
+   # and this is accessed on the class
+   # instance within the execute() function as...
+   self.total
+
+
+These properties from :mod:`bpy.props` are handled specially by Blender when the class is registered
+so they display as buttons in the user interface.
+There are many arguments you can pass to properties to set limits, change the default and display a tooltip.
+
+.. seealso:: :mod:`bpy.props.IntProperty`
+
+This document doesn't go into details about using other property types,
+however the link above includes examples of more advanced property usage.
+
+
+Menu Item
+^^^^^^^^^
+
+Addons can add to the user interface of existing panels, headers and menus defined in Python.
+
+For this example we'll add to an existing menu.
+
+.. image:: menu_id.png
+   :width: 334px
+   :align: center
+   :height: 128px
+   :alt: Menu Identifier
+
+To find the identifier of a menu you can hover your mouse over the menu item and the identifier is displayed.
+
+The method used for adding a menu item is to append a draw function into an existing class.
+
+
+.. code-block:: python
+
+   def menu_func(self, context):
+       self.layout.operator(ObjectCursorArray.bl_idname)
+
+   def register():
+       bpy.types.VIEW3D_MT_object.append(menu_func)
+
+
+For docs on extending menus see: :doc:`bpy.types.Menu`.
+
+
+Keymap
+^^^^^^
+
+In Blender addons have their own key-maps so as not to interfere with Blenders built in key-maps.
+
+In the example below, a new object-mode :class:`bpy.types.KeyMap` is added,
+then a :class:`bpy.types.KeyMapItem` is added to the key-map which references our newly added operator,
+using :kbd:`Ctrl-Shift-Space` as the key shortcut to activate it.
+
+
+.. code-block:: python
+
+   # store keymaps here to access after registration
+   addon_keymaps = []
+
+   def register():
+
+       # handle the keymap
+       wm = bpy.context.window_manager
+       km = wm.keyconfigs.addon.keymaps.new(name='Object Mode', space_type='EMPTY')
+
+       kmi = km.keymap_items.new(ObjectCursorArray.bl_idname, 'SPACE', 'PRESS', ctrl=True, shift=True)
+       kmi.properties.total = 4
+
+       addon_keymaps.append(km)
+
+
+   def unregister():
+
+       # handle the keymap
+       wm = bpy.context.window_manager
+       for km in addon_keymaps:
+           wm.keyconfigs.addon.keymaps.remove(km)
+       # clear the list
+       addon_keymaps.clear()
+
+
+Notice how the key-map item can have a different ``total`` setting then the default set by the operator,
+this allows you to have multiple keys accessing the same operator with different settings.
+
+
+.. note::
+
+   While :kbd:`Ctrl-Shift-Space` isn't a default Blender key shortcut, its hard to make sure addons won't
+   overwrite each others keymaps, At least take care when assigning keys that they don't
+   conflict with important functionality within Blender.
+
+For API documentation on the functions listed above, see:
+:class:`bpy.types.KeyMaps.new`,
+:class:`bpy.types.KeyMap`,
+:class:`bpy.types.KeyMapItems.new`,
+:class:`bpy.types.KeyMapItem`.
+
+
+Bringing it all together
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+
+   bl_info = {
+       "name": "Cursor Array",
+       "category": "Object",
+   }
+
+   import bpy
+
+
+   class ObjectCursorArray(bpy.types.Operator):
+       """Object Cursor Array"""
+       bl_idname = "object.cursor_array"
+       bl_label = "Cursor Array"
+       bl_options = {'REGISTER', 'UNDO'}
+
+       total = bpy.props.IntProperty(name="Steps", default=2, min=1, max=100)
+
+       def execute(self, context):
+           scene = context.scene
+           cursor = scene.cursor_location
+           obj = scene.objects.active
+
+           for i in range(self.total):
+               obj_new = obj.copy()
+               scene.objects.link(obj_new)
+
+               factor = i / self.total
+               obj_new.location = (obj.location * factor) + (cursor * (1.0 - factor))
+
+           return {'FINISHED'}
+
+
+   def menu_func(self, context):
+       self.layout.operator(ObjectCursorArray.bl_idname)
+
+   # store keymaps here to access after registration
+   addon_keymaps = []
+
+
+   def register():
+       bpy.utils.register_class(ObjectCursorArray)
+       bpy.types.VIEW3D_MT_object.append(menu_func)
+
+       # handle the keymap
+       wm = bpy.context.window_manager
+       km = wm.keyconfigs.addon.keymaps.new(name='Object Mode', space_type='EMPTY')
+       kmi = km.keymap_items.new(ObjectCursorArray.bl_idname, 'SPACE', 'PRESS', ctrl=True, shift=True)
+       kmi.properties.total = 4
+       addon_keymaps.append(km)
+
+   def unregister():
+       bpy.utils.unregister_class(ObjectCursorArray)
+       bpy.types.VIEW3D_MT_object.remove(menu_func)
+
+       # handle the keymap
+       wm = bpy.context.window_manager
+       for km in addon_keymaps:
+           wm.keyconfigs.addon.keymaps.remove(km)
+       # clear the list
+       del addon_keymaps[:]
+
+
+   if __name__ == "__main__":
+       register()
+
+.. image:: in_menu.png
+   :width: 591px
+   :align: center
+   :height: 649px
+   :alt: In the menu
+
+Run the script (or save it and add it through the Preferences like before) and it will appear in the menu.
+
+.. image:: op_prop.png
+   :width: 669px
+   :align: center
+   :height: 644px
+   :alt: Operator Property
+
+After selecting it from the menu, you can choose how many instance of the cube you want created.
+
+
+.. note::
+
+   Directly executing the script multiple times will add the menu each time too.
+   While not useful behavior, theres nothing to worry about since addons won't register them selves multiple
+   times when enabled through the user preferences.
+
+
+Conclusions
+===========
+
+Addons can encapsulate certain functionality neatly for writing tools to improve your work-flow or for writing utilities
+for others to use.
+
+While there are limits to what Python can do within Blender, there is certainly a lot that can be achieved without
+having to dive into Blender's C/C++ code.
+
+The example given in the tutorial is limited, but shows the Blender API used for common tasks that you can expand on
+to write your own tools.
+
+
+Further Reading
+---------------
+
+Blender comes commented templates which are accessible from the text editor header, if you have specific areas
+you want to see example code for, this is a good place to start.
+
+
+Here are some sites you might like to check on after completing this tutorial.
+
+* :ref:`Blender/Python API Overview <info_overview>` -
+  *For more background details on Blender/Python integration.*
+
+* `How to Think Like a Computer Scientist <http://interactivepython.org/courselib/static/thinkcspy/index.html>`_ -
+  *Great info for those who are still learning Python.*
+
+* `Blender Development (Wiki) <http://wiki.blender.org/index.php/Dev:Contents>`_ -
+  *Blender Development, general information and helpful links.*
+
+* `Blender Artists (Coding Section) <http://blenderartists.org/forum/forumdisplay.php?47-Coding>`_ -
+  *forum where people ask Python development questions*
+
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index dd7019d43a3..d79c4e8fa9a 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -317,6 +317,8 @@ RST_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "rst"))
 INFO_DOCS = (
     ("info_quickstart.rst", "Blender/Python Quickstart: new to blender/scripting and want to get your feet wet?"),
     ("info_overview.rst", "Blender/Python API Overview: a more complete explanation of python integration"),
+    ("info_tutorial_addon.rst", "Blender/Python Addon Tutorial: a step by step guide on how to write an addon from scratch"),
+    ("info_api_reference.rst", "Blender/Python API Reference Usage: examples of how to use the API reference docs"),
     ("info_best_practice.rst", "Best Practice: Conventions to follow for writing good scripts"),
     ("info_tips_and_tricks.rst", "Tips and Tricks: Hints to help you while writing scripts for blender"),
     ("info_gotcha.rst", "Gotcha's: some of the problems you may come up against when writing scripts"),
@@ -1546,8 +1548,8 @@ def write_rst_contents(basepath):
         "mathutils", "mathutils.geometry", "mathutils.noise",
         # misc
         "Freestyle", "bgl", "blf", "gpu", "aud", "bpy_extras",
-        # bmesh
-        "bmesh", "bmesh.types", "bmesh.utils", "bmesh.ops",
+        # bmesh, submodules are in own page
+        "bmesh",
         )
 
     for mod in standalone_modules:
@@ -1733,6 +1735,11 @@ def copy_handwritten_rsts(basepath):
     # changelog
     shutil.copy2(os.path.join(RST_DIR, "change_log.rst"), basepath)
 
+    # copy images, could be smarter but just glob for now.
+    for f in os.listdir(RST_DIR):
+        if f.endswith(".png"):
+            shutil.copy2(os.path.join(RST_DIR, f), basepath)
+
 
 def rna2sphinx(basepath):
 
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 38be34add75..ebc5953d956 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -102,6 +102,8 @@ set(SRC
 	libmv/multiview/conditioning.h
 	libmv/multiview/euclidean_resection.h
 	libmv/multiview/fundamental.h
+	libmv/multiview/homography.h
+	libmv/multiview/homography_parameterization.h
 	libmv/multiview/nviewtriangulation.h
 	libmv/multiview/projection.h
 	libmv/multiview/resection.h
@@ -131,6 +133,7 @@ set(SRC
 	libmv/tracking/pyramid_region_tracker.h
 	libmv/tracking/region_tracker.h
 	libmv/tracking/retrack_region_tracker.h
+	libmv/tracking/track_region.h
 	libmv/tracking/trklt_region_tracker.h
 
 	third_party/fast/fast.h
diff --git a/extern/libmv/libmv-capi.cpp b/extern/libmv/libmv-capi.cpp
index c1788cc9422..8e483abd386 100644
--- a/extern/libmv/libmv-capi.cpp
+++ b/extern/libmv/libmv-capi.cpp
@@ -900,7 +900,7 @@ void libmv_CameraIntrinsicsUpdate(struct libmv_CameraIntrinsics *libmvIntrinsics
 		intrinsics->SetFocalLength(focal_length, focal_length);
 
 	if (intrinsics->principal_point_x() != principal_x || intrinsics->principal_point_y() != principal_y)
-		intrinsics->SetFocalLength(focal_length, focal_length);
+		intrinsics->SetPrincipalPoint(principal_x, principal_y);
 
 	if (intrinsics->k1() != k1 || intrinsics->k2() != k2 || intrinsics->k3() != k3)
 		intrinsics->SetRadialDistortion(k1, k2, k3);
diff --git a/intern/audaspace/intern/AUD_LinearResampleReader.cpp b/intern/audaspace/intern/AUD_LinearResampleReader.cpp
index 6aa0faed863..b342b8f31fb 100644
--- a/intern/audaspace/intern/AUD_LinearResampleReader.cpp
+++ b/intern/audaspace/intern/AUD_LinearResampleReader.cpp
@@ -81,7 +81,7 @@ void AUD_LinearResampleReader::read(int& length, bool& eos, sample_t* buffer)
 	int samplesize = AUD_SAMPLE_SIZE(specs);
 	int size = length;
 	float factor = m_rate / m_reader->getSpecs().rate;
-	float spos;
+	float spos = 0.0f;
 	sample_t low, high;
 	eos = false;
 
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 4a651eb5aab..ba931469e8a 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1026,6 +1026,8 @@ def get_panels():
         bpy.types.TEXTURE_PT_voxeldata,
         bpy.types.TEXTURE_PT_pointdensity,
         bpy.types.TEXTURE_PT_pointdensity_turbulence,
+        bpy.types.TEXTURE_PT_mapping,
+        bpy.types.TEXTURE_PT_influence,
         bpy.types.PARTICLE_PT_context_particles,
         bpy.types.PARTICLE_PT_emission,
         bpy.types.PARTICLE_PT_hair_dynamics,
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index da06f1d0a38..c9380d8d58b 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -445,7 +445,7 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen
 		}
 		case BL::ShaderNode::type_SCRIPT: {
 #ifdef WITH_OSL
-			if(scene->params.shadingsystem != SceneParams::OSL)
+			if(!scene->shader_manager->use_osl())
 				break;
 
 			/* create script node */
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h
index 4feb8b556d5..0a9f2dd06aa 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -367,12 +367,22 @@ struct ObjectKey {
 
 	bool operator<(const ObjectKey& k) const
 	{
-		return (parent < k.parent) ||
-		       (parent == k.parent && (memcmp(id, k.id, sizeof(id)) < 0)) ||
-		       (memcmp(id, k.id, sizeof(id)) == 0 && ob < k.ob);
+		if(ob < k.ob) {
+			return true;
+		}
+		else if(ob == k.ob) {
+			if(parent < k.parent)
+				return true;
+			else if(parent == k.parent)
+				return memcmp(id, k.id, sizeof(id)) < 0;
+		}
+
+		return false;
 	}
 };
 
+/* Particle System Key */
+
 struct ParticleSystemKey {
 	void *ob;
 	int id[OBJECT_PERSISTENT_ID_SIZE];
@@ -389,8 +399,12 @@ struct ParticleSystemKey {
 	bool operator<(const ParticleSystemKey& k) const
 	{
 		/* first id is particle index, we don't compare that */
-		return (ob < k.ob) ||
-		       (ob == k.ob && (memcmp(id+1, k.id+1, sizeof(int)*(OBJECT_PERSISTENT_ID_SIZE-1)) < 0));
+		if(ob < k.ob)
+			return true;
+		else if(ob == k.ob)
+			return memcmp(id+1, k.id+1, sizeof(int)*(OBJECT_PERSISTENT_ID_SIZE-1)) < 0;
+
+		return false;
 	}
 };
 
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index bc280616615..a1d7706a34e 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -23,9 +23,12 @@
 #include "device_intern.h"
 
 #include "kernel.h"
+#include "kernel_compat_cpu.h"
 #include "kernel_types.h"
+#include "kernel_globals.h"
 
 #include "osl_shader.h"
+#include "osl_globals.h"
 
 #include "buffers.h"
 
@@ -43,11 +46,16 @@ class CPUDevice : public Device
 {
 public:
 	TaskPool task_pool;
-	KernelGlobals *kg;
+	KernelGlobals kernel_globals;
+#ifdef WITH_OSL
+	OSLGlobals osl_globals;
+#endif
 	
 	CPUDevice(Stats &stats) : Device(stats)
 	{
-		kg = kernel_globals_create();
+#ifdef WITH_OSL
+		kernel_globals.osl = &osl_globals;
+#endif
 
 		/* do now to avoid thread issues */
 		system_cpu_support_optimized();
@@ -56,7 +64,6 @@ public:
 	~CPUDevice()
 	{
 		task_pool.stop();
-		kernel_globals_free(kg);
 	}
 
 	bool support_advanced_shading()
@@ -95,12 +102,12 @@ public:
 
 	void const_copy_to(const char *name, void *host, size_t size)
 	{
-		kernel_const_copy(kg, name, host, size);
+		kernel_const_copy(&kernel_globals, name, host, size);
 	}
 
 	void tex_alloc(const char *name, device_memory& mem, bool interpolation, bool periodic)
 	{
-		kernel_tex_copy(kg, name, mem.data_pointer, mem.data_width, mem.data_height);
+		kernel_tex_copy(&kernel_globals, name, mem.data_pointer, mem.data_width, mem.data_height);
 		mem.device_pointer = mem.data_pointer;
 
 		stats.mem_alloc(mem.memory_size());
@@ -116,7 +123,7 @@ public:
 	void *osl_memory()
 	{
 #ifdef WITH_OSL
-		return kernel_osl_memory(kg);
+		return &osl_globals;
 #else
 		return NULL;
 #endif
@@ -148,9 +155,10 @@ public:
 				return;
 		}
 
+		KernelGlobals kg = kernel_globals;
+
 #ifdef WITH_OSL
-		if(kernel_osl_use(kg))
-			OSLShader::thread_init(kg);
+		OSLShader::thread_init(&kg, &kernel_globals, &osl_globals);
 #endif
 
 		RenderTile tile;
@@ -171,7 +179,7 @@ public:
 
 					for(int y = tile.y; y < tile.y + tile.h; y++) {
 						for(int x = tile.x; x < tile.x + tile.w; x++) {
-							kernel_cpu_optimized_path_trace(kg, render_buffer, rng_state,
+							kernel_cpu_optimized_path_trace(&kg, render_buffer, rng_state,
 								sample, x, y, tile.offset, tile.stride);
 						}
 					}
@@ -192,7 +200,7 @@ public:
 
 					for(int y = tile.y; y < tile.y + tile.h; y++) {
 						for(int x = tile.x; x < tile.x + tile.w; x++) {
-							kernel_cpu_path_trace(kg, render_buffer, rng_state,
+							kernel_cpu_path_trace(&kg, render_buffer, rng_state,
 								sample, x, y, tile.offset, tile.stride);
 						}
 					}
@@ -212,8 +220,7 @@ public:
 		}
 
 #ifdef WITH_OSL
-		if(kernel_osl_use(kg))
-			OSLShader::thread_free(kg);
+		OSLShader::thread_free(&kg);
 #endif
 	}
 
@@ -223,7 +230,7 @@ public:
 		if(system_cpu_support_optimized()) {
 			for(int y = task.y; y < task.y + task.h; y++)
 				for(int x = task.x; x < task.x + task.w; x++)
-					kernel_cpu_optimized_tonemap(kg, (uchar4*)task.rgba, (float*)task.buffer,
+					kernel_cpu_optimized_tonemap(&kernel_globals, (uchar4*)task.rgba, (float*)task.buffer,
 						task.sample, task.resolution, x, y, task.offset, task.stride);
 		}
 		else
@@ -231,22 +238,23 @@ public:
 		{
 			for(int y = task.y; y < task.y + task.h; y++)
 				for(int x = task.x; x < task.x + task.w; x++)
-					kernel_cpu_tonemap(kg, (uchar4*)task.rgba, (float*)task.buffer,
+					kernel_cpu_tonemap(&kernel_globals, (uchar4*)task.rgba, (float*)task.buffer,
 						task.sample, task.resolution, x, y, task.offset, task.stride);
 		}
 	}
 
 	void thread_shader(DeviceTask& task)
 	{
+		KernelGlobals kg = kernel_globals;
+
 #ifdef WITH_OSL
-		if(kernel_osl_use(kg))
-			OSLShader::thread_init(kg);
+		OSLShader::thread_init(&kg, &kernel_globals, &osl_globals);
 #endif
 
 #ifdef WITH_OPTIMIZED_KERNEL
 		if(system_cpu_support_optimized()) {
 			for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) {
-				kernel_cpu_optimized_shader(kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x);
+				kernel_cpu_optimized_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x);
 
 				if(task_pool.cancelled())
 					break;
@@ -256,7 +264,7 @@ public:
 #endif
 		{
 			for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) {
-				kernel_cpu_shader(kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x);
+				kernel_cpu_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x);
 
 				if(task_pool.cancelled())
 					break;
@@ -264,8 +272,7 @@ public:
 		}
 
 #ifdef WITH_OSL
-		if(kernel_osl_use(kg))
-			OSLShader::thread_free(kg);
+		OSLShader::thread_free(&kg);
 #endif
 	}
 
diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript
index 14890164a42..730f758194e 100644
--- a/intern/cycles/kernel/SConscript
+++ b/intern/cycles/kernel/SConscript
@@ -32,16 +32,17 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
     kernel_file = os.path.join(source_dir, "kernel.cu")
     util_dir = os.path.join(source_dir, "../util")
     svm_dir = os.path.join(source_dir, "../svm")
+    closure_dir = os.path.join(source_dir, "../closure")
 
     # nvcc flags
     nvcc_flags = "-m%s" % (bits)
     nvcc_flags += " --cubin --ptxas-options=\"-v\" --maxrregcount=24"
     nvcc_flags += " --opencc-options -OPT:Olimit=0"
     nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
-    nvcc_flags += " -I \"%s\" -I \"%s\"" % (util_dir, svm_dir)
+    nvcc_flags += " -I \"%s\" -I \"%s\" -I \"%s\"" % (util_dir, svm_dir, closure_dir)
 
     # dependencies
-    dependencies = ['kernel.cu'] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h')
+    dependencies = ['kernel.cu'] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h') + kernel.Glob('closure/*.h')
     last_cubin_file = None
 
     # add command for each cuda architecture
diff --git a/intern/cycles/kernel/kernel.cpp b/intern/cycles/kernel/kernel.cpp
index 62d79bdd946..d760e63a290 100644
--- a/intern/cycles/kernel/kernel.cpp
+++ b/intern/cycles/kernel/kernel.cpp
@@ -29,38 +29,6 @@
 
 CCL_NAMESPACE_BEGIN
 
-/* Globals */
-
-KernelGlobals *kernel_globals_create()
-{
-	KernelGlobals *kg = new KernelGlobals();
-#ifdef WITH_OSL
-	kg->osl.use = false;
-#endif
-	return kg;
-}
-
-void kernel_globals_free(KernelGlobals *kg)
-{
-	delete kg;
-}
-
-/* OSL */
-
-#ifdef WITH_OSL
-
-void *kernel_osl_memory(KernelGlobals *kg)
-{
-	return (void*)&kg->osl;
-}
-
-bool kernel_osl_use(KernelGlobals *kg)
-{
-	return kg->osl.use;
-}
-
-#endif
-
 /* Memory Copy */
 
 void kernel_const_copy(KernelGlobals *kg, const char *name, void *host, size_t size)
diff --git a/intern/cycles/kernel/kernel_attribute.h b/intern/cycles/kernel/kernel_attribute.h
index 2774f5e924b..b7ad731c883 100644
--- a/intern/cycles/kernel/kernel_attribute.h
+++ b/intern/cycles/kernel/kernel_attribute.h
@@ -19,13 +19,6 @@
 #ifndef __KERNEL_ATTRIBUTE_CL__
 #define __KERNEL_ATTRIBUTE_CL__
 
-#include "util_types.h"
-
-#ifdef __OSL__
-#include <string>
-#include "util_attribute.h"
-#endif
-
 CCL_NAMESPACE_BEGIN
 
 /* note: declared in kernel.h, have to add it here because kernel.h is not available */
@@ -33,20 +26,9 @@ bool kernel_osl_use(KernelGlobals *kg);
 
 __device_inline int find_attribute(KernelGlobals *kg, ShaderData *sd, uint id)
 {
-
 #ifdef __OSL__
-	if (kernel_osl_use(kg)) {
-		/* for OSL, a hash map is used to lookup the attribute by name. */
-		OSLGlobals::AttributeMap &attr_map = kg->osl.attribute_map[sd->object];
-		ustring stdname(std::string("std::") + std::string(attribute_standard_name((AttributeStandard)id)));
-		OSLGlobals::AttributeMap::const_iterator it = attr_map.find(stdname);
-		if (it != attr_map.end()) {
-			const OSLGlobals::Attribute &osl_attr = it->second;
-			/* return result */
-			return (osl_attr.elem == ATTR_ELEMENT_NONE) ? (int)ATTR_STD_NOT_FOUND : osl_attr.offset;
-		}
-		else
-			return (int)ATTR_STD_NOT_FOUND;
+	if (kg->osl) {
+		return OSLShader::find_attribute(kg, sd, id);
 	}
 	else
 #endif
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index 1e56c11ab90..529b7b8768f 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -18,14 +18,6 @@
 
 /* Constant Globals */
 
-#ifdef __KERNEL_CPU__
-
-#ifdef __OSL__
-#include "osl_globals.h"
-#endif
-
-#endif
-
 CCL_NAMESPACE_BEGIN
 
 /* On the CPU, we pass along the struct KernelGlobals to nearly everywhere in
@@ -35,6 +27,12 @@ CCL_NAMESPACE_BEGIN
 
 #ifdef __KERNEL_CPU__
 
+#ifdef __OSL__
+struct OSLGlobals;
+struct OSLThreadData;
+struct OSLShadingSystem;
+#endif
+
 #define MAX_BYTE_IMAGES   512
 #define MAX_FLOAT_IMAGES  5
 
@@ -51,7 +49,9 @@ typedef struct KernelGlobals {
 #ifdef __OSL__
 	/* On the CPU, we also have the OSL globals here. Most data structures are shared
 	 * with SVM, the difference is in the shaders and object/mesh attributes. */
-	OSLGlobals osl;
+	OSLGlobals *osl;
+	OSLShadingSystem *osl_ss;
+	OSLThreadData *osl_tdata;
 #endif
 
 } KernelGlobals;
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index 195291898c6..3588b09c790 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -16,10 +16,16 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#ifdef __OSL__
+#include "osl_shader.h"
+#endif
+
 #include "kernel_differential.h"
 #include "kernel_montecarlo.h"
 #include "kernel_projection.h"
 #include "kernel_object.h"
+#include "kernel_attribute.h"
+#include "kernel_projection.h"
 #include "kernel_triangle.h"
 #ifdef __QBVH__
 #include "kernel_qbvh.h"
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index 879160312cf..98a7ec59d7b 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -26,10 +26,6 @@
  *
  */
 
-#ifdef __OSL__
-#include "osl_shader.h"
-#endif
-
 #include "closure/bsdf.h"
 #include "closure/emissive.h"
 #include "closure/volume.h"
@@ -61,7 +57,7 @@ __device_inline void shader_setup_from_ray(KernelGlobals *kg, ShaderData *sd,
 	const Intersection *isect, const Ray *ray)
 {
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		OSLShader::init(kg, sd);
 #endif
 
@@ -147,7 +143,7 @@ __device void shader_setup_from_sample(KernelGlobals *kg, ShaderData *sd,
 	int shader, int object, int prim, float u, float v, float t, float time)
 {
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		OSLShader::init(kg, sd);
 #endif
 
@@ -278,7 +274,7 @@ __device void shader_setup_from_displace(KernelGlobals *kg, ShaderData *sd,
 __device_inline void shader_setup_from_background(KernelGlobals *kg, ShaderData *sd, const Ray *ray)
 {
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		OSLShader::init(kg, sd);
 #endif
 
@@ -387,7 +383,7 @@ __device void shader_bsdf_eval(KernelGlobals *kg, const ShaderData *sd,
 	bsdf_eval_init(eval, NBUILTIN_CLOSURES, make_float3(0.0f, 0.0f, 0.0f), kernel_data.film.use_light_pass);
 
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		return _shader_bsdf_multi_eval_osl(sd, omega_in, pdf, -1, eval, 0.0f, 0.0f);
 	else
 #endif
@@ -444,7 +440,7 @@ __device int shader_bsdf_sample(KernelGlobals *kg, const ShaderData *sd,
 
 	*pdf = 0.0f;
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		label = OSLShader::bsdf_sample(sd, sc, randu, randv, eval, *omega_in, *domega_in, *pdf);
 	else
 #endif
@@ -456,7 +452,7 @@ __device int shader_bsdf_sample(KernelGlobals *kg, const ShaderData *sd,
 		if(sd->num_closure > 1) {
 			float sweight = sc->sample_weight;
 #ifdef __OSL__
-			if (kernel_osl_use(kg))
+			if (kg->osl)
 				_shader_bsdf_multi_eval_osl(sd, *omega_in, pdf, sampled, bsdf_eval, *pdf*sweight, sweight);
 			else
 #endif
@@ -483,7 +479,7 @@ __device int shader_bsdf_sample_closure(KernelGlobals *kg, const ShaderData *sd,
 
 	*pdf = 0.0f;
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		label = OSLShader::bsdf_sample(sd, sc, randu, randv, eval, *omega_in, *domega_in, *pdf);
 	else
 #endif
@@ -503,7 +499,7 @@ __device void shader_bsdf_blur(KernelGlobals *kg, ShaderData *sd, float roughnes
 
 		if(CLOSURE_IS_BSDF(sc->type)) {
 #ifdef __OSL__
-			if (kernel_osl_use(kg))
+			if (kg->osl)
 				OSLShader::bsdf_blur(sc, roughness);
 			else
 #endif
@@ -650,7 +646,7 @@ __device float3 shader_emissive_eval(KernelGlobals *kg, ShaderData *sd)
 
 		if(CLOSURE_IS_EMISSION(sc->type)) {
 #ifdef __OSL__
-			if (kernel_osl_use(kg))
+			if (kg->osl)
 				eval += OSLShader::emissive_eval(sd, sc)*sc->weight;
 			else
 #endif
@@ -694,7 +690,7 @@ __device void shader_eval_surface(KernelGlobals *kg, ShaderData *sd,
 	float randb, int path_flag)
 {
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		OSLShader::eval_surface(kg, sd, randb, path_flag);
 	else
 #endif
@@ -702,7 +698,7 @@ __device void shader_eval_surface(KernelGlobals *kg, ShaderData *sd,
 #ifdef __SVM__
 		svm_eval_nodes(kg, sd, SHADER_TYPE_SURFACE, randb, path_flag);
 #else
-		bsdf_diffuse_setup(sd, &sd->closure);
+		bsdf_diffuse_setup(&sd->closure);
 		sd->closure.weight = make_float3(0.8f, 0.8f, 0.8f);
 #endif
 	}
@@ -713,7 +709,7 @@ __device void shader_eval_surface(KernelGlobals *kg, ShaderData *sd,
 __device float3 shader_eval_background(KernelGlobals *kg, ShaderData *sd, int path_flag)
 {
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		return OSLShader::eval_background(kg, sd, path_flag);
 	else
 #endif
@@ -759,7 +755,7 @@ __device float3 shader_volume_eval_phase(KernelGlobals *kg, ShaderData *sd,
 
 		if(CLOSURE_IS_VOLUME(sc->type)) {
 #ifdef __OSL__
-			if (kernel_osl_use(kg))
+			if (kg->osl)
 				eval += OSLShader::volume_eval_phase(sc, omega_in, omega_out);
 			else
 #endif
@@ -780,7 +776,7 @@ __device void shader_eval_volume(KernelGlobals *kg, ShaderData *sd,
 {
 #ifdef __SVM__
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		OSLShader::eval_volume(kg, sd, randb, path_flag);
 	else
 #endif
@@ -795,7 +791,7 @@ __device void shader_eval_displacement(KernelGlobals *kg, ShaderData *sd)
 	/* this will modify sd->P */
 #ifdef __SVM__
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		OSLShader::eval_displacement(kg, sd);
 	else
 #endif
@@ -851,7 +847,7 @@ __device void shader_merge_closures(KernelGlobals *kg, ShaderData *sd)
 __device void shader_release(KernelGlobals *kg, ShaderData *sd)
 {
 #ifdef __OSL__
-	if (kernel_osl_use(kg))
+	if (kg->osl)
 		OSLShader::release(kg, sd);
 #endif
 }
diff --git a/intern/cycles/kernel/kernel_triangle.h b/intern/cycles/kernel/kernel_triangle.h
index e39ae1d4fbc..0db447289c8 100644
--- a/intern/cycles/kernel/kernel_triangle.h
+++ b/intern/cycles/kernel/kernel_triangle.h
@@ -16,9 +16,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "kernel_attribute.h"
-#include "kernel_projection.h"
-
 CCL_NAMESPACE_BEGIN
 
 /* Point on triangle for Moller-Trumbore triangles */
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index f519fd989fa..e3a766e56b1 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -366,9 +366,6 @@ typedef struct ShaderClosure {
 	float sample_weight;
 #endif
 
-#ifdef __OSL__
-	void *prim;
-#endif
 	float data0;
 	float data1;
 
@@ -377,6 +374,9 @@ typedef struct ShaderClosure {
 	float3 T;
 #endif
 
+#ifdef __OSL__
+	void *prim;
+#endif
 } ShaderClosure;
 
 /* Shader Data
@@ -403,7 +403,8 @@ enum ShaderDataFlag {
 
 	/* object flags */
 	SD_HOLDOUT_MASK = 4096,				/* holdout for camera rays */
-	SD_OBJECT_MOTION = 8192				/* has object motion blur */
+	SD_OBJECT_MOTION = 8192,			/* has object motion blur */
+	SD_TRANSFORM_APPLIED = 16384 		/* vertices have transform applied */
 };
 
 typedef struct ShaderData {
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp
index d42d65608c8..f95859d237d 100644
--- a/intern/cycles/kernel/osl/osl_closures.cpp
+++ b/intern/cycles/kernel/osl/osl_closures.cpp
@@ -153,8 +153,9 @@ static void register_closure(OSL::ShadingSystem *ss, const char *name, int id, O
 	ss->register_closure(name, id, params, prepare, generic_closure_setup, generic_closure_compare);
 }
 
-void OSLShader::register_closures(OSL::ShadingSystem *ss)
+void OSLShader::register_closures(OSLShadingSystem *ss_)
 {
+	OSL::ShadingSystem *ss = (OSL::ShadingSystem*)ss_;
 	int id = 0;
 
 	register_closure(ss, "diffuse", id++,
diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h
index ce283023c5c..1a2a210de88 100644
--- a/intern/cycles/kernel/osl/osl_globals.h
+++ b/intern/cycles/kernel/osl/osl_globals.h
@@ -38,7 +38,14 @@ CCL_NAMESPACE_BEGIN
 class OSLRenderServices;
 
 struct OSLGlobals {
-	/* use */
+	OSLGlobals()
+	{
+		ss = NULL;
+		ts = NULL;
+		services = NULL;
+		use = false;
+	}
+
 	bool use;
 
 	/* shading system */
@@ -66,19 +73,12 @@ struct OSLGlobals {
 	vector<AttributeMap> attribute_map;
 	ObjectNameMap object_name_map;
 	vector<ustring> object_names;
+};
 
-	/* thread key for thread specific data lookup */
-	struct ThreadData {
-		OSL::ShaderGlobals globals;
-		OSL::PerThreadInfo *thread_info;
-	};
-
-	static tls_ptr(ThreadData, thread_data);
-	static thread_mutex thread_data_mutex;
-	static volatile int thread_data_users;
-
-	void thread_data_init();
-	void thread_data_free();
+/* thread key for thread specific data lookup */
+struct OSLThreadData {
+	OSL::ShaderGlobals globals;
+	OSL::PerThreadInfo *thread_info;
 };
 
 CCL_NAMESPACE_END
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index e593387093c..b584a54b1b7 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -23,6 +23,7 @@
 #include "scene.h"
 
 #include "osl_closures.h"
+#include "osl_globals.h"
 #include "osl_services.h"
 #include "osl_shader.h"
 
@@ -36,6 +37,8 @@
 #include "kernel_differential.h"
 #include "kernel_object.h"
 #include "kernel_bvh.h"
+#include "kernel_attribute.h"
+#include "kernel_projection.h"
 #include "kernel_triangle.h"
 #include "kernel_accumulate.h"
 #include "kernel_shader.h"
@@ -53,6 +56,34 @@ ustring OSLRenderServices::u_camera("camera");
 ustring OSLRenderServices::u_screen("screen");
 ustring OSLRenderServices::u_raster("raster");
 ustring OSLRenderServices::u_ndc("NDC");
+ustring OSLRenderServices::u_object_location("object:location");
+ustring OSLRenderServices::u_object_index("object:index");
+ustring OSLRenderServices::u_geom_dupli_generated("geom:dupli_generated");
+ustring OSLRenderServices::u_geom_dupli_uv("geom:dupli_uv");
+ustring OSLRenderServices::u_material_index("material:index");
+ustring OSLRenderServices::u_object_random("object:random");
+ustring OSLRenderServices::u_particle_index("particle:index");
+ustring OSLRenderServices::u_particle_age("particle:age");
+ustring OSLRenderServices::u_particle_lifetime("particle:lifetime");
+ustring OSLRenderServices::u_particle_location("particle:location");
+ustring OSLRenderServices::u_particle_rotation("particle:rotation");
+ustring OSLRenderServices::u_particle_size("particle:size");
+ustring OSLRenderServices::u_particle_velocity("particle:velocity");
+ustring OSLRenderServices::u_particle_angular_velocity("particle:angular_velocity");
+ustring OSLRenderServices::u_geom_numpolyvertices("geom:numpolyvertices");
+ustring OSLRenderServices::u_geom_trianglevertices("geom:trianglevertices");
+ustring OSLRenderServices::u_geom_polyvertices("geom:polyvertices");
+ustring OSLRenderServices::u_geom_name("geom:name");
+ustring OSLRenderServices::u_path_ray_length("path:ray_length");
+ustring OSLRenderServices::u_trace("trace");
+ustring OSLRenderServices::u_hit("hit");
+ustring OSLRenderServices::u_hitdist("hitdist");
+ustring OSLRenderServices::u_N("N");
+ustring OSLRenderServices::u_Ng("Ng");
+ustring OSLRenderServices::u_P("P");
+ustring OSLRenderServices::u_I("I");
+ustring OSLRenderServices::u_u("u");
+ustring OSLRenderServices::u_v("v");
 ustring OSLRenderServices::u_empty;
 
 OSLRenderServices::OSLRenderServices()
@@ -488,104 +519,108 @@ static void get_object_attribute(const OSLGlobals::Attribute& attr, bool derivat
 		memset((char *)val + datasize, 0, datasize * 2);
 }
 
-static bool get_object_standard_attribute(KernelGlobals *kg, ShaderData *sd, ustring name,
-                                          TypeDesc type, bool derivatives, void *val)
+bool OSLRenderServices::get_object_standard_attribute(KernelGlobals *kg, ShaderData *sd, ustring name,
+                                                      TypeDesc type, bool derivatives, void *val)
 {
-	/* todo: turn this into hash table returning int, which can be used in switch */
+	/* todo: turn this into hash table? */
 
 	/* Object Attributes */
-	if (name == "object:location") {
+	if (name == u_object_location) {
 		float3 f = object_location(kg, sd);
 		return set_attribute_float3(f, type, derivatives, val);
 	}
-	else if (name == "object:index") {
+	else if (name == u_object_index) {
 		float f = object_pass_id(kg, sd->object);
 		return set_attribute_float(f, type, derivatives, val);
 	}
-	else if (name == "geom:dupli_generated") {
+	else if (name == u_geom_dupli_generated) {
 		float3 f = object_dupli_generated(kg, sd->object);
 		return set_attribute_float3(f, type, derivatives, val);
 	}
-	else if (name == "geom:dupli_uv") {
+	else if (name == u_geom_dupli_uv) {
 		float3 f = object_dupli_uv(kg, sd->object);
 		return set_attribute_float3(f, type, derivatives, val);
 	}
-	else if (name == "material:index") {
+	else if (name == u_material_index) {
 		float f = shader_pass_id(kg, sd);
 		return set_attribute_float(f, type, derivatives, val);
 	}
-	else if (name == "object:random") {
+	else if (name == u_object_random) {
 		float f = object_random_number(kg, sd->object);
 		return set_attribute_float(f, type, derivatives, val);
 	}
 
 	/* Particle Attributes */
-	else if (name == "particle:index") {
+	else if (name == u_particle_index) {
 		uint particle_id = object_particle_id(kg, sd->object);
 		float f = particle_index(kg, particle_id);
 		return set_attribute_float(f, type, derivatives, val);
 	}
-	else if (name == "particle:age") {
+	else if (name == u_particle_age) {
 		uint particle_id = object_particle_id(kg, sd->object);
 		float f = particle_age(kg, particle_id);
 		return set_attribute_float(f, type, derivatives, val);
 	}
-	else if (name == "particle:lifetime") {
+	else if (name == u_particle_lifetime) {
 		uint particle_id = object_particle_id(kg, sd->object);
 		float f= particle_lifetime(kg, particle_id);
 		return set_attribute_float(f, type, derivatives, val);
 	}
-	else if (name == "particle:location") {
+	else if (name == u_particle_location) {
 		uint particle_id = object_particle_id(kg, sd->object);
 		float3 f = particle_location(kg, particle_id);
 		return set_attribute_float3(f, type, derivatives, val);
 	}
 #if 0	/* unsupported */
-	else if (name == "particle:rotation") {
+	else if (name == u_particle_rotation) {
 		uint particle_id = object_particle_id(kg, sd->object);
 		float4 f = particle_rotation(kg, particle_id);
 		return set_attribute_float4(f, type, derivatives, val);
 	}
 #endif
-	else if (name == "particle:size") {
+	else if (name == u_particle_size) {
 		uint particle_id = object_particle_id(kg, sd->object);
 		float f = particle_size(kg, particle_id);
 		return set_attribute_float(f, type, derivatives, val);
 	}
-	else if (name == "particle:velocity") {
+	else if (name == u_particle_velocity) {
 		uint particle_id = object_particle_id(kg, sd->object);
 		float3 f = particle_velocity(kg, particle_id);
 		return set_attribute_float3(f, type, derivatives, val);
 	}
-	else if (name == "particle:angular_velocity") {
+	else if (name == u_particle_angular_velocity) {
 		uint particle_id = object_particle_id(kg, sd->object);
 		float3 f = particle_angular_velocity(kg, particle_id);
 		return set_attribute_float3(f, type, derivatives, val);
 	}
-	else if (name == "geom:numpolyvertices") {
+	else if (name == u_geom_numpolyvertices) {
 		return set_attribute_int(3, type, derivatives, val);
 	}
-	else if (name == "geom:trianglevertices" || name == "geom:polyvertices") {
+	else if (name == u_geom_trianglevertices || name == u_geom_polyvertices) {
 		float3 P[3];
 		triangle_vertices(kg, sd->prim, P);
-		object_position_transform(kg, sd, &P[0]);
-		object_position_transform(kg, sd, &P[1]);
-		object_position_transform(kg, sd, &P[2]);
+
+		if(!(sd->flag & SD_TRANSFORM_APPLIED)) {
+			object_position_transform(kg, sd, &P[0]);
+			object_position_transform(kg, sd, &P[1]);
+			object_position_transform(kg, sd, &P[2]);
+		}
+
 		return set_attribute_float3_3(P, type, derivatives, val);
 	}
-	else if(name == "geom:name") {
-		ustring object_name = kg->osl.object_names[sd->object];
+	else if(name == u_geom_name) {
+		ustring object_name = kg->osl->object_names[sd->object];
 		return set_attribute_string(object_name, type, derivatives, val);
 	}
 	else
 		return false;
 }
 
-static bool get_background_attribute(KernelGlobals *kg, ShaderData *sd, ustring name,
-                                     TypeDesc type, bool derivatives, void *val)
+bool OSLRenderServices::get_background_attribute(KernelGlobals *kg, ShaderData *sd, ustring name,
+                                                 TypeDesc type, bool derivatives, void *val)
 {
 	/* Ray Length */
-	if (name == "path:ray_length") {
+	if (name == u_path_ray_length) {
 		float f = sd->ray_length;
 		return set_attribute_float(f, type, derivatives, val);
 	}
@@ -604,9 +639,9 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri
 
 	/* lookup of attribute on another object */
 	if (object_name != u_empty) {
-		OSLGlobals::ObjectNameMap::iterator it = kg->osl.object_name_map.find(object_name);
+		OSLGlobals::ObjectNameMap::iterator it = kg->osl->object_name_map.find(object_name);
 
-		if (it == kg->osl.object_name_map.end())
+		if (it == kg->osl->object_name_map.end())
 			return false;
 
 		object = it->second;
@@ -617,7 +652,7 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri
 	}
 
 	/* find attribute on object */
-	OSLGlobals::AttributeMap& attribute_map = kg->osl.attribute_map[object];
+	OSLGlobals::AttributeMap& attribute_map = kg->osl->attribute_map[object];
 	OSLGlobals::AttributeMap::iterator it = attribute_map.find(name);
 
 	if (it != attribute_map.end()) {
@@ -663,7 +698,7 @@ bool OSLRenderServices::texture(ustring filename, TextureOpt &options,
                                 float s, float t, float dsdx, float dtdx,
                                 float dsdy, float dtdy, float *result)
 {
-	OSL::TextureSystem *ts = kernel_globals->osl.ts;
+	OSL::TextureSystem *ts = kernel_globals->osl->ts;
 	bool status = ts->texture(filename, options, s, t, dsdx, dtdx, dsdy, dtdy, result);
 
 	if(!status) {
@@ -685,7 +720,7 @@ bool OSLRenderServices::texture3d(ustring filename, TextureOpt &options,
                                   const OSL::Vec3 &dPdx, const OSL::Vec3 &dPdy,
                                   const OSL::Vec3 &dPdz, float *result)
 {
-	OSL::TextureSystem *ts = kernel_globals->osl.ts;
+	OSL::TextureSystem *ts = kernel_globals->osl->ts;
 	bool status = ts->texture3d(filename, options, P, dPdx, dPdy, dPdz, result);
 
 	if(!status) {
@@ -707,7 +742,7 @@ bool OSLRenderServices::environment(ustring filename, TextureOpt &options,
                                     OSL::ShaderGlobals *sg, const OSL::Vec3 &R,
                                     const OSL::Vec3 &dRdx, const OSL::Vec3 &dRdy, float *result)
 {
-	OSL::TextureSystem *ts = kernel_globals->osl.ts;
+	OSL::TextureSystem *ts = kernel_globals->osl->ts;
 	bool status = ts->environment(filename, options, R, dRdx, dRdy, result);
 
 	if(!status) {
@@ -728,7 +763,7 @@ bool OSLRenderServices::get_texture_info(ustring filename, int subimage,
                                          ustring dataname,
                                          TypeDesc datatype, void *data)
 {
-	OSL::TextureSystem *ts = kernel_globals->osl.ts;
+	OSL::TextureSystem *ts = kernel_globals->osl->ts;
 	return ts->get_texture_info(filename, subimage, dataname, datatype, data);
 }
 
@@ -798,12 +833,12 @@ bool OSLRenderServices::getmessage(OSL::ShaderGlobals *sg, ustring source, ustri
 {
 	TraceData *tracedata = (TraceData*)sg->tracedata;
 
-	if(source == "trace" && tracedata) {
-		if(name == "hit") {
+	if(source == u_trace && tracedata) {
+		if(name == u_hit) {
 			return set_attribute_int((tracedata->isect.prim != ~0), type, derivatives, val);
 		}
 		else if(tracedata->isect.prim != ~0) {
-			if(name == "hitdist") {
+			if(name == u_hitdist) {
 				float f[3] = {tracedata->isect.t, 0.0f, 0.0f};
 				return set_attribute_float(f, type, derivatives, val);
 			}
@@ -817,25 +852,25 @@ bool OSLRenderServices::getmessage(OSL::ShaderGlobals *sg, ustring source, ustri
 					tracedata->setup = true;
 				}
 
-				if(name == "N") {
+				if(name == u_N) {
 					return set_attribute_float3(sd->N, type, derivatives, val);
 				}
-				else if(name == "Ng") {
+				else if(name == u_Ng) {
 					return set_attribute_float3(sd->Ng, type, derivatives, val);
 				}
-				else if(name == "P") {
+				else if(name == u_P) {
 					float3 f[3] = {sd->P, sd->dP.dx, sd->dP.dy};
 					return set_attribute_float3(f, type, derivatives, val);
 				}
-				else if(name == "I") {
+				else if(name == u_I) {
 					float3 f[3] = {sd->I, sd->dI.dx, sd->dI.dy};
 					return set_attribute_float3(f, type, derivatives, val);
 				}
-				else if(name == "u") {
+				else if(name == u_u) {
 					float f[3] = {sd->u, sd->du.dx, sd->du.dy};
 					return set_attribute_float(f, type, derivatives, val);
 				}
-				else if(name == "v") {
+				else if(name == u_v) {
 					float f[3] = {sd->v, sd->dv.dx, sd->dv.dy};
 					return set_attribute_float(f, type, derivatives, val);
 				}
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h
index b5a7bbae7e5..e687700b383 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/osl_services.h
@@ -101,6 +101,11 @@ public:
 	bool get_texture_info(ustring filename, int subimage,
 	                      ustring dataname, TypeDesc datatype, void *data);
 
+	static bool get_background_attribute(KernelGlobals *kg, ShaderData *sd, ustring name,
+			TypeDesc type, bool derivatives, void *val);
+	static bool get_object_standard_attribute(KernelGlobals *kg, ShaderData *sd, ustring name,
+			TypeDesc type, bool derivatives, void *val);
+
 	struct TraceData {
 		Ray ray;
 		Intersection isect;
@@ -114,6 +119,34 @@ public:
 	static ustring u_screen;
 	static ustring u_raster;
 	static ustring u_ndc;
+	static ustring u_object_location;
+	static ustring u_object_index;
+	static ustring u_geom_dupli_generated;
+	static ustring u_geom_dupli_uv;
+	static ustring u_material_index;
+	static ustring u_object_random;
+	static ustring u_particle_index;
+	static ustring u_particle_age;
+	static ustring u_particle_lifetime;
+	static ustring u_particle_location;
+	static ustring u_particle_rotation;
+	static ustring u_particle_size;
+	static ustring u_particle_velocity;
+	static ustring u_particle_angular_velocity;
+	static ustring u_geom_numpolyvertices;
+	static ustring u_geom_trianglevertices;
+	static ustring u_geom_polyvertices;
+	static ustring u_geom_name;
+	static ustring u_path_ray_length;
+	static ustring u_trace;
+	static ustring u_hit;
+	static ustring u_hitdist;
+	static ustring u_N;
+	static ustring u_Ng;
+	static ustring u_P;
+	static ustring u_I;
+	static ustring u_u;
+	static ustring u_v;
 	static ustring u_empty;
 
 private:
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp
index 2d025f12055..f72e4dd1384 100644
--- a/intern/cycles/kernel/osl/osl_shader.cpp
+++ b/intern/cycles/kernel/osl/osl_shader.cpp
@@ -22,65 +22,56 @@
 #include "kernel_object.h"
 
 #include "osl_closures.h"
+#include "osl_globals.h"
 #include "osl_services.h"
 #include "osl_shader.h"
 
+#include "util_attribute.h"
 #include "util_foreach.h"
 
 #include <OSL/oslexec.h>
 
 CCL_NAMESPACE_BEGIN
 
-tls_ptr(OSLGlobals::ThreadData, OSLGlobals::thread_data);
-volatile int OSLGlobals::thread_data_users = 0;
-thread_mutex OSLGlobals::thread_data_mutex;
-
 /* Threads */
 
-void OSLGlobals::thread_data_init()
-{
-	thread_scoped_lock thread_data_lock(thread_data_mutex);
-
-	if(thread_data_users == 0)
-		tls_create(OSLGlobals::ThreadData, thread_data);
-
-	thread_data_users++;
-}
-
-void OSLGlobals::thread_data_free()
+void OSLShader::thread_init(KernelGlobals *kg, KernelGlobals *kernel_globals, OSLGlobals *osl_globals)
 {
-	/* thread local storage delete */
-	thread_scoped_lock thread_data_lock(thread_data_mutex);
-
-	thread_data_users--;
-
-	if(thread_data_users == 0)
-		tls_delete(OSLGlobals::ThreadData, thread_data);
-}
+	/* no osl used? */
+	if(!osl_globals->use) {
+		kg->osl = NULL;
+		return;
+	}
 
-void OSLShader::thread_init(KernelGlobals *kg)
-{
-	OSL::ShadingSystem *ss = kg->osl.ss;
+	/* per thread kernel data init*/
+	kg->osl = osl_globals;
+	kg->osl->services->thread_init(kernel_globals);
 
-	OSLGlobals::ThreadData *tdata = new OSLGlobals::ThreadData();
+	OSL::ShadingSystem *ss = kg->osl->ss;
+	OSLThreadData *tdata = new OSLThreadData();
 
 	memset(&tdata->globals, 0, sizeof(OSL::ShaderGlobals));
 	tdata->thread_info = ss->create_thread_info();
 
-	tls_set(kg->osl.thread_data, tdata);
-
-	kg->osl.services->thread_init(kg);
+	kg->osl_ss = (OSLShadingSystem*)ss;
+	kg->osl_tdata = tdata;
 }
 
 void OSLShader::thread_free(KernelGlobals *kg)
 {
-	OSL::ShadingSystem *ss = kg->osl.ss;
+	if(!kg->osl)
+		return;
 
-	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
+	OSL::ShadingSystem *ss = (OSL::ShadingSystem*)kg->osl_ss;
+	OSLThreadData *tdata = kg->osl_tdata;
 
 	ss->destroy_thread_info(tdata->thread_info);
 
 	delete tdata;
+
+	kg->osl = NULL;
+	kg->osl_ss = NULL;
+	kg->osl_tdata = NULL;
 }
 
 /* Globals */
@@ -159,13 +150,14 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 					/* sample weight */
 					float sample_weight = fabsf(average(weight));
 
-					sd->flag |= bsdf->shaderdata_flag();
-
 					sc.sample_weight = sample_weight;
 					sc.type = bsdf->shaderclosure_type();
 
 					/* add */
-					sd->closure[sd->num_closure++] = sc;
+					if(sc.sample_weight > 1e-5f && sd->num_closure < MAX_CLOSURE) {
+						sd->closure[sd->num_closure++] = sc;
+						sd->flag |= bsdf->shaderdata_flag();
+					}
 					break;
 				}
 				case OSL::ClosurePrimitive::Emissive: {
@@ -179,9 +171,10 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 					sc.type = CLOSURE_EMISSION_ID;
 
 					/* flag */
-					sd->flag |= SD_EMISSION;
-
-					sd->closure[sd->num_closure++] = sc;
+					if(sd->num_closure < MAX_CLOSURE) {
+						sd->closure[sd->num_closure++] = sc;
+						sd->flag |= SD_EMISSION;
+					}
 					break;
 				}
 				case AmbientOcclusion: {
@@ -194,8 +187,10 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 					sc.sample_weight = sample_weight;
 					sc.type = CLOSURE_AMBIENT_OCCLUSION_ID;
 
-					sd->closure[sd->num_closure++] = sc;
-					sd->flag |= SD_AO;
+					if(sd->num_closure < MAX_CLOSURE) {
+						sd->closure[sd->num_closure++] = sc;
+						sd->flag |= SD_AO;
+					}
 					break;
 				}
 				case OSL::ClosurePrimitive::Holdout:
@@ -204,8 +199,11 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 
 					sc.sample_weight = 0.0f;
 					sc.type = CLOSURE_HOLDOUT_ID;
-					sd->flag |= SD_HOLDOUT;
-					sd->closure[sd->num_closure++] = sc;
+
+					if(sd->num_closure < MAX_CLOSURE) {
+						sd->closure[sd->num_closure++] = sc;
+						sd->flag |= SD_HOLDOUT;
+					}
 					break;
 				case OSL::ClosurePrimitive::BSSRDF:
 				case OSL::ClosurePrimitive::Debug:
@@ -230,8 +228,8 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 void OSLShader::eval_surface(KernelGlobals *kg, ShaderData *sd, float randb, int path_flag)
 {
 	/* gather pointers */
-	OSL::ShadingSystem *ss = kg->osl.ss;
-	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
+	OSL::ShadingSystem *ss = (OSL::ShadingSystem*)kg->osl_ss;
+	OSLThreadData *tdata = kg->osl_tdata;
 	OSL::ShaderGlobals *globals = &tdata->globals;
 	OSL::ShadingContext *ctx = (OSL::ShadingContext *)sd->osl_ctx;
 
@@ -241,8 +239,8 @@ void OSLShader::eval_surface(KernelGlobals *kg, ShaderData *sd, float randb, int
 	/* execute shader for this point */
 	int shader = sd->shader & SHADER_MASK;
 
-	if (kg->osl.surface_state[shader])
-		ss->execute(*ctx, *(kg->osl.surface_state[shader]), *globals);
+	if (kg->osl->surface_state[shader])
+		ss->execute(*ctx, *(kg->osl->surface_state[shader]), *globals);
 
 	/* free trace data */
 	if(globals->tracedata)
@@ -291,8 +289,8 @@ static float3 flatten_background_closure_tree(const OSL::ClosureColor *closure)
 float3 OSLShader::eval_background(KernelGlobals *kg, ShaderData *sd, int path_flag)
 {
 	/* gather pointers */
-	OSL::ShadingSystem *ss = kg->osl.ss;
-	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
+	OSL::ShadingSystem *ss = (OSL::ShadingSystem*)kg->osl_ss;
+	OSLThreadData *tdata = kg->osl_tdata;
 	OSL::ShaderGlobals *globals = &tdata->globals;
 	OSL::ShadingContext *ctx = (OSL::ShadingContext *)sd->osl_ctx;
 
@@ -300,8 +298,8 @@ float3 OSLShader::eval_background(KernelGlobals *kg, ShaderData *sd, int path_fl
 	shaderdata_to_shaderglobals(kg, sd, path_flag, globals);
 
 	/* execute shader for this point */
-	if (kg->osl.background_state)
-		ss->execute(*ctx, *(kg->osl.background_state), *globals);
+	if (kg->osl->background_state)
+		ss->execute(*ctx, *(kg->osl->background_state), *globals);
 
 	/* free trace data */
 	if(globals->tracedata)
@@ -343,7 +341,8 @@ static void flatten_volume_closure_tree(ShaderData *sd,
 					sc.type = CLOSURE_VOLUME_ID;
 
 					/* add */
-					sd->closure[sd->num_closure++] = sc;
+					if(sc.sample_weight > 1e-5f && sd->num_closure < MAX_CLOSURE)
+						sd->closure[sd->num_closure++] = sc;
 					break;
 				}
 				case OSL::ClosurePrimitive::Holdout:
@@ -371,8 +370,8 @@ static void flatten_volume_closure_tree(ShaderData *sd,
 void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, float randb, int path_flag)
 {
 	/* gather pointers */
-	OSL::ShadingSystem *ss = kg->osl.ss;
-	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
+	OSL::ShadingSystem *ss = (OSL::ShadingSystem*)kg->osl_ss;
+	OSLThreadData *tdata = kg->osl_tdata;
 	OSL::ShaderGlobals *globals = &tdata->globals;
 	OSL::ShadingContext *ctx = (OSL::ShadingContext *)sd->osl_ctx;
 
@@ -382,8 +381,8 @@ void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, float randb, int
 	/* execute shader */
 	int shader = sd->shader & SHADER_MASK;
 
-	if (kg->osl.volume_state[shader])
-		ss->execute(*ctx, *(kg->osl.volume_state[shader]), *globals);
+	if (kg->osl->volume_state[shader])
+		ss->execute(*ctx, *(kg->osl->volume_state[shader]), *globals);
 
 	/* free trace data */
 	if(globals->tracedata)
@@ -398,8 +397,8 @@ void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, float randb, int
 void OSLShader::eval_displacement(KernelGlobals *kg, ShaderData *sd)
 {
 	/* gather pointers */
-	OSL::ShadingSystem *ss = kg->osl.ss;
-	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
+	OSL::ShadingSystem *ss = (OSL::ShadingSystem*)kg->osl_ss;
+	OSLThreadData *tdata = kg->osl_tdata;
 	OSL::ShaderGlobals *globals = &tdata->globals;
 	OSL::ShadingContext *ctx = (OSL::ShadingContext *)sd->osl_ctx;
 
@@ -409,8 +408,8 @@ void OSLShader::eval_displacement(KernelGlobals *kg, ShaderData *sd)
 	/* execute shader */
 	int shader = sd->shader & SHADER_MASK;
 
-	if (kg->osl.displacement_state[shader])
-		ss->execute(*ctx, *(kg->osl.displacement_state[shader]), *globals);
+	if (kg->osl->displacement_state[shader])
+		ss->execute(*ctx, *(kg->osl->displacement_state[shader]), *globals);
 
 	/* free trace data */
 	if(globals->tracedata)
@@ -422,15 +421,15 @@ void OSLShader::eval_displacement(KernelGlobals *kg, ShaderData *sd)
 
 void OSLShader::init(KernelGlobals *kg, ShaderData *sd)
 {
-	OSL::ShadingSystem *ss = kg->osl.ss;
-	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
+	OSL::ShadingSystem *ss = (OSL::ShadingSystem*)kg->osl_ss;
+	OSLThreadData *tdata = kg->osl_tdata;
 	
 	sd->osl_ctx = ss->get_context(tdata->thread_info);
 }
 
 void OSLShader::release(KernelGlobals *kg, ShaderData *sd)
 {
-	OSL::ShadingSystem *ss = kg->osl.ss;
+	OSL::ShadingSystem *ss = (OSL::ShadingSystem*)kg->osl_ss;
 	
 	ss->release_context((OSL::ShadingContext *)sd->osl_ctx);
 }
@@ -488,5 +487,23 @@ float3 OSLShader::volume_eval_phase(const ShaderClosure *sc, const float3 omega_
 	return TO_FLOAT3(volume_eval) * sc->weight;
 }
 
+/* Attributes */
+
+int OSLShader::find_attribute(KernelGlobals *kg, const ShaderData *sd, uint id)
+{
+	/* for OSL, a hash map is used to lookup the attribute by name. */
+	OSLGlobals::AttributeMap &attr_map = kg->osl->attribute_map[sd->object];
+	ustring stdname(std::string("std::") + std::string(attribute_standard_name((AttributeStandard)id)));
+	OSLGlobals::AttributeMap::const_iterator it = attr_map.find(stdname);
+
+	if (it != attr_map.end()) {
+		const OSLGlobals::Attribute &osl_attr = it->second;
+		/* return result */
+		return (osl_attr.elem == ATTR_ELEMENT_NONE) ? (int)ATTR_STD_NOT_FOUND : osl_attr.offset;
+	}
+	else
+		return (int)ATTR_STD_NOT_FOUND;
+}
+
 CCL_NAMESPACE_END
 
diff --git a/intern/cycles/kernel/osl/osl_shader.h b/intern/cycles/kernel/osl/osl_shader.h
index 9ff31e9160b..e614f240dc1 100644
--- a/intern/cycles/kernel/osl/osl_shader.h
+++ b/intern/cycles/kernel/osl/osl_shader.h
@@ -31,33 +31,27 @@
  * This means no thread state must be passed along in the kernel itself.
  */
 
-#include <OSL/oslexec.h>
-#include <OSL/oslclosure.h>
-
 #include "kernel_types.h"
 
-#include "util_map.h"
-#include "util_param.h"
-#include "util_vector.h"
-
 CCL_NAMESPACE_BEGIN
 
-namespace OSL = ::OSL;
-
-class OSLRenderServices;
 class Scene;
+
 struct ShaderClosure;
 struct ShaderData;
 struct differential3;
 struct KernelGlobals;
 
+struct OSLGlobals;
+struct OSLShadingSystem;
+
 class OSLShader {
 public:
 	/* init */
-	static void register_closures(OSL::ShadingSystem *ss);
+	static void register_closures(OSLShadingSystem *ss);
 
 	/* per thread data */
-	static void thread_init(KernelGlobals *kg);
+	static void thread_init(KernelGlobals *kg, KernelGlobals *kernel_globals, OSLGlobals *osl_globals);
 	static void thread_free(KernelGlobals *kg);
 
 	/* eval */
@@ -82,6 +76,9 @@ public:
 	/* release */
 	static void init(KernelGlobals *kg, ShaderData *sd);
 	static void release(KernelGlobals *kg, ShaderData *sd);
+
+	/* attributes */
+	static int find_attribute(KernelGlobals *kg, const ShaderData *sd, uint id);
 };
 
 CCL_NAMESPACE_END
diff --git a/intern/cycles/kernel/shaders/node_convert_from_color.osl b/intern/cycles/kernel/shaders/node_convert_from_color.osl
index e4982975c20..ea488c9ce4c 100644
--- a/intern/cycles/kernel/shaders/node_convert_from_color.osl
+++ b/intern/cycles/kernel/shaders/node_convert_from_color.osl
@@ -28,7 +28,7 @@ shader node_convert_from_color(
 	output normal Normal = normal(0.0, 0.0, 0.0))
 {
 	Val = Color[0] * 0.2126 + Color[1] * 0.7152 + Color[2] * 0.0722;
-	ValInt = (int)(Color[0]*0.2126 + Color[1]*0.7152 + Color[2]*0.0722);
+	ValInt = (int)(Color[0] * 0.2126 + Color[1] * 0.7152 + Color[2] * 0.0722);
 	Vector = vector(Color[0], Color[1], Color[2]);
 	Point = point(Color[0], Color[1], Color[2]);
 	Normal = normal(Color[0], Color[1], Color[2]);
diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl
index 4367f7f4994..7da336a53f0 100644
--- a/intern/cycles/kernel/shaders/node_environment_texture.osl
+++ b/intern/cycles/kernel/shaders/node_environment_texture.osl
@@ -21,8 +21,8 @@
 
 vector environment_texture_direction_to_equirectangular(vector dir)
 {
-	float u = -atan2(dir[1], dir[0])/(2.0*M_PI) + 0.5;
-	float v = atan2(dir[2], hypot(dir[0], dir[1]))/M_PI + 0.5;
+	float u = -atan2(dir[1], dir[0]) / (2.0 * M_PI) + 0.5;
+	float v = atan2(dir[2], hypot(dir[0], dir[1])) / M_PI + 0.5;
 
 	return vector(u, v, 0.0);
 }
@@ -31,12 +31,12 @@ vector environment_texture_direction_to_mirrorball(vector dir)
 {
 	dir[1] -= 1.0;
 
-	float div = 2.0*sqrt(max(-0.5*dir[1], 0.0));
-	if(div > 0.0)
+	float div = 2.0 * sqrt(max(-0.5 * dir[1], 0.0));
+	if (div > 0.0)
 		dir /= div;
 
-	float u = 0.5*(dir[0] + 1.0);
-	float v = 0.5*(dir[2] + 1.0);
+	float u = 0.5 * (dir[0] + 1.0);
+	float v = 0.5 * (dir[2] + 1.0);
 
 	return vector(u, v, 0.0);
 }
diff --git a/intern/cycles/kernel/shaders/node_geometry.osl b/intern/cycles/kernel/shaders/node_geometry.osl
index 3940b98eec1..d1c11b70081 100644
--- a/intern/cycles/kernel/shaders/node_geometry.osl
+++ b/intern/cycles/kernel/shaders/node_geometry.osl
@@ -51,7 +51,12 @@ shader node_geometry(
 
 	/* try to create spherical tangent from generated coordinates */
 	if (getattribute("geom:generated", generated)) {
-		vector T = vector(-(generated[1] - 0.5), (generated[0] - 0.5), 0.0);
+		matrix project = matrix(0.0, 1.0, 0.0, 0.0,
+		                        -1.0, 0.0, 0.0, 0.0,
+		                        0.0, 0.0, 0.0, 0.0,
+		                        0.5, -0.5, 0.0, 1.0);
+
+		vector T = transform(project, generated);
 		T = transform("object", "world", T);
 		Tangent = cross(Normal, normalize(cross(T, Normal)));
 	}
diff --git a/intern/cycles/kernel/shaders/node_image_texture.osl b/intern/cycles/kernel/shaders/node_image_texture.osl
index 53c4aeaeb5f..99074672a6a 100644
--- a/intern/cycles/kernel/shaders/node_image_texture.osl
+++ b/intern/cycles/kernel/shaders/node_image_texture.osl
@@ -68,26 +68,26 @@ shader node_image_texture(
 
 		vector weight = vector(0.0, 0.0, 0.0);
 		float blend = projection_blend;
-		float limit = 0.5*(1.0 + blend);
+		float limit = 0.5 * (1.0 + blend);
 
 		/* first test for corners with single texture */
-		if (Nob[0] > limit*(Nob[0] + Nob[1]) && Nob[0] > limit*(Nob[0] + Nob[2])) {
+		if (Nob[0] > limit * (Nob[0] + Nob[1]) && Nob[0] > limit * (Nob[0] + Nob[2])) {
 			weight[0] = 1.0;
 		}
-		else if (Nob[1] > limit*(Nob[0] + Nob[1]) && Nob[1] > limit*(Nob[1] + Nob[2])) {
+		else if (Nob[1] > limit * (Nob[0] + Nob[1]) && Nob[1] > limit * (Nob[1] + Nob[2])) {
 			weight[1] = 1.0;
 		}
-		else if (Nob[2] > limit*(Nob[0] + Nob[2]) && Nob[2] > limit*(Nob[1] + Nob[2])) {
+		else if (Nob[2] > limit * (Nob[0] + Nob[2]) && Nob[2] > limit * (Nob[1] + Nob[2])) {
 			weight[2] = 1.0;
 		}
 		else if (blend > 0.0) {
 			/* in case of blending, test for mixes between two textures */
-			if (Nob[2] < (1.0 - limit)*(Nob[1] + Nob[0])) {
+			if (Nob[2] < (1.0 - limit) * (Nob[1] + Nob[0])) {
 				weight[0] = Nob[0] / (Nob[0] + Nob[1]);
 				weight[0] = clamp((weight[0] - 0.5 * (1.0 - blend)) / blend, 0.0, 1.0);
 				weight[1] = 1.0 - weight[0];
 			}
-			else if (Nob[0] < (1.0 - limit)*(Nob[1] + Nob[2])) {
+			else if (Nob[0] < (1.0 - limit) * (Nob[1] + Nob[2])) {
 				weight[1] = Nob[1] / (Nob[1] + Nob[2]);
 				weight[1] = clamp((weight[1] - 0.5 * (1.0 - blend)) / blend, 0.0, 1.0);
 				weight[2] = 1.0 - weight[1];
@@ -111,16 +111,16 @@ shader node_image_texture(
 		float tmp_alpha;
 
 		if (weight[0] > 0.0) {
-			Color += weight[0]*image_texture_lookup(filename, color_space, p[1], p[2], tmp_alpha);
-			Alpha += weight[0]*tmp_alpha;
+			Color += weight[0] * image_texture_lookup(filename, color_space, p[1], p[2], tmp_alpha);
+			Alpha += weight[0] * tmp_alpha;
 		}
 		if (weight[1] > 0.0) {
-			Color += weight[1]*image_texture_lookup(filename, color_space, p[0], p[2], tmp_alpha);
-			Alpha += weight[1]*tmp_alpha;
+			Color += weight[1] * image_texture_lookup(filename, color_space, p[0], p[2], tmp_alpha);
+			Alpha += weight[1] * tmp_alpha;
 		}
 		if (weight[2] > 0.0) {
-			Color += weight[2]*image_texture_lookup(filename, color_space, p[1], p[0], tmp_alpha);
-			Alpha += weight[2]*tmp_alpha;
+			Color += weight[2] * image_texture_lookup(filename, color_space, p[1], p[0], tmp_alpha);
+			Alpha += weight[2] * tmp_alpha;
 		}
 	}
 }
diff --git a/intern/cycles/kernel/shaders/node_light_falloff.osl b/intern/cycles/kernel/shaders/node_light_falloff.osl
index 7ffa6fe0ffb..a9d41604361 100644
--- a/intern/cycles/kernel/shaders/node_light_falloff.osl
+++ b/intern/cycles/kernel/shaders/node_light_falloff.osl
@@ -30,7 +30,7 @@ shader node_light_falloff(
 	getattribute("path:ray_length", ray_length);
 
 	if (Smooth > 0.0) {
-		float squared = ray_length*ray_length;
+		float squared = ray_length * ray_length;
 		strength *= squared / (Smooth + squared);
 	}
 
@@ -38,9 +38,9 @@ shader node_light_falloff(
 	Quadratic = strength;
 	
 	/* Linear */
-	Linear = (strength*ray_length);
+	Linear = (strength * ray_length);
 
 	/* Constant */
-	Constant = (strength*ray_length*ray_length);
+	Constant = (strength * ray_length * ray_length);
 }
 
diff --git a/intern/cycles/kernel/shaders/node_mapping.osl b/intern/cycles/kernel/shaders/node_mapping.osl
index 2e720edfc7e..92df043b39d 100644
--- a/intern/cycles/kernel/shaders/node_mapping.osl
+++ b/intern/cycles/kernel/shaders/node_mapping.osl
@@ -20,9 +20,17 @@
 
 shader node_mapping(
 	matrix Matrix = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+	point mapping_min = point(0.0, 0.0, 0.0),
+	point mapping_max = point(0.0, 0.0, 0.0),
+	int use_minmax = 0,
 	point VectorIn = point(0.0, 0.0, 0.0),
 	output point VectorOut = point(0.0, 0.0, 0.0))
 {
-	VectorOut = transform(Matrix, VectorIn);
+	point p = transform(Matrix, VectorIn);
+
+	if(use_minmax)
+		p = min(max(mapping_min, p), mapping_max);
+	
+	VectorOut = p;
 }
 
diff --git a/intern/cycles/kernel/shaders/node_mix.osl b/intern/cycles/kernel/shaders/node_mix.osl
index 69e68e5ed15..b2af36230f8 100644
--- a/intern/cycles/kernel/shaders/node_mix.osl
+++ b/intern/cycles/kernel/shaders/node_mix.osl
@@ -272,7 +272,7 @@ color node_mix_clamp(color col)
 	color outcol = col;
 
 	outcol[0] = clamp(col[0], 0.0, 1.0);
-	outcol[1] = clamp(col[2], 0.0, 1.0);
+	outcol[1] = clamp(col[1], 0.0, 1.0);
 	outcol[2] = clamp(col[2], 0.0, 1.0);
 
 	return outcol;
diff --git a/intern/cycles/kernel/shaders/node_normal_map.osl b/intern/cycles/kernel/shaders/node_normal_map.osl
index d101ee870b7..dc25eb8539f 100644
--- a/intern/cycles/kernel/shaders/node_normal_map.osl
+++ b/intern/cycles/kernel/shaders/node_normal_map.osl
@@ -27,7 +27,7 @@ shader node_normal_map(
 	string attr_sign_name = "geom:tangent_sign",
 	output normal Normal = NormalIn)
 {
-	color mcolor = 2.0*color(Color[0] - 0.5, Color[1] - 0.5, Color[2] - 0.5);
+	color mcolor = 2.0 * color(Color[0] - 0.5, Color[1] - 0.5, Color[2] - 0.5);
 
 	if (space == "Tangent") {
 		vector tangent;
@@ -47,6 +47,6 @@ shader node_normal_map(
 		Normal = normalize(vector(mcolor));
 	
 	if (Strength != 1.0)
-		Normal = normalize(NormalIn + (Normal - NormalIn)*max(Strength, 0.0));
+		Normal = normalize(NormalIn + (Normal - NormalIn) * max(Strength, 0.0));
 }
 
diff --git a/intern/cycles/kernel/shaders/node_rgb_ramp.osl b/intern/cycles/kernel/shaders/node_rgb_ramp.osl
index a128ebbd1cf..0df11bb38de 100644
--- a/intern/cycles/kernel/shaders/node_rgb_ramp.osl
+++ b/intern/cycles/kernel/shaders/node_rgb_ramp.osl
@@ -29,7 +29,10 @@ shader node_rgb_ramp(
 {
 	float f = clamp(Fac, 0.0, 1.0) * (RAMP_TABLE_SIZE - 1);
 
+	/* clamp int as well in case of NaN */
 	int i = (int)f;
+	if (i < 0) i = 0;
+	if (i >= RAMP_TABLE_SIZE) i = RAMP_TABLE_SIZE - 1;
 	float t = f - (float)i;
 
 	Color = ramp_color[i];
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index 564c0957c68..b5bd2b42cb4 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -73,7 +73,7 @@ __device_inline ShaderClosure *svm_node_closure_get_bsdf(ShaderData *sd, float m
 #ifdef __MULTI_CLOSURE__
 	ShaderClosure *sc = &sd->closure[sd->num_closure];
 	float3 weight = sc->weight * mix_weight;
-	float sample_weight = fabsf(average(sc->weight));
+	float sample_weight = fabsf(average(weight));
 
 	if(sample_weight > 1e-5f && sd->num_closure < MAX_CLOSURE) {
 		sc->weight = weight;
diff --git a/intern/cycles/kernel/svm/svm_ramp.h b/intern/cycles/kernel/svm/svm_ramp.h
index 55c2b3f6af4..c64413cbe84 100644
--- a/intern/cycles/kernel/svm/svm_ramp.h
+++ b/intern/cycles/kernel/svm/svm_ramp.h
@@ -25,7 +25,8 @@ __device float4 rgb_ramp_lookup(KernelGlobals *kg, int offset, float f)
 {
 	f = clamp(f, 0.0f, 1.0f)*(RAMP_TABLE_SIZE-1);
 
-	int i = (int)f;
+	/* clamp int as well in case of NaN */
+	int i = clamp((int)f, 0, RAMP_TABLE_SIZE-1);
 	float t = f - (float)i;
 
 	float4 a = fetch_node_float(kg, offset+i);
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 1958cfc10f7..bc782a78c60 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -547,7 +547,7 @@ void MeshManager::device_update_attributes(Device *device, DeviceScene *dscene,
 	}
 
 	/* create attribute lookup maps */
-	if(scene->params.shadingsystem == SceneParams::OSL)
+	if(scene->shader_manager->use_osl())
 		update_osl_attributes(device, scene, mesh_attributes);
 	else
 		update_svm_attributes(device, dscene, scene, mesh_attributes);
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 55fb9bf8a7e..3f8055b3540 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -1098,6 +1098,9 @@ void MappingNode::compile(OSLCompiler& compiler)
 {
 	Transform tfm = transform_transpose(tex_mapping.compute_transform());
 	compiler.parameter("Matrix", tfm);
+	compiler.parameter_point("mapping_min", tex_mapping.min);
+	compiler.parameter_point("mapping_max", tex_mapping.max);
+	compiler.parameter("use_minmax", tex_mapping.use_minmax);
 
 	compiler.add(this, "node_mapping");
 }
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index d08cb07fc3c..bd9f16d64ef 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -148,10 +148,9 @@ ObjectManager::~ObjectManager()
 {
 }
 
-void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
+void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene, Scene *scene, uint *object_flag, Progress& progress)
 {
 	float4 *objects = dscene->objects.resize(OBJECT_SIZE*scene->objects.size());
-	uint *object_flag = dscene->object_flag.resize(scene->objects.size());
 	int i = 0;
 	map<Mesh*, float> surface_area_map;
 	Scene::MotionType need_motion = scene->need_motion(device->info.advanced_shading);
@@ -257,7 +256,6 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
 	}
 
 	device->tex_alloc("__objects", dscene->objects);
-	device->tex_alloc("__object_flag", dscene->object_flag);
 
 	dscene->data.bvh.have_motion = have_motion;
 }
@@ -272,9 +270,12 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
 	if(scene->objects.size() == 0)
 		return;
 
+	/* object info flag */
+	uint *object_flag = dscene->object_flag.resize(scene->objects.size());
+
 	/* set object transform matrices, before applying static transforms */
 	progress.set_status("Updating Objects", "Copying Transformations to device");
-	device_update_transforms(device, dscene, scene, progress);
+	device_update_transforms(device, dscene, scene, object_flag, progress);
 
 	if(progress.get_cancel()) return;
 
@@ -282,10 +283,11 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
 	/* todo: do before to support getting object level coords? */
 	if(scene->params.bvh_type == SceneParams::BVH_STATIC) {
 		progress.set_status("Updating Objects", "Applying Static Transformations");
-		apply_static_transforms(scene, progress);
+		apply_static_transforms(scene, object_flag, progress);
 	}
 
-	if(progress.get_cancel()) return;
+	/* allocate object flag */
+	device->tex_alloc("__object_flag", dscene->object_flag);
 
 	need_update = false;
 }
@@ -299,7 +301,7 @@ void ObjectManager::device_free(Device *device, DeviceScene *dscene)
 	dscene->object_flag.clear();
 }
 
-void ObjectManager::apply_static_transforms(Scene *scene, Progress& progress)
+void ObjectManager::apply_static_transforms(Scene *scene, uint *object_flag, Progress& progress)
 {
 	/* todo: normals and displacement should be done before applying transform! */
 	/* todo: create objects/meshes in right order! */
@@ -312,6 +314,7 @@ void ObjectManager::apply_static_transforms(Scene *scene, Progress& progress)
 #else
 	bool motion_blur = false;
 #endif
+	int i = 0;
 
 	foreach(Object *object, scene->objects) {
 		map<Mesh*, int>::iterator it = mesh_users.find(object->mesh);
@@ -334,8 +337,12 @@ void ObjectManager::apply_static_transforms(Scene *scene, Progress& progress)
 
 					if(progress.get_cancel()) return;
 				}
+
+				object_flag[i] |= SD_TRANSFORM_APPLIED;
 			}
 		}
+
+		i++;
 	}
 }
 
diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h
index 922c886d961..9c9b11bc29c 100644
--- a/intern/cycles/render/object.h
+++ b/intern/cycles/render/object.h
@@ -73,12 +73,12 @@ public:
 	~ObjectManager();
 
 	void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
-	void device_update_transforms(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
+	void device_update_transforms(Device *device, DeviceScene *dscene, Scene *scene, uint *object_flag, Progress& progress);
 	void device_free(Device *device, DeviceScene *dscene);
 
 	void tag_update(Scene *scene);
 
-	void apply_static_transforms(Scene *scene, Progress& progress);
+	void apply_static_transforms(Scene *scene, uint *object_flag, Progress& progress);
 };
 
 CCL_NAMESPACE_END
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 2ec7e3d3775..e4ee40d881e 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -45,8 +45,6 @@ CCL_NAMESPACE_BEGIN
 
 OSLShaderManager::OSLShaderManager()
 {
-	thread_data_initialized = false;
-
 	services = new OSLRenderServices();
 
 	shading_system_init();
@@ -103,11 +101,6 @@ void OSLShaderManager::device_update(Device *device, DeviceScene *dscene, Scene
 	scene->image_manager->set_osl_texture_system((void*)ts);
 
 	device_update_common(device, dscene, scene, progress);
-
-	if(!thread_data_initialized) {
-		og->thread_data_init();
-		thread_data_initialized = true;
-	}
 }
 
 void OSLShaderManager::device_free(Device *device, DeviceScene *dscene)
@@ -125,11 +118,6 @@ void OSLShaderManager::device_free(Device *device, DeviceScene *dscene)
 	og->volume_state.clear();
 	og->displacement_state.clear();
 	og->background_state.reset();
-
-	if(thread_data_initialized) {
-		og->thread_data_free();
-		thread_data_initialized = false;
-	}
 }
 
 void OSLShaderManager::texture_system_init()
@@ -170,7 +158,7 @@ void OSLShaderManager::shading_system_init()
 	const int nraytypes = sizeof(raytypes)/sizeof(raytypes[0]);
 	ss->attribute("raytypes", TypeDesc(TypeDesc::STRING, nraytypes), raytypes);
 
-	OSLShader::register_closures(ss);
+	OSLShader::register_closures((OSLShadingSystem*)ss);
 
 	loaded_shaders.clear();
 }
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h
index 17934765155..9b58745bd46 100644
--- a/intern/cycles/render/osl.h
+++ b/intern/cycles/render/osl.h
@@ -52,6 +52,8 @@ public:
 	OSLShaderManager();
 	~OSLShaderManager();
 
+	bool use_osl() { return true; }
+
 	void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
 	void device_free(Device *device, DeviceScene *dscene);
 
@@ -73,8 +75,6 @@ protected:
 	OSLRenderServices *services;
 	OSL::ErrorHandler errhandler;
 	set<string> loaded_shaders;
-
-	bool thread_data_initialized;
 };
 
 #endif
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 7834aa701ea..8085cfdd3e6 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -44,10 +44,6 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_)
 	device = NULL;
 	memset(&dscene.data, 0, sizeof(dscene.data));
 
-	/* OSL only works on the CPU */
-	if(device_info_.type != DEVICE_CPU)
-		params.shadingsystem = SceneParams::SVM;
-
 	camera = new Camera();
 	filter = new Filter();
 	film = new Film();
@@ -57,9 +53,14 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_)
 	object_manager = new ObjectManager();
 	integrator = new Integrator();
 	image_manager = new ImageManager();
-	shader_manager = ShaderManager::create(this);
 	particle_system_manager = new ParticleSystemManager();
 
+	/* OSL only works on the CPU */
+	if(device_info_.type == DEVICE_CPU)
+		shader_manager = ShaderManager::create(this, params.shadingsystem);
+	else
+		shader_manager = ShaderManager::create(this, SceneParams::SVM);
+
 	if (device_info_.type == DEVICE_CPU)
 		image_manager->set_extended_image_limits();
 }
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 17f7fbd43d6..b9b49bf2989 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -121,12 +121,12 @@ ShaderManager::~ShaderManager()
 {
 }
 
-ShaderManager *ShaderManager::create(Scene *scene)
+ShaderManager *ShaderManager::create(Scene *scene, int shadingsystem)
 {
 	ShaderManager *manager;
 
 #ifdef WITH_OSL
-	if(scene->params.shadingsystem == SceneParams::OSL)
+	if(shadingsystem == SceneParams::OSL)
 		manager = new OSLShaderManager();
 	else
 #endif
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index 373b3356f51..d4421002ceb 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -107,9 +107,11 @@ class ShaderManager {
 public:
 	bool need_update;
 
-	static ShaderManager *create(Scene *scene);
+	static ShaderManager *create(Scene *scene, int shadingsystem);
 	virtual ~ShaderManager();
 
+	virtual bool use_osl() { return false; }
+
 	/* device update */
 	virtual void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress) = 0;
 	virtual void device_free(Device *device, DeviceScene *dscene) = 0;
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index bf5f791a245..dce417704cc 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -54,6 +54,7 @@ set(SRC_HEADERS
 	util_path.h
 	util_progress.h
 	util_set.h
+	util_stats.h
 	util_string.h
 	util_system.h
 	util_task.h
@@ -61,8 +62,8 @@ set(SRC_HEADERS
 	util_time.h
 	util_transform.h
 	util_types.h
-	util_view.h
 	util_vector.h
+	util_view.h
 	util_xml.h
 )
 
diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h
index 751d22b2f63..d7e9ec03df3 100644
--- a/intern/cycles/util/util_thread.h
+++ b/intern/cycles/util/util_thread.h
@@ -70,37 +70,6 @@ protected:
 	bool joined;
 };
 
-/* Thread Local Storage
- *
- * Boost implementation is a bit slow, and Mac OS X __thread is not supported
- * but the pthreads implementation is optimized, so we use these macros. */
-
-#if defined(__APPLE__) || defined(_WIN32)
-
-#define tls_ptr(type, name) \
-	pthread_key_t name
-#define tls_set(name, value) \
-	pthread_setspecific(name, value)
-#define tls_get(type, name) \
-	((type*)pthread_getspecific(name))
-#define tls_create(type, name) \
-	pthread_key_create(&name, NULL)
-#define tls_delete(type, name) \
-	pthread_key_delete(name);
-
-#else
-
-#define tls_ptr(type, name) \
-	__thread type *name
-#define tls_set(name, value) \
-	name = value
-#define tls_get(type, name) \
-	name
-#define tls_create(type, name)
-#define tls_delete(type, name)
-
-#endif
-
 CCL_NAMESPACE_END
 
 #endif /* __UTIL_THREAD_H__ */
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index fe530d727ad..3d246104ddc 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -41,7 +41,9 @@
 #define __align(...) __declspec(align(__VA_ARGS__))
 #else
 #define __device_inline static inline __attribute__((always_inline))
+#ifndef FREE_WINDOWS64
 #define __forceinline inline __attribute__((always_inline))
+#endif
 #define __align(...) __attribute__((aligned(__VA_ARGS__)))
 #endif
 
diff --git a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
index 49e7def8730..468a37de633 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
@@ -90,8 +90,8 @@ bool GHOST_NDOFManagerX11::processEvents()
 				case SPNAV_EVENT_MOTION:
 				{
 					/* convert to blender view coords */
-					short t[3] = {e.motion.x, e.motion.y, -e.motion.z};
-					short r[3] = {-e.motion.rx, -e.motion.ry, e.motion.rz};
+					short t[3] = {(short)e.motion.x, (short)e.motion.y, (short)-e.motion.z};
+					short r[3] = {(short)-e.motion.rx, (short)-e.motion.ry, (short)e.motion.rz};
 
 					updateTranslation(t, now);
 					updateRotation(r, now);
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp
index 237d4c0f787..fdc4f33b784 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cpp
@@ -73,7 +73,7 @@ GHOST_SystemSDL::createWindow(const STR_String& title,
 {
 	GHOST_WindowSDL *window = NULL;
 
-	window = new GHOST_WindowSDL(this, title, left, top, width, height, state, parentWindow, type, stereoVisual, 1);
+	window = new GHOST_WindowSDL(this, title, left, top, width, height, state, parentWindow, type, stereoVisual, numOfAASamples);
 
 	if (window) {
 		if (GHOST_kWindowStateFullScreen == state) {
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 01705fe8f7b..7a5bb8ab604 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -609,9 +609,12 @@ GHOST_WindowCocoa::~GHOST_WindowCocoa()
 	[m_openGLView release];
 	
 	if (m_window) {
+		// previously we called [m_window release], but on 10.8 this does not
+		// remove the window from [NSApp orderedWindows] and perhaps other
+		// places, leading to crashes. so instead we set setReleasedWhenClosed
+		// back to YES right before closing
+		[m_window setReleasedWhenClosed:YES];
 		[m_window close];
-		[[m_window delegate] release];
-		[m_window release];
 		m_window = nil;
 	}
 	
diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cpp
index 369fc4ace14..6641b28a20e 100644
--- a/intern/ghost/intern/GHOST_WindowSDL.cpp
+++ b/intern/ghost/intern/GHOST_WindowSDL.cpp
@@ -26,6 +26,7 @@
 
 #include "GHOST_WindowSDL.h"
 #include "SDL_mouse.h"
+#include <GL/glew.h>
 #include <assert.h>
 
 static SDL_GLContext s_firstContext = NULL;
@@ -48,6 +49,20 @@ GHOST_WindowSDL::GHOST_WindowSDL(GHOST_SystemSDL *system,
 	m_invalid_window(false),
 	m_sdl_custom_cursor(NULL)
 {
+	SDL_GL_SetAttribute(SDL_GL_SHARE_WITH_CURRENT_CONTEXT, 1);
+	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+
+	if (numOfAASamples) {
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, numOfAASamples);
+	}
+
+	/* creating the window _must_ come after setting attributes */
 	m_sdl_win = SDL_CreateWindow(title,
 	                             left,
 	                             top,
@@ -55,14 +70,7 @@ GHOST_WindowSDL::GHOST_WindowSDL(GHOST_SystemSDL *system,
 	                             height,
 	                             SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN);
 
-	//SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
-	//SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
-	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
-	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
-	SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+
 
 	m_sdl_glcontext = SDL_GL_CreateContext(m_sdl_win);
 
@@ -164,6 +172,10 @@ GHOST_WindowSDL::activateDrawingContext()
 	if (m_sdl_glcontext != NULL) {
 		int status = SDL_GL_MakeCurrent(m_sdl_win, m_sdl_glcontext);
 		(void)status;
+		/* Disable AA by default */
+		if (m_numOfAASamples > 0) {
+			glDisable(GL_MULTISAMPLE_ARB);
+		}
 		return GHOST_kSuccess;
 	}
 	return GHOST_kFailure;
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index dded7dc256d..fead1884f8a 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -868,7 +868,7 @@ GHOST_TSuccess GHOST_WindowWin32::installDrawingContext(GHOST_TDrawingContextTyp
 				}
 
 				// Attempt to enable multisample
-				if (m_multisample && WGL_ARB_multisample && !m_multisampleEnabled)
+				if (m_multisample && WGL_ARB_multisample && !m_multisampleEnabled && !is_crappy_intel_card())
 				{
 					success = initMultisample(preferredFormat);
 
diff --git a/intern/locale/CMakeLists.txt b/intern/locale/CMakeLists.txt
index 3187639c844..1f14a0e7a6a 100644
--- a/intern/locale/CMakeLists.txt
+++ b/intern/locale/CMakeLists.txt
@@ -32,6 +32,8 @@ set(INC_SYS
 
 set(SRC
 	boost_locale_wrapper.cpp
+
+	boost_locale_wrapper.h
 )
 
 if(WITH_INTERNATIONAL)
diff --git a/intern/smoke/intern/FFT_NOISE.h b/intern/smoke/intern/FFT_NOISE.h
index a087b4e1391..8b7e4f2728b 100644
--- a/intern/smoke/intern/FFT_NOISE.h
+++ b/intern/smoke/intern/FFT_NOISE.h
@@ -167,6 +167,8 @@ static void generatTile_FFT(float* const noiseTileData, std::string filename)
 			for (int x = 0; x < xRes; x++, index++)
 				noise[index] -= forward[index][0] / totalCells;
 
+	// fill noiseTileData
+	memcpy(noiseTileData, noise, sizeof(float) * totalCells);
 	// save out the noise tile
 	saveTile(noise, filename);
 	
diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp
index 1c89f5d681b..5b6509afead 100644
--- a/intern/smoke/intern/WTURBULENCE.cpp
+++ b/intern/smoke/intern/WTURBULENCE.cpp
@@ -220,21 +220,25 @@ void WTURBULENCE::setNoise(int type)
 {
 	if(type == (1<<1)) // FFT
 	{
+#ifdef WITH_FFTW3
 		// needs fft
-		#ifdef WITH_FFTW3
 		std::string noiseTileFilename = std::string("noise.fft");
 		generatTile_FFT(_noiseTile, noiseTileFilename);
-		#endif
+		return;
+#else
+		fprintf(stderr, "FFTW not enabled, falling back to wavelet noise.\n");
+#endif
 	}
-	else if(type == (1<<2)) // curl
+#if 0
+	if(type == (1<<2)) // curl
 	{
 		// TODO: not supported yet
+		return;
 	}
-	else // standard - wavelet
-	{
-		std::string noiseTileFilename = std::string("noise.wavelets");
-		generateTile_WAVELET(_noiseTile, noiseTileFilename);
-	}
+#endif
+
+	std::string noiseTileFilename = std::string("noise.wavelets");
+	generateTile_WAVELET(_noiseTile, noiseTileFilename);
 }
 
 // init direct access functions from blender
diff --git a/release/datafiles/blender_icons.png b/release/datafiles/blender_icons.png
index e09d7062780..b0d5e825738 100644
--- a/release/datafiles/blender_icons.png
+++ b/release/datafiles/blender_icons.png
diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py
index 34beb6035ae..52bf1c04e65 100644
--- a/release/scripts/modules/bpy/ops.py
+++ b/release/scripts/modules/bpy/ops.py
@@ -74,7 +74,7 @@ class BPyOpsSubMod(object):
 
     eg. bpy.ops.object
     """
-    __keys__ = ("module",)
+    __slots__ = ("module",)
 
     def __init__(self, module):
         self.module = module
@@ -111,7 +111,7 @@ class BPyOpsSubModOp(object):
     eg. bpy.ops.object.somefunc
     """
 
-    __keys__ = ("module", "func")
+    __slots__ = ("module", "func")
 
     def _get_doc(self):
         return op_as_string(self.idname())
diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml
index 805aa9bd184..0a77aa132a8 100644
--- a/release/scripts/presets/interface_theme/back_to_black.xml
+++ b/release/scripts/presets/interface_theme/back_to_black.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#e4e4e4"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#000000ff"
+                             text="#c7c7c7"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#2a2a2aff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#111111ff"
+                             item="#33406bff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#2a2a2aff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#191919e6"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#ffffff"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#111111ff"
+                             inner_sel="#33406bff"
+                             item="#191919ff"
+                             text="#929292"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-100"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#56ff00"
+                                  inner_anim_sel="#56ff00"
+                                  inner_key="#fff400"
+                                  inner_key_sel="#fff400"
+                                  inner_driven="#b400ff"
+                                  inner_driven_sel="#9900e6"
+                                  blend="0.1">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#000000ff"
+                            show_header="FALSE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#ff8c19"
-                   editmesh_active="#ff020080"
-                   act_spline="#db2512"
-                   handle_align="#803060"
-                   handle_sel_align="#f090a0"
-                   handle_auto="#909000"
-                   handle_sel_auto="#f0ff40"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#222222"
+                   panel="#a5a5a57f"
+                   wire="#888888"
+                   lamp="#c1d40028"
+                   speaker="#535353"
                    camera="#000000"
-                   camera_path="#5a5a5a"
-                   frame_current="#60c040"
-                   edge_crease="#cc0099"
-                   extra_edge_len="#ffedf8"
-                   edge_seam="#db2512"
+                   empty="#000000"
+                   object_selected="#f15800"
+                   object_active="#ff8c19"
+                   object_grouped="#083008"
+                   object_grouped_active="#55bb55"
+                   transform="#ffffff"
+                   vertex="#72cfdd"
+                   vertex_select="#ff8500"
+                   vertex_size="3"
                    edge_select="#ffa000"
+                   edge_seam="#db2512"
                    edge_sharp="#ff2020"
+                   edge_crease="#cc0099"
                    edge_facesel="#6b6b6b"
-                   empty="#000000"
                    face="#73828f12"
-                   extra_face_angle="#00c900"
-                   extra_face_area="#fff000"
+                   face_select="#ffa4003c"
                    face_dot="#ffa900"
                    facedot_size="4"
-                   normal="#22dddd"
-                   face_select="#ffa4003c"
-                   handle_free="#7f7f7f"
-                   handle_sel_free="#3b3b3b"
-                   grid="#222222"
-                   lamp="#c1d40028"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#803060"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#f090a0"
-                   object_grouped="#083008"
-                   object_grouped_active="#55bb55"
-                   object_selected="#f15800"
-                   outline_width="1"
-                   panel="#a5a5a57f"
-                   skin_root="#000000"
-                   speaker="#535353"
-                   transform="#ffffff"
+                   act_spline="#db2512"
+                   handle_free="#7f7f7f"
+                   handle_auto="#909000"
                    handle_vect="#409030"
+                   handle_align="#803060"
+                   handle_sel_free="#3b3b3b"
+                   handle_sel_auto="#f0ff40"
                    handle_sel_vect="#40c030"
-                   vertex="#72cfdd"
+                   handle_sel_align="#f090a0"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#ffedf8"
+                   extra_face_angle="#00c900"
+                   extra_face_area="#fff000"
+                   editmesh_active="#ff020080"
+                   normal="#22dddd"
                    vertex_normal="#2361dd"
-                   vertex_select="#ff8500"
-                   vertex_size="3"
-                   wire="#888888">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="1"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#5a5a5a"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#0f0f0f"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#0f0f0f">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeView3D>
     </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#1b501b"
-                       disabled_marker="#7f0000"
-                       grid="#5e5e5e"
-                       handle_vertex="#e2e2e2"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#7f7f00"
-                       marker_outline="#0094af"
-                       path_after="#0000ff"
-                       path_before="#ff0000"
-                       selected_marker="#ffff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
+    <graph_editor>
+      <ThemeGraphEditor grid="#262626"
+                        panel="#ffffff"
+                        window_sliders="#969696"
+                        channels_region="#6d6d6d"
+                        vertex="#ffffff"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
+                        handle_free="#808080"
+                        handle_auto="#909000"
+                        handle_vect="#409030"
+                        handle_align="#803060"
+                        handle_sel_free="#808080"
+                        handle_sel_auto="#f0ff40"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f090a0"
+                        handle_auto_clamped="#994030"
+                        handle_sel_auto_clamped="#f0af90"
+                        lastsel_point="#808080"
+                        frame_current="#336622"
+                        handle_vertex="#808080"
+                        handle_vertex_select="#ff8500"
+                        handle_vertex_size="3"
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#52606e"
+                        dopesheet_subchannel="#7c8996">
         <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#979797"
-                             header_text_hi="#ffffff"
-                             button="#070707"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
+          <ThemeSpaceGeneric back="#0d0d0d"
+                             title="#5d5d5d"
                              text="#ffffff"
                              text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#0d0d0d">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#666666"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#dc6060"
-                    line_error="#dc6060"
-                    line_info="#00aa00"
-                    line_input="#cecece"
-                    line_output="#6080ff">
-        <space>
-          <ThemeSpaceGeneric header="#000000"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#0f0f0f">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#87b17d"
-                      channel_group="#4f6549"
-                      channels="#707070"
-                      channels_selected="#60c040"
-                      frame_current="#2a5c1c"
-                      dopesheet_channel="#52606e"
-                      dopesheet_subchannel="#7c8996"
-                      grid="#212121"
-                      long_key="#0c0a0a"
-                      long_key_selected="#ff8c00"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#969696">
-        <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#979797"
-                             header_text_hi="#ffffff"
-                             button="#000000"
                              button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#080808">
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
-          <ThemeSpaceListGeneric list="#020202"
-                                 list_text="#ebebeb"
-                                 list_text_hi="#ffffff"
-                                 list_title="#2c2c2c">
+          <ThemeSpaceListGeneric list="#1a1a1a"
+                                 list_title="#000000"
+                                 list_text="#bbbbbb"
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
+      </ThemeGraphEditor>
+    </graph_editor>
     <file_browser>
-      <ThemeFileBrowser active_file="#b1b1b1"
-                        active_file_text="#ffffff"
-                        scroll_handle="#7f7070"
+      <ThemeFileBrowser selected_file="#354d66"
+                        tiles="#343434"
                         scrollbar="#a0a0a0"
-                        selected_file="#354d66"
-                        tiles="#343434">
+                        scroll_handle="#7f7070"
+                        active_file="#b1b1b1"
+                        active_file_text="#ffffff">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#181818"
+                                 list_title="#9e9e9e"
                                  list_text="#5d5d5d"
-                                 list_text_hi="#ffffff"
-                                 list_title="#9e9e9e">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeFileBrowser>
     </file_browser>
-    <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#803060"
-                        handle_sel_align="#f090a0"
-                        handle_auto="#909000"
-                        handle_sel_auto="#f0ff40"
-                        handle_auto_clamped="#994030"
-                        handle_sel_auto_clamped="#f0af90"
-                        channel_group="#4f6549"
-                        channels_region="#6d6d6d"
-                        frame_current="#336622"
-                        dopesheet_channel="#52606e"
-                        dopesheet_subchannel="#7c8996"
-                        handle_free="#808080"
-                        handle_sel_free="#808080"
-                        grid="#262626"
-                        handle_vertex="#808080"
-                        handle_vertex_select="#ff8500"
-                        handle_vertex_size="3"
-                        lastsel_point="#808080"
-                        panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
-                        vertex="#ffffff"
-                        vertex_select="#ff8500"
-                        vertex_size="3"
-                        window_sliders="#969696">
+    <nla_editor>
+      <ThemeNLAEditor grid="#5e5e5e"
+                      view_sliders="#969696"
+                      active_action="#00000000"
+                      active_action_unset="#00000000"
+                      strips="#aa8d8d"
+                      strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
+                      frame_current="#2f6421">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#0d0d0d"
+                             title="#585858"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
+                             button_title="#c3c3c3"
                              button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#0c0c0c"
+                                 list_title="#383838"
+                                 list_text="#d8d8d8"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeNLAEditor>
+    </nla_editor>
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#212121"
+                      value_sliders="#000000"
+                      view_sliders="#969696"
+                      channels="#707070"
+                      channels_selected="#60c040"
+                      channel_group="#4f6549"
+                      active_channels_group="#87b17d"
+                      long_key="#0c0a0a"
+                      long_key_selected="#ff8c00"
+                      frame_current="#2a5c1c"
+                      dopesheet_channel="#52606e"
+                      dopesheet_subchannel="#7c8996"
+                      summary="#00000000">
+        <space>
+          <ThemeSpaceGeneric back="#080808"
+                             title="#5d5d5d"
                              text="#ffffff"
                              text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#0d0d0d">
+                             header="#000000"
+                             header_text="#979797"
+                             header_text_hi="#ffffff"
+                             button="#000000"
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
-          <ThemeSpaceListGeneric list="#1a1a1a"
-                                 list_text="#bbbbbb"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+          <ThemeSpaceListGeneric list="#020202"
+                                 list_title="#2c2c2c"
+                                 list_text="#ebebeb"
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeGraphEditor>
-    </graph_editor>
+      </ThemeDopeSheet>
+    </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
+      <ThemeImageEditor vertex="#0f13bb"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
                         face="#ffffff0a"
+                        face_select="#ff85003c"
                         face_dot="#ff8500"
                         facedot_size="3"
-                        face_select="#ff85003c"
+                        editmesh_active="#ffffff80"
                         scope_back="#050505ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
                         preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
                         preview_stitch_stitchable="#00ff00ff"
                         preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#0f13bb"
-                        vertex_select="#ff8500"
-                        vertex_size="3">
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeImageEditor>
     </image_editor>
-    <info>
-      <ThemeInfo>
+    <sequence_editor>
+      <ThemeSequenceEditor grid="#282828"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
+                           movieclip_strip="#20208f"
+                           image_strip="#6d5881"
+                           scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
+                           transition_strip="#a25f6f"
+                           meta_strip="#6d9183"
+                           frame_current="#2f5f23"
+                           keyframe="#ff8500"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
         <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#adadad"
-                             header_text_hi="#ffffff"
-                             button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c5c5c5"
-                             text="#9b9b9b"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#202020"
                              title="#5d5d5d"
-                             back="#000000">
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#f3f3f3"
+                             header_text_hi="#ffffff"
+                             button="#020202"
+                             button_title="#bdbdbd"
+                             button_text="#dddddd"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#a5a5a5">
+      </ThemeSequenceEditor>
+    </sequence_editor>
+    <properties>
+      <ThemeProperties panel="#828282">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeProperties>
+    </properties>
+    <text_editor>
+      <ThemeTextEditor line_numbers_background="#191919"
+                       selected_text="#202020"
+                       cursor="#ff0000"
+                       syntax_builtin="#cf3d99"
+                       syntax_special="#969629"
+                       syntax_comment="#249d60"
+                       syntax_string="#cc3535"
+                       syntax_numbers="#3c68ff">
+        <space>
+          <ThemeSpaceGeneric back="#050505"
+                             title="#9e9e9e"
+                             text="#ebebeb"
                              text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#070707">
+                             header="#000000"
+                             header_text="#b9b9b9"
+                             header_text_hi="#ffffff"
+                             button="#000000"
+                             button_title="#d8d8d8"
+                             button_text="#cccccc"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
-    <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#2f6421"
-                      grid="#5e5e5e"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
-                      active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
-                      strips="#aa8d8d"
-                      strips_selected="#ff8c00"
-                      transition_strips="#000000"
-                      transition_strips_selected="#000000"
-                      tweak="#000000"
-                      tweak_duplicate="#000000"
-                      view_sliders="#969696">
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#272727"
+                     frame_current="#2e5820">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#c7c7c7"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
+                             button_title="#c5c5c5"
                              button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
-                             button_title="#c3c3c3"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#585858"
-                             back="#0d0d0d">
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#0c0c0c"
-                                 list_text="#d8d8d8"
-                                 list_text_hi="#ffffff"
-                                 list_title="#383838">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeNLAEditor>
-    </nla_editor>
+      </ThemeTimeline>
+    </timeline>
     <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#113941"
-                       frame_node="#9a9b9ba0"
-                       group_node="#091a07"
-                       in_out_node="#273053"
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#6eafff"
+                       wire_select="#0019ff"
+                       selected_text="#7f7070"
                        node_backdrop="#202030bc"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
+                       in_out_node="#273053"
+                       converter_node="#113941"
                        operator_node="#0e3157"
-                       selected_text="#7f7070"
-                       wire_select="#0019ff"
-                       wire="#6eafff">
+                       group_node="#091a07"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#c7c7c7"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#a5a5a5"
+                                 list_title="#ffffff"
                                  list_text="#ffffff"
-                                 list_text_hi="#b8ffff"
-                                 list_title="#ffffff">
+                                 list_text_hi="#b8ffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNodeEditor>
     </node_editor>
+    <logic_editor>
+      <ThemeLogicEditor panel="#a5a5a5">
+        <space>
+          <ThemeSpaceGeneric back="#070707"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#979797"
+                             header_text_hi="#ffffff"
+                             button="#000000"
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeLogicEditor>
+    </logic_editor>
     <outliner>
       <ThemeOutliner match="#245824"
                      selected_highlight="#212844">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#070707"
+                             title="#9b9b9b"
+                             text="#cccccc"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#cccccc"
-                             text_hi="#ffffff"
-                             title="#9b9b9b"
-                             back="#070707">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeOutliner>
     </outliner>
-    <properties>
-      <ThemeProperties panel="#828282">
+    <info>
+      <ThemeInfo>
         <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#979797"
+          <ThemeSpaceGeneric back="#000000"
+                             title="#5d5d5d"
+                             text="#9b9b9b"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#adadad"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeProperties>
-    </properties>
-    <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
-                           movieclip_strip="#20208f"
-                           frame_current="#2f5f23"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#282828"
-                           image_strip="#6d5881"
-                           keyframe="#ff8500"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
-                           scene_strip="#4e983e"
-                           transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
+      </ThemeInfo>
+    </info>
+    <user_preferences>
+      <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#f3f3f3"
-                             header_text_hi="#ffffff"
-                             button="#020202"
-                             button_text="#dddddd"
-                             button_text_hi="#ffffff"
-                             button_title="#bdbdbd"
-                             text="#ffffff"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#000000"
                              title="#5d5d5d"
-                             back="#202020">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeSequenceEditor>
-    </sequence_editor>
-    <text_editor>
-      <ThemeTextEditor cursor="#ff0000"
-                       syntax_special="#969629"
-                       line_numbers_background="#191919"
-                       selected_text="#202020"
-                       syntax_builtin="#cf3d99"
-                       syntax_comment="#249d60"
-                       syntax_numbers="#3c68ff"
-                       syntax_string="#cc3535">
-        <space>
-          <ThemeSpaceGeneric header="#000000"
-                             header_text="#b9b9b9"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
+                             header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#cccccc"
-                             button_text_hi="#ffffff"
-                             button_title="#d8d8d8"
-                             text="#ebebeb"
-                             text_hi="#ffffff"
-                             title="#9e9e9e"
-                             back="#050505">
+                             button_title="#c5c5c5"
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#2e5820"
-                     grid="#272727">
+      </ThemeUserPreferences>
+    </user_preferences>
+    <console>
+      <ThemeConsole line_output="#6080ff"
+                    line_input="#cecece"
+                    line_info="#00aa00"
+                    line_error="#dc6060"
+                    cursor="#dc6060">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#0f0f0f"
+                             title="#5d5d5d"
+                             text="#7d7d7d"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
                              button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
                              button_title="#c5c5c5"
-                             text="#c7c7c7"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#2a2a2aff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#2a2a2aff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#000000ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#c7c7c7"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#000000ff"
-                            show_header="FALSE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#111111ff"
-                             item="#33406bff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#56ff00"
-                                  inner_anim_sel="#56ff00"
-                                  blend="0.1"
-                                  inner_driven="#b400ff"
-                                  inner_driven_sel="#9900e6"
-                                  inner_key="#fff400"
-                                  inner_key_sel="#fff400">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#e4e4e4"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#111111ff"
-                             inner_sel="#33406bff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="0"
-                             shadetop="-100"
-                             show_shaded="TRUE"
-                             text="#929292"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#191919e6"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#ffffff"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
-    <user_preferences>
-      <ThemeUserPreferences>
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#0094af"
+                       marker="#7f7f00"
+                       active_marker="#ffffff"
+                       selected_marker="#ffff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff0000"
+                       path_after="#0000ff"
+                       grid="#5e5e5e"
+                       frame_current="#1b501b"
+                       handle_vertex="#e2e2e2"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
-          <ThemeSpaceGeneric header="#000000"
+          <ThemeSpaceGeneric back="#0d0d0d"
+                             title="#5d5d5d"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#000000"
                              header_text="#979797"
                              header_text_hi="#ffffff"
-                             button="#000000"
-                             button_text="#c3c3c3"
-                             button_text_hi="#ffffff"
+                             button="#070707"
                              button_title="#c5c5c5"
-                             text="#7d7d7d"
-                             text_hi="#ffffff"
-                             title="#5d5d5d"
-                             back="#000000">
+                             button_text="#c3c3c3"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeUserPreferences>
-    </user_preferences>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f70a0a"
-                         show_colored_constraints="FALSE"
-                         normal="#9a0000"
-                         select="#bd1111">
+      <ThemeBoneColorSet normal="#9a0000"
+                         select="#bd1111"
+                         active="#f70a0a"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#fa9900"
-                         show_colored_constraints="FALSE"
-                         normal="#f74018"
-                         select="#f66913">
+      <ThemeBoneColorSet normal="#f74018"
+                         select="#f66913"
+                         active="#fa9900"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#83ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#1e9109"
-                         select="#59b70b">
+      <ThemeBoneColorSet normal="#1e9109"
+                         select="#59b70b"
+                         active="#83ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#5ec1ef"
-                         show_colored_constraints="FALSE"
-                         normal="#0a3694"
-                         select="#3667df">
+      <ThemeBoneColorSet normal="#0a3694"
+                         select="#3667df"
+                         active="#5ec1ef"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="FALSE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml
index 232276e300e..18ae3072208 100644
--- a/release/scripts/presets/interface_theme/blender_24x.xml
+++ b/release/scripts/presets/interface_theme/blender_24x.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#999999ff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#c6bab0ff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#d0d0d0ff"
+                             inner_sel="#667677ff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#aea8b2ff"
+                             inner_sel="#999999ff"
+                             item="#5a5a5aff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="10">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#aababbff"
+                             inner_sel="#667677ff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#d0d0d0ff"
+                             inner_sel="#7d7d7dff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="15"
+                             shadedown="-15">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#a1a1a1a4"
+                             inner_sel="#999999ff"
+                             item="#585858ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#808080ff"
+                             inner_sel="#999999ff"
+                             item="#d2d2d2ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-20"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#d4d4d4ff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#d0d0d0ff"
+                             inner_sel="#464646ff"
+                             item="#717171ff"
+                             text="#000000"
+                             text_sel="#cccccc"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3f3f3fff"
+                             inner_sel="#7f7f7fff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="15"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#d2d2d2ff"
+                             inner_sel="#999999ff"
+                             item="#646464ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="-25"
+                             shadedown="25">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#ffffddff"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#7f7f7fff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#262626"
+                             inner="#b4b4b42e"
+                             inner_sel="#646464b4"
+                             item="#b4b4b4ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#bebebeff"
+                             inner_sel="#646464b4"
+                             item="#444444ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#7f7f7fff"
+                             item="#000000ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#73be4c"
+                                  inner_anim_sel="#5aa633"
+                                  inner_key="#f0eb64"
+                                  inner_key_sel="#d7d34b"
+                                  inner_driven="#b400ff"
+                                  inner_driven_sel="#9900e6"
+                                  blend="0.5">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#00000019"
+                            show_header="FALSE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#ffbbff"
-                   editmesh_active="#ffffff80"
-                   act_spline="#db2512"
-                   handle_align="#803060"
-                   handle_sel_align="#f090a0"
-                   handle_auto="#909000"
-                   handle_sel_auto="#f0ff40"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#5c5c5c"
+                   panel="#a5a5a5ff"
+                   wire="#000000"
+                   lamp="#00000028"
+                   speaker="#000000"
                    camera="#000000"
-                   camera_path="#000000"
-                   frame_current="#60c040"
-                   edge_crease="#cc0099"
-                   extra_edge_len="#200000"
-                   edge_seam="#e69632"
+                   empty="#000000"
+                   object_selected="#ff88ff"
+                   object_active="#ffbbff"
+                   object_grouped="#104010"
+                   object_grouped_active="#55bb55"
+                   transform="#ffffff"
+                   vertex="#ff70ff"
+                   vertex_select="#ffff70"
+                   vertex_size="2"
                    edge_select="#cece38"
+                   edge_seam="#e69632"
                    edge_sharp="#ff2020"
+                   edge_crease="#cc0099"
                    edge_facesel="#4b4b4b"
-                   empty="#000000"
                    face="#0032961e"
-                   extra_face_angle="#000080"
-                   extra_face_area="#002000"
+                   face_select="#c864c83c"
                    face_dot="#ff8a30"
                    facedot_size="4"
-                   normal="#22dddd"
-                   face_select="#c864c83c"
-                   handle_free="#000000"
-                   handle_sel_free="#000000"
-                   grid="#5c5c5c"
-                   lamp="#00000028"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#803060"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#f090a0"
-                   object_grouped="#104010"
-                   object_grouped_active="#55bb55"
-                   object_selected="#ff88ff"
-                   outline_width="1"
-                   panel="#a5a5a5ff"
-                   skin_root="#000000"
-                   speaker="#000000"
-                   transform="#ffffff"
+                   act_spline="#db2512"
+                   handle_free="#000000"
+                   handle_auto="#909000"
                    handle_vect="#409030"
+                   handle_align="#803060"
+                   handle_sel_free="#000000"
+                   handle_sel_auto="#f0ff40"
                    handle_sel_vect="#40c030"
-                   vertex="#ff70ff"
+                   handle_sel_align="#f090a0"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#200000"
+                   extra_face_angle="#000080"
+                   extra_face_area="#002000"
+                   editmesh_active="#ffffff80"
+                   normal="#22dddd"
                    vertex_normal="#2361dd"
-                   vertex_select="#ffff70"
-                   vertex_size="2"
-                   wire="#000000">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="1"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#000000"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#757575"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#5a5a5a"
-                             button_text_hi="#ffffff"
                              button_title="#5a5a5a"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#757575">
+                             button_text="#5a5a5a"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeView3D>
     </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#60c040"
-                       disabled_marker="#7f0000"
-                       grid="#5e5e5e"
-                       handle_vertex="#000000"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#7f7f00"
-                       marker_outline="#000000"
-                       path_after="#0000ff"
-                       path_before="#ff0000"
-                       selected_marker="#ffff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
+    <graph_editor>
+      <ThemeGraphEditor grid="#818181"
+                        panel="#ffffff"
+                        window_sliders="#969696"
+                        channels_region="#707070"
+                        vertex="#000000"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
+                        handle_free="#000000"
+                        handle_auto="#909000"
+                        handle_vect="#409030"
+                        handle_align="#803060"
+                        handle_sel_free="#000000"
+                        handle_sel_auto="#f0ff40"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f090a0"
+                        handle_auto_clamped="#000000"
+                        handle_sel_auto_clamped="#000000"
+                        lastsel_point="#ffffff"
+                        frame_current="#60c040"
+                        handle_vertex="#000000"
+                        handle_vertex_select="#ff8500"
+                        handle_vertex_size="3"
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#52606e"
+                        dopesheet_subchannel="#7c8996">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#979797"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#727272"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#757575">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
-          <ThemeSpaceListGeneric list="#666666"
+          <ThemeSpaceListGeneric list="#b4b4b4"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#dc6060"
-                    line_error="#dc6060"
-                    line_info="#00aa00"
-                    line_input="#ffffff"
-                    line_output="#000000">
+      </ThemeGraphEditor>
+    </graph_editor>
+    <file_browser>
+      <ThemeFileBrowser selected_file="#a0a0d0"
+                        tiles="#b4b4b4"
+                        scrollbar="#a0a0a0"
+                        scroll_handle="#7f7070"
+                        active_file="#828282"
+                        active_file_text="#ffffff">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#808080"
                              title="#000000"
-                             back="#b4b4b4">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#87b17d"
-                      channel_group="#4f6549"
-                      channels="#707070"
-                      channels_selected="#60c040"
-                      frame_current="#60c040"
-                      dopesheet_channel="#52606e"
-                      dopesheet_subchannel="#7c8996"
-                      grid="#858585"
-                      long_key="#0c0a0a"
-                      long_key_selected="#ff8c00"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#969696">
-        <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+                             text="#000000"
+                             text_hi="#0f0f0f"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#a0a0a0">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#b4b4b4"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
-    <file_browser>
-      <ThemeFileBrowser active_file="#828282"
-                        active_file_text="#ffffff"
-                        scroll_handle="#7f7070"
-                        scrollbar="#a0a0a0"
-                        selected_file="#a0a0d0"
-                        tiles="#b4b4b4">
+      </ThemeFileBrowser>
+    </file_browser>
+    <nla_editor>
+      <ThemeNLAEditor grid="#5e5e5e"
+                      view_sliders="#969696"
+                      active_action="#00000000"
+                      active_action_unset="#00000000"
+                      strips="#0c0a0a"
+                      strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
+                      frame_current="#60c040">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#757575"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#0f0f0f"
-                             title="#000000"
-                             back="#808080">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#b4b4b4"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeFileBrowser>
-    </file_browser>
-    <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#803060"
-                        handle_sel_align="#f090a0"
-                        handle_auto="#909000"
-                        handle_sel_auto="#f0ff40"
-                        handle_auto_clamped="#000000"
-                        handle_sel_auto_clamped="#000000"
-                        channel_group="#4f6549"
-                        channels_region="#707070"
-                        frame_current="#60c040"
-                        dopesheet_channel="#52606e"
-                        dopesheet_subchannel="#7c8996"
-                        handle_free="#000000"
-                        handle_sel_free="#000000"
-                        grid="#818181"
-                        handle_vertex="#000000"
-                        handle_vertex_select="#ff8500"
-                        handle_vertex_size="3"
-                        lastsel_point="#ffffff"
-                        panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
-                        vertex="#000000"
-                        vertex_select="#ff8500"
-                        vertex_size="3"
-                        window_sliders="#969696">
+      </ThemeNLAEditor>
+    </nla_editor>
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#858585"
+                      value_sliders="#000000"
+                      view_sliders="#969696"
+                      channels="#707070"
+                      channels_selected="#60c040"
+                      channel_group="#4f6549"
+                      active_channels_group="#87b17d"
+                      long_key="#0c0a0a"
+                      long_key_selected="#ff8c00"
+                      frame_current="#60c040"
+                      dopesheet_channel="#52606e"
+                      dopesheet_subchannel="#7c8996"
+                      summary="#00000000">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#a0a0a0"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#b4b4b4"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#979797">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#b4b4b4"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeGraphEditor>
-    </graph_editor>
+      </ThemeDopeSheet>
+    </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
+      <ThemeImageEditor vertex="#000000"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
                         face="#ffffff0a"
+                        face_select="#ff85003c"
                         face_dot="#ff8500"
                         facedot_size="3"
-                        face_select="#ff85003c"
+                        editmesh_active="#ffffff80"
                         scope_back="#b4b4b4ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
                         preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
                         preview_stitch_stitchable="#00ff00ff"
                         preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#000000"
-                        vertex_select="#ff8500"
-                        vertex_size="3">
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#353535"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#353535">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeImageEditor>
     </image_editor>
-    <info>
-      <ThemeInfo>
+    <sequence_editor>
+      <ThemeSequenceEditor grid="#404040"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
+                           movieclip_strip="#20208f"
+                           image_strip="#6d5881"
+                           scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
+                           transition_strip="#a25f6f"
+                           meta_strip="#6d9183"
+                           frame_current="#60c040"
+                           keyframe="#ff8500"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#949494"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#b4b4b4">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#a5a5a5">
+      </ThemeSequenceEditor>
+    </sequence_editor>
+    <properties>
+      <ThemeProperties panel="#828282">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#b4b4b4">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
-    <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#60c040"
-                      grid="#5e5e5e"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
-                      active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
-                      strips="#0c0a0a"
-                      strips_selected="#ff8c00"
-                      transition_strips="#000000"
-                      transition_strips_selected="#000000"
-                      tweak="#000000"
-                      tweak_duplicate="#000000"
-                      view_sliders="#969696">
+      </ThemeProperties>
+    </properties>
+    <text_editor>
+      <ThemeTextEditor line_numbers_background="#818181"
+                       selected_text="#c67777"
+                       cursor="#ff0000"
+                       syntax_builtin="#800050"
+                       syntax_special="#5f5f00"
+                       syntax_comment="#006432"
+                       syntax_string="#640000"
+                       syntax_numbers="#0000c8">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#999999"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#5b5b5b"
+                     frame_current="#60c040">
+        <space>
+          <ThemeSpaceGeneric back="#999999"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#757575">
+                             header="#b4b4b4"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#b4b4b4"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#b4b4b4"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeNLAEditor>
-    </nla_editor>
+      </ThemeTimeline>
+    </timeline>
     <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#686a75"
-                       frame_node="#9a9b9ba0"
-                       group_node="#69756e"
-                       in_out_node="#646464"
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#000000"
+                       wire_select="#ffffff"
+                       selected_text="#7f7070"
                        node_backdrop="#9b9b9ba0"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
+                       in_out_node="#646464"
+                       converter_node="#686a75"
                        operator_node="#6c696f"
-                       selected_text="#7f7070"
-                       wire_select="#ffffff"
-                       wire="#000000">
+                       group_node="#69756e"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#757575"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#757575">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#a5a5a5"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNodeEditor>
     </node_editor>
-    <outliner>
-      <ThemeOutliner match="#337f33"
-                     selected_highlight="#82878c">
+    <logic_editor>
+      <ThemeLogicEditor panel="#a5a5a5">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#999999">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeOutliner>
-    </outliner>
-    <properties>
-      <ThemeProperties panel="#828282">
+      </ThemeLogicEditor>
+    </logic_editor>
+    <outliner>
+      <ThemeOutliner match="#337f33"
+                     selected_highlight="#82878c">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#999999"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#b4b4b4">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeProperties>
-    </properties>
-    <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
-                           movieclip_strip="#20208f"
-                           frame_current="#60c040"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#404040"
-                           image_strip="#6d5881"
-                           keyframe="#ff8500"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
-                           scene_strip="#4e983e"
-                           transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
+      </ThemeOutliner>
+    </outliner>
+    <info>
+      <ThemeInfo>
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#949494">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeSequenceEditor>
-    </sequence_editor>
-    <text_editor>
-      <ThemeTextEditor cursor="#ff0000"
-                       syntax_special="#5f5f00"
-                       line_numbers_background="#818181"
-                       selected_text="#c67777"
-                       syntax_builtin="#800050"
-                       syntax_comment="#006432"
-                       syntax_numbers="#0000c8"
-                       syntax_string="#640000">
+      </ThemeInfo>
+    </info>
+    <user_preferences>
+      <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#999999"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#999999">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#60c040"
-                     grid="#5b5b5b">
+      </ThemeUserPreferences>
+    </user_preferences>
+    <console>
+      <ThemeConsole line_output="#000000"
+                    line_input="#ffffff"
+                    line_info="#00aa00"
+                    line_error="#dc6060"
+                    cursor="#dc6060">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#999999">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#d4d4d4ff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#262626"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#7f7f7fff"
-                             item="#000000ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#d2d2d2ff"
-                             inner_sel="#999999ff"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="25"
-                             shadetop="-25"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#7f7f7fff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#d0d0d0ff"
-                             inner_sel="#464646ff"
-                             item="#717171ff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#cccccc">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#a1a1a1a4"
-                             inner_sel="#999999ff"
-                             item="#585858ff"
-                             outline="#262626"
-                             shadedown="0"
-                             shadetop="-5"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#aababbff"
-                             inner_sel="#667677ff"
-                             item="#ffffffff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#00000019"
-                            show_header="FALSE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#bebebeff"
-                             inner_sel="#646464b4"
-                             item="#444444ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#3f3f3fff"
-                             inner_sel="#7f7f7fff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="-10"
-                             shadetop="15"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#d0d0d0ff"
-                             inner_sel="#667677ff"
-                             item="#ffffffff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#999999ff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#b4b4b42e"
-                             inner_sel="#646464b4"
-                             item="#b4b4b4ff"
-                             outline="#262626"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#808080ff"
-                             inner_sel="#999999ff"
-                             item="#d2d2d2ff"
-                             outline="#262626"
-                             shadedown="0"
-                             shadetop="-20"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#73be4c"
-                                  inner_anim_sel="#5aa633"
-                                  blend="0.5"
-                                  inner_driven="#b400ff"
-                                  inner_driven_sel="#9900e6"
-                                  inner_key="#f0eb64"
-                                  inner_key_sel="#d7d34b">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#aea8b2ff"
-                             inner_sel="#999999ff"
-                             item="#5a5a5aff"
-                             outline="#262626"
-                             shadedown="10"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#d0d0d0ff"
-                             inner_sel="#7d7d7dff"
-                             item="#191919ff"
-                             outline="#262626"
-                             shadedown="-15"
-                             shadetop="15"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#c6bab0ff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#262626"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#ffffddff"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
-    <user_preferences>
-      <ThemeUserPreferences>
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#000000"
+                       marker="#7f7f00"
+                       active_marker="#ffffff"
+                       selected_marker="#ffff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff0000"
+                       path_after="#0000ff"
+                       grid="#5e5e5e"
+                       frame_current="#60c040"
+                       handle_vertex="#000000"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
-          <ThemeSpaceGeneric header="#b4b4b4"
+          <ThemeSpaceGeneric back="#757575"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#b4b4b4"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#999999">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeUserPreferences>
-    </user_preferences>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f70a0a"
-                         show_colored_constraints="FALSE"
-                         normal="#9a0000"
-                         select="#bd1111">
+      <ThemeBoneColorSet normal="#9a0000"
+                         select="#bd1111"
+                         active="#f70a0a"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#fa9900"
-                         show_colored_constraints="FALSE"
-                         normal="#f74018"
-                         select="#f66913">
+      <ThemeBoneColorSet normal="#f74018"
+                         select="#f66913"
+                         active="#fa9900"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#83ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#1e9109"
-                         select="#59b70b">
+      <ThemeBoneColorSet normal="#1e9109"
+                         select="#59b70b"
+                         active="#83ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#5ec1ef"
-                         show_colored_constraints="FALSE"
-                         normal="#0a3694"
-                         select="#3667df">
+      <ThemeBoneColorSet normal="#0a3694"
+                         select="#3667df"
+                         active="#5ec1ef"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="FALSE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml
index 581f5ce82d6..c10eb108000 100644
--- a/release/scripts/presets/interface_theme/elsyiun.xml
+++ b/release/scripts/presets/interface_theme/elsyiun.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#191919"
+                             inner="#4e4e4eff"
+                             inner_sel="#b67e3eff"
+                             item="#191919ff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#414141ff"
+                             inner_sel="#b67e3eff"
+                             item="#191919ff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#414141ff"
+                             inner_sel="#b67e3eff"
+                             item="#ffffffff"
+                             text="#b8b8b8"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#7a8287ff"
+                             inner_sel="#999999ff"
+                             item="#5a5a5aff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#4e4e4eff"
+                             inner_sel="#a9753aff"
+                             item="#ffffffff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#555555ff"
+                             inner_sel="#796348ff"
+                             item="#191919ff"
+                             text="#b8b8b8"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#414141ff"
+                             inner_sel="#999999ff"
+                             item="#7a7a7aff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#303030"
+                             inner="#606068ff"
+                             inner_sel="#91919dff"
+                             item="#4b4b4bff"
+                             text="#a2a2a2"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#2a2a2a"
+                             inner="#4b4b4bff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="-7">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#2c2c2c"
+                             inner="#444444ff"
+                             inner_sel="#464646ff"
+                             item="#7a7a7aff"
+                             text="#b8b8b8"
+                             text_sel="#cccccc"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3f3f3fff"
+                             inner_sel="#f78805ff"
+                             item="#ffffffff"
+                             text="#b8b8b8"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="25"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3b3b3bff"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#b8b8b8"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#191919e6"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#ffffff"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#b67e3eff"
+                             item="#ffffffff"
+                             text="#b8b8b8"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="20">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#2d2d2d"
+                             inner="#6c707200"
+                             inner_sel="#646464b4"
+                             item="#414141ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#bebebeff"
+                             inner_sel="#646464b4"
+                             item="#444444ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#a9753777"
+                             item="#000000ff"
+                             text="#e0e0e0"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#339900"
+                                  inner_anim_sel="#2b8000"
+                                  inner_key="#999300"
+                                  inner_key_sel="#666200"
+                                  inner_driven="#b400ff"
+                                  inner_driven_sel="#9900e6"
+                                  blend="0.5">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#00000019"
+                            show_header="FALSE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#ffc280"
-                   editmesh_active="#ffffff80"
-                   act_spline="#db2512"
-                   handle_align="#803060"
-                   handle_sel_align="#f090a0"
-                   handle_auto="#909000"
-                   handle_sel_auto="#f0ff40"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#585858"
+                   panel="#a5a5a57f"
+                   wire="#000000"
+                   lamp="#00000028"
+                   speaker="#000000"
                    camera="#000000"
-                   camera_path="#000000"
-                   frame_current="#60c040"
-                   edge_crease="#cc0099"
-                   extra_edge_len="#200000"
-                   edge_seam="#db2512"
+                   empty="#000000"
+                   object_selected="#ff8500"
+                   object_active="#ffc280"
+                   object_grouped="#083008"
+                   object_grouped_active="#55bb55"
+                   transform="#ffffff"
+                   vertex="#657780"
+                   vertex_select="#ff7c00"
+                   vertex_size="3"
                    edge_select="#cb7027"
+                   edge_seam="#db2512"
                    edge_sharp="#00ffff"
+                   edge_crease="#cc0099"
                    edge_facesel="#4b4b4b"
-                   empty="#000000"
                    face="#00000036"
-                   extra_face_angle="#000080"
-                   extra_face_area="#002000"
+                   face_select="#a47c5b73"
                    face_dot="#be6925"
                    facedot_size="3"
-                   normal="#22dddd"
-                   face_select="#a47c5b73"
-                   handle_free="#000000"
-                   handle_sel_free="#000000"
-                   grid="#585858"
-                   lamp="#00000028"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#803060"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#f090a0"
-                   object_grouped="#083008"
-                   object_grouped_active="#55bb55"
-                   object_selected="#ff8500"
-                   outline_width="1"
-                   panel="#a5a5a57f"
-                   skin_root="#000000"
-                   speaker="#000000"
-                   transform="#ffffff"
+                   act_spline="#db2512"
+                   handle_free="#000000"
+                   handle_auto="#909000"
                    handle_vect="#409030"
+                   handle_align="#803060"
+                   handle_sel_free="#000000"
+                   handle_sel_auto="#f0ff40"
                    handle_sel_vect="#40c030"
-                   vertex="#657780"
+                   handle_sel_align="#f090a0"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#200000"
+                   extra_face_angle="#000080"
+                   extra_face_area="#002000"
+                   editmesh_active="#ffffff80"
+                   normal="#22dddd"
                    vertex_normal="#2361dd"
-                   vertex_select="#ff7c00"
-                   vertex_size="3"
-                   wire="#000000">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="1"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#000000"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#000000"
+                             text="#b8b8b8"
+                             text_hi="#e9e9e9"
+                             header="#3b3b3b"
                              header_text="#b9b9b9"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#979797"
-                             button_text_hi="#ffffff"
                              button_title="#979797"
-                             text="#b8b8b8"
-                             text_hi="#e9e9e9"
-                             title="#000000"
-                             back="#4b4b4b">
+                             button_text="#979797"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeView3D>
     </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#60c040"
-                       disabled_marker="#7f0000"
-                       grid="#5e5e5e"
-                       handle_vertex="#000000"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#7f7f00"
-                       marker_outline="#000000"
-                       path_after="#0000ff"
-                       path_before="#ff0000"
-                       selected_marker="#ffff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
+    <graph_editor>
+      <ThemeGraphEditor grid="#585858"
+                        panel="#ffffff"
+                        window_sliders="#969696"
+                        channels_region="#707070"
+                        vertex="#000000"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
+                        handle_free="#000000"
+                        handle_auto="#909000"
+                        handle_vect="#409030"
+                        handle_align="#803060"
+                        handle_sel_free="#000000"
+                        handle_sel_auto="#f0ff40"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f090a0"
+                        handle_auto_clamped="#994030"
+                        handle_sel_auto_clamped="#f0af90"
+                        lastsel_point="#ffffff"
+                        frame_current="#60c040"
+                        handle_vertex="#000000"
+                        handle_vertex_select="#ff8500"
+                        handle_vertex_size="4"
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#52606e"
+                        dopesheet_subchannel="#545d66">
         <space>
-          <ThemeSpaceGeneric header="#313131"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#8b8b8b"
+                             text="#ffffff"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#393939">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#666666"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#dc6060"
-                    line_error="#dc6060"
-                    line_info="#00aa00"
-                    line_input="#ffffff"
-                    line_output="#b8b8b8">
-        <space>
-          <ThemeSpaceGeneric header="#303030"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#202020">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#87b17d"
-                      channel_group="#4f6549"
-                      channels="#707070"
-                      channels_selected="#60c040"
-                      frame_current="#60c040"
-                      dopesheet_channel="#52606e"
-                      dopesheet_subchannel="#7c8996"
-                      grid="#585858"
-                      long_key="#0c0a0a"
-                      long_key_selected="#ff8c00"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#969696">
-        <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#aaaaaa"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#4b4b4b">
+                             button_title="#8b8b8b"
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3b3b3b"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_title="#8b8b8b"
+                                 list_text="#8b8b8b"
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
+      </ThemeGraphEditor>
+    </graph_editor>
     <file_browser>
-      <ThemeFileBrowser active_file="#828282"
-                        active_file_text="#fafafa"
-                        scroll_handle="#7f7070"
+      <ThemeFileBrowser selected_file="#755129"
+                        tiles="#3b3b3b"
                         scrollbar="#a0a0a0"
-                        selected_file="#755129"
-                        tiles="#3b3b3b">
+                        scroll_handle="#7f7070"
+                        active_file="#828282"
+                        active_file_text="#fafafa">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#8b8b8b"
+                             text="#cacaca"
+                             text_hi="#0f0f0f"
+                             header="#3b3b3b"
                              header_text="#8b8b8b"
                              header_text_hi="#ffffff"
                              button="#303030"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#cacaca"
-                             text_hi="#0f0f0f"
-                             title="#8b8b8b"
-                             back="#4b4b4b">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3b3b3b"
+                                 list_title="#8b8b8b"
                                  list_text="#8b8b8b"
-                                 list_text_hi="#ffffff"
-                                 list_title="#8b8b8b">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeFileBrowser>
     </file_browser>
-    <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#803060"
-                        handle_sel_align="#f090a0"
-                        handle_auto="#909000"
-                        handle_sel_auto="#f0ff40"
-                        handle_auto_clamped="#994030"
-                        handle_sel_auto_clamped="#f0af90"
-                        channel_group="#4f6549"
-                        channels_region="#707070"
-                        frame_current="#60c040"
-                        dopesheet_channel="#52606e"
-                        dopesheet_subchannel="#545d66"
-                        handle_free="#000000"
-                        handle_sel_free="#000000"
-                        grid="#585858"
-                        handle_vertex="#000000"
-                        handle_vertex_select="#ff8500"
-                        handle_vertex_size="4"
-                        lastsel_point="#ffffff"
-                        panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
-                        vertex="#000000"
-                        vertex_select="#ff8500"
-                        vertex_size="3"
-                        window_sliders="#969696">
+    <nla_editor>
+      <ThemeNLAEditor grid="#585858"
+                      view_sliders="#969696"
+                      active_action="#00000000"
+                      active_action_unset="#00000000"
+                      strips="#0c0a0a"
+                      strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
+                      frame_current="#60c040">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#8b8b8b"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
-                             button_title="#8b8b8b"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#3b3b3b"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeNLAEditor>
+    </nla_editor>
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#585858"
+                      value_sliders="#000000"
+                      view_sliders="#969696"
+                      channels="#707070"
+                      channels_selected="#60c040"
+                      channel_group="#4f6549"
+                      active_channels_group="#87b17d"
+                      long_key="#0c0a0a"
+                      long_key_selected="#ff8c00"
+                      frame_current="#60c040"
+                      dopesheet_channel="#52606e"
+                      dopesheet_subchannel="#7c8996"
+                      summary="#00000000">
+        <space>
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#000000"
                              text="#ffffff"
                              text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#4b4b4b">
+                             header="#3b3b3b"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#aaaaaa"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3b3b3b"
-                                 list_text="#8b8b8b"
-                                 list_text_hi="#ffffff"
-                                 list_title="#8b8b8b">
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeGraphEditor>
-    </graph_editor>
+      </ThemeDopeSheet>
+    </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
+      <ThemeImageEditor vertex="#32adec"
+                        vertex_select="#be6925"
+                        vertex_size="3"
                         face="#a47c5b0a"
+                        face_select="#a47c5b3c"
                         face_dot="#ffffff"
                         facedot_size="3"
-                        face_select="#a47c5b3c"
+                        editmesh_active="#ffffff80"
                         scope_back="#303030ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
                         preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
                         preview_stitch_stitchable="#00ff00ff"
                         preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#32adec"
-                        vertex_select="#be6925"
-                        vertex_size="3">
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#303030"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#8b8b8b"
+                             text="#8b8b8b"
+                             text_hi="#ffffff"
+                             header="#303030"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#303030"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
                              button_title="#8b8b8b"
-                             text="#8b8b8b"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#4b4b4b">
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeImageEditor>
     </image_editor>
-    <info>
-      <ThemeInfo>
+    <sequence_editor>
+      <ThemeSequenceEditor grid="#818181"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
+                           movieclip_strip="#20208f"
+                           image_strip="#6d5881"
+                           scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
+                           transition_strip="#a25f6f"
+                           meta_strip="#6d9183"
+                           frame_current="#60c040"
+                           keyframe="#ff8500"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#636363"
+                             title="#8b8b8b"
+                             text="#ffffff"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
-                             header_text_hi="#000000"
+                             header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#000000"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#000000"
-                             title="#000000"
-                             back="#727272">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#3b3b3b">
+      </ThemeSequenceEditor>
+    </sequence_editor>
+    <properties>
+      <ThemeProperties panel="#828282">
+        <space>
+          <ThemeSpaceGeneric back="#3b3b3b"
+                             title="#979797"
+                             text="#b8b8b8"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#727272"
+                             button_title="#b8b8b8"
+                             button_text="#b8b8b8"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeProperties>
+    </properties>
+    <text_editor>
+      <ThemeTextEditor line_numbers_background="#2e2e2e"
+                       selected_text="#4e4e8f"
+                       cursor="#8b8bff"
+                       syntax_builtin="#808bed"
+                       syntax_special="#c080d0"
+                       syntax_comment="#cd8b00"
+                       syntax_string="#ffcd8b"
+                       syntax_numbers="#f0ad6d">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#1e1e27"
+                             title="#8b8b8b"
+                             text="#cfbfad"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
                              button_title="#8b8b8b"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#3b3b3b">
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
-    <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#60c040"
-                      grid="#585858"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
-                      active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
-                      strips="#0c0a0a"
-                      strips_selected="#ff8c00"
-                      transition_strips="#000000"
-                      transition_strips_selected="#000000"
-                      tweak="#000000"
-                      tweak_duplicate="#000000"
-                      view_sliders="#969696">
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#5b5b5b"
+                     frame_current="#60c040">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#000000"
+                             text="#b8b8b8"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#727272"
                              button_title="#000000"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#4b4b4b">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#3b3b3b"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeNLAEditor>
-    </nla_editor>
+      </ThemeTimeline>
+    </timeline>
     <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#575675"
-                       frame_node="#9a9b9ba0"
-                       group_node="#1e7524"
-                       in_out_node="#e08706"
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#000000"
+                       wire_select="#ffffff"
+                       selected_text="#7f7070"
                        node_backdrop="#9b9b9ba0"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
+                       in_out_node="#e08706"
+                       converter_node="#575675"
                        operator_node="#2c6f6f"
-                       selected_text="#7f7070"
-                       wire_select="#ffffff"
-                       wire="#000000">
+                       group_node="#1e7524"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#3b3b3b"
+                             title="#8b8b8b"
+                             text="#dbdbdb"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
                              button_title="#8b8b8b"
-                             text="#dbdbdb"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#3b3b3b">
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#a5a5a5"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNodeEditor>
     </node_editor>
+    <logic_editor>
+      <ThemeLogicEditor panel="#3b3b3b">
+        <space>
+          <ThemeSpaceGeneric back="#3b3b3b"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#3b3b3b"
+                             button_title="#8b8b8b"
+                             button_text="#8b8b8b"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeLogicEditor>
+    </logic_editor>
     <outliner>
       <ThemeOutliner match="#337f33"
                      selected_highlight="#82878c">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#4b4b4b"
+                             title="#000000"
+                             text="#cacaca"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#cacaca"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#4b4b4b">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeOutliner>
     </outliner>
-    <properties>
-      <ThemeProperties panel="#828282">
+    <info>
+      <ThemeInfo>
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#727272"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#000000"
+                             header="#3b3b3b"
                              header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#727272"
-                             button_text="#b8b8b8"
-                             button_text_hi="#ffffff"
-                             button_title="#b8b8b8"
-                             text="#b8b8b8"
-                             text_hi="#ffffff"
-                             title="#979797"
-                             back="#3b3b3b">
+                             header_text_hi="#000000"
+                             button="#3b3b3b"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#000000">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeProperties>
-    </properties>
-    <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
-                           movieclip_strip="#20208f"
-                           frame_current="#60c040"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#818181"
-                           image_strip="#6d5881"
-                           keyframe="#ff8500"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
-                           scene_strip="#4e983e"
-                           transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
+      </ThemeInfo>
+    </info>
+    <user_preferences>
+      <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#3b3b3b"
+                             title="#000000"
+                             text="#b8b8b8"
+                             text_hi="#ffffff"
+                             header="#3b3b3b"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#3b3b3b"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#727272"
                              button_title="#000000"
-                             text="#ffffff"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#636363">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeSequenceEditor>
-    </sequence_editor>
-    <text_editor>
-      <ThemeTextEditor cursor="#8b8bff"
-                       syntax_special="#c080d0"
-                       line_numbers_background="#2e2e2e"
-                       selected_text="#4e4e8f"
-                       syntax_builtin="#808bed"
-                       syntax_comment="#cd8b00"
-                       syntax_numbers="#f0ad6d"
-                       syntax_string="#ffcd8b">
+      </ThemeUserPreferences>
+    </user_preferences>
+    <console>
+      <ThemeConsole line_output="#b8b8b8"
+                    line_input="#ffffff"
+                    line_info="#00aa00"
+                    line_error="#dc6060"
+                    cursor="#dc6060">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+          <ThemeSpaceGeneric back="#202020"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#303030"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#3b3b3b"
-                             button_text="#8b8b8b"
-                             button_text_hi="#ffffff"
-                             button_title="#8b8b8b"
-                             text="#cfbfad"
-                             text_hi="#ffffff"
-                             title="#8b8b8b"
-                             back="#1e1e27">
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#60c040"
-                     grid="#5b5b5b">
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#000000"
+                       marker="#7f7f00"
+                       active_marker="#ffffff"
+                       selected_marker="#ffff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff0000"
+                       path_after="#0000ff"
+                       grid="#5e5e5e"
+                       frame_current="#60c040"
+                       handle_vertex="#000000"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#b8b8b8"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#393939"
                              title="#000000"
-                             back="#4b4b4b">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#4b4b4bff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#2a2a2a"
-                             shadedown="-7"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#a9753777"
-                             item="#000000ff"
-                             outline="#000000"
-                             shadedown="-10"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#e0e0e0"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#3b3b3bff"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#b67e3eff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="20"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#444444ff"
-                             inner_sel="#464646ff"
-                             item="#7a7a7aff"
-                             outline="#2c2c2c"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#cccccc">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#414141ff"
-                             inner_sel="#999999ff"
-                             item="#7a7a7aff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#4e4e4eff"
-                             inner_sel="#a9753aff"
-                             item="#ffffffff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#00000019"
-                            show_header="FALSE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#bebebeff"
-                             inner_sel="#646464b4"
-                             item="#444444ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
                              text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#3f3f3fff"
-                             inner_sel="#f78805ff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="25"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#414141ff"
-                             inner_sel="#b67e3eff"
-                             item="#ffffffff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#4e4e4eff"
-                             inner_sel="#b67e3eff"
-                             item="#191919ff"
-                             outline="#191919"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#6c707200"
-                             inner_sel="#646464b4"
-                             item="#414141ff"
-                             outline="#2d2d2d"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#606068ff"
-                             inner_sel="#91919dff"
-                             item="#4b4b4bff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="-10"
-                             show_shaded="TRUE"
-                             text="#a2a2a2"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#339900"
-                                  inner_anim_sel="#2b8000"
-                                  blend="0.5"
-                                  inner_driven="#b400ff"
-                                  inner_driven_sel="#9900e6"
-                                  inner_key="#999300"
-                                  inner_key_sel="#666200">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#7a8287ff"
-                             inner_sel="#999999ff"
-                             item="#5a5a5aff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#555555ff"
-                             inner_sel="#796348ff"
-                             item="#191919ff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#414141ff"
-                             inner_sel="#b67e3eff"
-                             item="#191919ff"
-                             outline="#303030"
-                             shadedown="0"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#b8b8b8"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#191919e6"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#ffffff"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
-    <user_preferences>
-      <ThemeUserPreferences>
-        <space>
-          <ThemeSpaceGeneric header="#3b3b3b"
+                             text_hi="#ffffff"
+                             header="#313131"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#3b3b3b"
                              button_title="#000000"
-                             text="#b8b8b8"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#3b3b3b">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeUserPreferences>
-    </user_preferences>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f70a0a"
-                         show_colored_constraints="FALSE"
-                         normal="#9a0000"
-                         select="#bd1111">
+      <ThemeBoneColorSet normal="#9a0000"
+                         select="#bd1111"
+                         active="#f70a0a"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#fa9900"
-                         show_colored_constraints="FALSE"
-                         normal="#f74018"
-                         select="#f66913">
+      <ThemeBoneColorSet normal="#f74018"
+                         select="#f66913"
+                         active="#fa9900"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#83ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#1e9109"
-                         select="#59b70b">
+      <ThemeBoneColorSet normal="#1e9109"
+                         select="#59b70b"
+                         active="#83ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#5ec1ef"
-                         show_colored_constraints="FALSE"
-                         normal="#0a3694"
-                         select="#3667df">
+      <ThemeBoneColorSet normal="#0a3694"
+                         select="#3667df"
+                         active="#5ec1ef"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="FALSE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml
index 61730583396..ad514bbbafa 100644
--- a/release/scripts/presets/interface_theme/hexagon.xml
+++ b/release/scripts/presets/interface_theme/hexagon.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#191919"
+                             inner="#8d909fff"
+                             inner_sel="#859cb9ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#8d909fff"
+                             inner_sel="#859cb9ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#8b8d9aff"
+                             inner_sel="#859cb9ff"
+                             item="#ffffffff"
+                             text="#000000"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#464646"
+                             inner="#9b9eadff"
+                             inner_sel="#999999ff"
+                             item="#5a5a5aff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="25">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#464646"
+                             inner="#bbbbbbff"
+                             inner_sel="#777777ff"
+                             item="#ffffffff"
+                             text="#cecece"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#464646"
+                             inner="#afafafff"
+                             inner_sel="#859cb9ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#000000"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#464646"
+                             inner="#8d909fff"
+                             inner_sel="#999999ff"
+                             item="#5d5d5dff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#3f3f3f"
+                             inner="#b4b4b4ff"
+                             inner_sel="#999999ff"
+                             item="#b0b0b0ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-20"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#191919"
+                             inner="#80828eff"
+                             inner_sel="#646464ff"
+                             item="#191919ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#3d3d3d"
+                             inner="#555d6dff"
+                             inner_sel="#464646ff"
+                             item="#9d9d9dff"
+                             text="#ffffff"
+                             text_sel="#cccccc"
+                             show_shaded="TRUE"
+                             shadetop="15"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3f3f3fff"
+                             inner_sel="#50c8ffff"
+                             item="#ffffffff"
+                             text="#d8d8d8"
+                             text_sel="#000000"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#393c44eb"
+                             inner_sel="#2d2d2dff"
+                             item="#646464ff"
+                             text="#cecece"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="40"
+                             shadedown="-40">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#191919e6"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#ffffff"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#69a5beff"
+                             item="#ffffffff"
+                             text="#d9d9d9"
+                             text_sel="#000000"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#4f5057"
+                             inner="#5050502e"
+                             inner_sel="#646464b4"
+                             item="#737a8eff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#bebebeff"
+                             inner_sel="#646464b4"
+                             item="#444444ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#50c8ff62"
+                             item="#000000ff"
+                             text="#000000"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#73be4c"
+                                  inner_anim_sel="#5aa633"
+                                  inner_key="#f0eb64"
+                                  inner_key_sel="#d7d34b"
+                                  inner_driven="#b400ff"
+                                  inner_driven_sel="#9900e6"
+                                  blend="0.5">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#00000019"
+                            show_header="TRUE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#6ed8ff"
-                   editmesh_active="#00e8ff80"
-                   act_spline="#db2512"
-                   handle_align="#803060"
-                   handle_sel_align="#f090a0"
-                   handle_auto="#909000"
-                   handle_sel_auto="#f0ff40"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#5e5e83"
+                   panel="#a5a5a5ff"
+                   wire="#000000"
+                   lamp="#00000028"
+                   speaker="#000000"
                    camera="#000000"
-                   camera_path="#000000"
-                   frame_current="#60c040"
-                   edge_crease="#cc0099"
-                   extra_edge_len="#200000"
-                   edge_seam="#e69632"
+                   empty="#000000"
+                   object_selected="#52c6ff"
+                   object_active="#6ed8ff"
+                   object_grouped="#104010"
+                   object_grouped_active="#55bb55"
+                   transform="#ffffff"
+                   vertex="#334cca"
+                   vertex_select="#0097da"
+                   vertex_size="3"
                    edge_select="#1151ce"
+                   edge_seam="#e69632"
                    edge_sharp="#ff2020"
+                   edge_crease="#cc0099"
                    edge_facesel="#4b4b4b"
-                   empty="#000000"
                    face="#affff418"
-                   extra_face_angle="#00008a"
-                   extra_face_area="#002000"
+                   face_select="#1151ce66"
                    face_dot="#4fc9ff"
                    facedot_size="3"
-                   normal="#00ffff"
-                   face_select="#1151ce66"
-                   handle_free="#000000"
-                   handle_sel_free="#000000"
-                   grid="#5e5e83"
-                   lamp="#00000028"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#803060"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#f090a0"
-                   object_grouped="#104010"
-                   object_grouped_active="#55bb55"
-                   object_selected="#52c6ff"
-                   outline_width="1"
-                   panel="#a5a5a5ff"
-                   skin_root="#000000"
-                   speaker="#000000"
-                   transform="#ffffff"
+                   act_spline="#db2512"
+                   handle_free="#000000"
+                   handle_auto="#909000"
                    handle_vect="#409030"
+                   handle_align="#803060"
+                   handle_sel_free="#000000"
+                   handle_sel_auto="#f0ff40"
                    handle_sel_vect="#40c030"
-                   vertex="#334cca"
+                   handle_sel_align="#f090a0"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#200000"
+                   extra_face_angle="#00008a"
+                   extra_face_area="#002000"
+                   editmesh_active="#00e8ff80"
+                   normal="#00ffff"
                    vertex_normal="#2361dd"
-                   vertex_select="#0097da"
-                   vertex_size="3"
-                   wire="#000000">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="1"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#000000"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#646875"
+          <ThemeSpaceGeneric back="#7f818d"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#646875"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#6c717f"
-                             button_text="#d7d7d7"
-                             button_text_hi="#ffffff"
                              button_title="#eaeaea"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7f818d">
+                             button_text="#d7d7d7"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeView3D>
     </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#60c040"
-                       disabled_marker="#7f0000"
-                       grid="#5e5e5e"
-                       handle_vertex="#000000"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#7f7f00"
-                       marker_outline="#000000"
-                       path_after="#0000ff"
-                       path_before="#ff0000"
-                       selected_marker="#ffff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
+    <graph_editor>
+      <ThemeGraphEditor grid="#58587c"
+                        panel="#ffffff"
+                        window_sliders="#969696"
+                        channels_region="#707070"
+                        vertex="#000000"
+                        vertex_select="#ff8500"
+                        vertex_size="3"
+                        handle_free="#000000"
+                        handle_auto="#909000"
+                        handle_vect="#409030"
+                        handle_align="#803060"
+                        handle_sel_free="#000000"
+                        handle_sel_auto="#f0ff40"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f090a0"
+                        handle_auto_clamped="#000000"
+                        handle_sel_auto_clamped="#000000"
+                        lastsel_point="#ffffff"
+                        frame_current="#60c040"
+                        handle_vertex="#000000"
+                        handle_vertex_select="#ff8500"
+                        handle_vertex_size="3"
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#52606e"
+                        dopesheet_subchannel="#7c8996">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#7c7e88"
                              title="#000000"
-                             back="#7c7e88">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#666666"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#dc6060"
-                    line_error="#dc0606"
-                    line_info="#00aa00"
-                    line_input="#ffffff"
-                    line_output="#000000">
-        <space>
-          <ThemeSpaceGeneric header="#5c606c"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#6c717f"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#87b17d"
-                      channel_group="#4f6549"
-                      channels="#707070"
-                      channels_selected="#60c040"
-                      frame_current="#60c040"
-                      dopesheet_channel="#52606e"
-                      dopesheet_subchannel="#7c8996"
-                      grid="#58587c"
-                      long_key="#0c0a0a"
-                      long_key_selected="#ff8c00"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#969696">
-        <space>
-          <ThemeSpaceGeneric header="#5c606c"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#6c717f"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#646875"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#6c717f"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
+      </ThemeGraphEditor>
+    </graph_editor>
     <file_browser>
-      <ThemeFileBrowser active_file="#859cb9"
-                        active_file_text="#fafafa"
-                        scroll_handle="#7f7070"
+      <ThemeFileBrowser selected_file="#69a5be"
+                        tiles="#5c606c"
                         scrollbar="#a0a0a0"
-                        selected_file="#69a5be"
-                        tiles="#5c606c">
+                        scroll_handle="#7f7070"
+                        active_file="#859cb9"
+                        active_file_text="#fafafa">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#646875"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#0f0f0f"
+                             header="#5c606c"
                              header_text="#dddddd"
                              header_text_hi="#ffffff"
                              button="#6c717f"
-                             button_text="#d7d7d7"
-                             button_text_hi="#ffffff"
                              button_title="#d7d7d7"
-                             text="#000000"
-                             text_hi="#0f0f0f"
-                             title="#000000"
-                             back="#646875">
+                             button_text="#d7d7d7"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#6c717f"
+                                 list_title="#d7d7d7"
                                  list_text="#d7d7d7"
-                                 list_text_hi="#ffffff"
-                                 list_title="#d7d7d7">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeFileBrowser>
     </file_browser>
-    <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#803060"
-                        handle_sel_align="#f090a0"
-                        handle_auto="#909000"
-                        handle_sel_auto="#f0ff40"
-                        handle_auto_clamped="#000000"
-                        handle_sel_auto_clamped="#000000"
-                        channel_group="#4f6549"
-                        channels_region="#707070"
-                        frame_current="#60c040"
-                        dopesheet_channel="#52606e"
-                        dopesheet_subchannel="#7c8996"
-                        handle_free="#000000"
-                        handle_sel_free="#000000"
-                        grid="#58587c"
-                        handle_vertex="#000000"
-                        handle_vertex_select="#ff8500"
-                        handle_vertex_size="3"
-                        lastsel_point="#ffffff"
-                        panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
-                        vertex="#000000"
-                        vertex_select="#ff8500"
-                        vertex_size="3"
-                        window_sliders="#969696">
+    <nla_editor>
+      <ThemeNLAEditor grid="#5e5e5e"
+                      view_sliders="#969696"
+                      active_action="#00000000"
+                      active_action_unset="#00000000"
+                      strips="#0c0a0a"
+                      strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
+                      frame_current="#60c040">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#646875"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeNLAEditor>
+    </nla_editor>
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#58587c"
+                      value_sliders="#000000"
+                      view_sliders="#969696"
+                      channels="#707070"
+                      channels_selected="#60c040"
+                      channel_group="#4f6549"
+                      active_channels_group="#87b17d"
+                      long_key="#0c0a0a"
+                      long_key_selected="#ff8c00"
+                      frame_current="#60c040"
+                      dopesheet_channel="#52606e"
+                      dopesheet_subchannel="#7c8996"
+                      summary="#00000000">
+        <space>
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             header="#5c606c"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#6c717f"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#6c717f"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeGraphEditor>
-    </graph_editor>
+      </ThemeDopeSheet>
+    </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
+      <ThemeImageEditor vertex="#334cca"
+                        vertex_select="#50c8ff"
+                        vertex_size="3"
                         face="#ffffff0a"
+                        face_select="#50c8ff3c"
                         face_dot="#50c8ff"
                         facedot_size="3"
-                        face_select="#50c8ff3c"
+                        editmesh_active="#ffffff80"
                         scope_back="#646875ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
                         preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
                         preview_stitch_stitchable="#00ff00ff"
                         preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#334cca"
-                        vertex_select="#50c8ff"
-                        vertex_size="3">
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#646875"
-                             button_text="#eeeeee"
-                             button_text_hi="#ffffff"
                              button_title="#eeeeee"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button_text="#eeeeee"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeImageEditor>
     </image_editor>
-    <info>
-      <ThemeInfo>
+    <sequence_editor>
+      <ThemeSequenceEditor grid="#404040"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
+                           movieclip_strip="#20208f"
+                           image_strip="#6d5881"
+                           scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
+                           transition_strip="#a25f6f"
+                           meta_strip="#6d9183"
+                           frame_current="#60c040"
+                           keyframe="#ff8500"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
         <space>
-          <ThemeSpaceGeneric header="#646875"
-                             header_text="#dddddd"
-                             header_text_hi="#ffffff"
-                             button="#b4b4b4"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
+          <ThemeSpaceGeneric back="#90929c"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#b4b4b4">
+                             header="#5c606c"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#646875"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#a5a5a5">
+      </ThemeSequenceEditor>
+    </sequence_editor>
+    <properties>
+      <ThemeProperties panel="#828282">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#646875"
+                             title="#ffffff"
+                             text="#e7e7e7"
+                             text_hi="#ffffff"
+                             header="#646875"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#6c717f"
-                             button_text="#d7d7d7"
-                             button_text_hi="#ffffff"
-                             button_title="#d7d7d7"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button="#727272"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
-    <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#60c040"
-                      grid="#5e5e5e"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
-                      active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
-                      strips="#0c0a0a"
-                      strips_selected="#ff8c00"
-                      transition_strips="#000000"
-                      transition_strips_selected="#000000"
-                      tweak="#000000"
-                      tweak_duplicate="#000000"
-                      view_sliders="#969696">
+      </ThemeProperties>
+    </properties>
+    <text_editor>
+      <ThemeTextEditor line_numbers_background="#5a5e6a"
+                       selected_text="#c67777"
+                       cursor="#ff0000"
+                       syntax_builtin="#800050"
+                       syntax_special="#5f5f00"
+                       syntax_comment="#006432"
+                       syntax_string="#640000"
+                       syntax_numbers="#0000c8">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#58587c"
+                     frame_current="#60c040">
+        <space>
+          <ThemeSpaceGeneric back="#646875"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             header="#565863"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#5a5e6a"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#646875"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeNLAEditor>
-    </nla_editor>
+      </ThemeTimeline>
+    </timeline>
     <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#686a84"
-                       frame_node="#9a9b9ba0"
-                       group_node="#69756e"
-                       in_out_node="#64647b"
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#000000"
+                       wire_select="#ffffff"
+                       selected_text="#7f7070"
                        node_backdrop="#9b9baca0"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
+                       in_out_node="#64647b"
+                       converter_node="#686a84"
                        operator_node="#6c697e"
-                       selected_text="#7f7070"
-                       wire_select="#ffffff"
-                       wire="#000000">
+                       group_node="#69756e"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#a7a7a7"
+                                 list_title="#000000"
                                  list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNodeEditor>
     </node_editor>
+    <logic_editor>
+      <ThemeLogicEditor panel="#a5a5a5">
+        <space>
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
+                             header_text="#000000"
+                             header_text_hi="#ffffff"
+                             button="#6c717f"
+                             button_title="#d7d7d7"
+                             button_text="#d7d7d7"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeLogicEditor>
+    </logic_editor>
     <outliner>
       <ThemeOutliner match="#245824"
                      selected_highlight="#212844">
         <space>
-          <ThemeSpaceGeneric header="#6c717f"
+          <ThemeSpaceGeneric back="#72747c"
+                             title="#000000"
+                             text="#e2e2e2"
+                             text_hi="#ffffff"
+                             header="#6c717f"
                              header_text="#000000"
                              header_text_hi="#ffffff"
                              button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#e2e2e2"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#72747c">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeOutliner>
     </outliner>
-    <properties>
-      <ThemeProperties panel="#828282">
+    <info>
+      <ThemeInfo>
         <space>
-          <ThemeSpaceGeneric header="#646875"
-                             header_text="#000000"
+          <ThemeSpaceGeneric back="#b4b4b4"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#646875"
+                             header_text="#dddddd"
                              header_text_hi="#ffffff"
-                             button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#b4b4b4"
                              button_title="#000000"
-                             text="#e7e7e7"
-                             text_hi="#ffffff"
-                             title="#ffffff"
-                             back="#646875">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeProperties>
-    </properties>
-    <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
-                           movieclip_strip="#20208f"
-                           frame_current="#60c040"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#404040"
-                           image_strip="#6d5881"
-                           keyframe="#ff8500"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
-                           scene_strip="#4e983e"
-                           transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
+      </ThemeInfo>
+    </info>
+    <user_preferences>
+      <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
-                             header_text="#000000"
-                             header_text_hi="#ffffff"
-                             button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
                              text="#000000"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#90929c">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeSequenceEditor>
-    </sequence_editor>
-    <text_editor>
-      <ThemeTextEditor cursor="#ff0000"
-                       syntax_special="#5f5f00"
-                       line_numbers_background="#5a5e6a"
-                       selected_text="#c67777"
-                       syntax_builtin="#800050"
-                       syntax_comment="#006432"
-                       syntax_numbers="#0000c8"
-                       syntax_string="#640000">
-        <space>
-          <ThemeSpaceGeneric header="#5c606c"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#646875"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#6c717f"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#60c040"
-                     grid="#58587c">
+      </ThemeUserPreferences>
+    </user_preferences>
+    <console>
+      <ThemeConsole line_output="#000000"
+                    line_input="#ffffff"
+                    line_info="#00aa00"
+                    line_error="#dc0606"
+                    cursor="#dc6060">
         <space>
-          <ThemeSpaceGeneric header="#565863"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#5a5e6a"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#6c717f"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#646875">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#80828eff"
-                             inner_sel="#646464ff"
-                             item="#191919ff"
-                             outline="#191919"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#50c8ff62"
-                             item="#000000ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#393c44eb"
-                             inner_sel="#2d2d2dff"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-40"
-                             shadetop="40"
-                             show_shaded="FALSE"
-                             text="#cecece"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#69a5beff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#d9d9d9"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#555d6dff"
-                             inner_sel="#464646ff"
-                             item="#9d9d9dff"
-                             outline="#3d3d3d"
-                             shadedown="0"
-                             shadetop="15"
-                             show_shaded="TRUE"
-                             text="#ffffff"
-                             text_sel="#cccccc">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#8d909fff"
-                             inner_sel="#999999ff"
-                             item="#5d5d5dff"
-                             outline="#464646"
-                             shadedown="0"
-                             shadetop="-10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#bbbbbbff"
-                             inner_sel="#777777ff"
-                             item="#ffffffff"
-                             outline="#464646"
-                             shadedown="0"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#cecece"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#00000019"
-                            show_header="TRUE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#bebebeff"
-                             inner_sel="#646464b4"
-                             item="#444444ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#3f3f3fff"
-                             inner_sel="#50c8ffff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#d8d8d8"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#8b8d9aff"
-                             inner_sel="#859cb9ff"
-                             item="#ffffffff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#8d909fff"
-                             inner_sel="#859cb9ff"
-                             item="#191919ff"
-                             outline="#191919"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#5050502e"
-                             inner_sel="#646464b4"
-                             item="#737a8eff"
-                             outline="#4f5057"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#b4b4b4ff"
-                             inner_sel="#999999ff"
-                             item="#b0b0b0ff"
-                             outline="#3f3f3f"
-                             shadedown="0"
-                             shadetop="-20"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#73be4c"
-                                  inner_anim_sel="#5aa633"
-                                  blend="0.5"
-                                  inner_driven="#b400ff"
-                                  inner_driven_sel="#9900e6"
-                                  inner_key="#f0eb64"
-                                  inner_key_sel="#d7d34b">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#9b9eadff"
-                             inner_sel="#999999ff"
-                             item="#5a5a5aff"
-                             outline="#464646"
-                             shadedown="25"
-                             shadetop="0"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#afafafff"
-                             inner_sel="#859cb9ff"
-                             item="#191919ff"
-                             outline="#464646"
-                             shadedown="0"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#000000">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#8d909fff"
-                             inner_sel="#859cb9ff"
-                             item="#191919ff"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#000000"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#191919e6"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#ffffff"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
-    <user_preferences>
-      <ThemeUserPreferences>
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#000000"
+                       marker="#7f7f00"
+                       active_marker="#ffffff"
+                       selected_marker="#ffff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff0000"
+                       path_after="#0000ff"
+                       grid="#5e5e5e"
+                       frame_current="#60c040"
+                       handle_vertex="#000000"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
-          <ThemeSpaceGeneric header="#5c606c"
+          <ThemeSpaceGeneric back="#7c7e88"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#5c606c"
                              header_text="#000000"
                              header_text_hi="#ffffff"
-                             button="#6c717f"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
+                             button="#646875"
                              button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#7c7e88">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeUserPreferences>
-    </user_preferences>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f70a0a"
-                         show_colored_constraints="FALSE"
-                         normal="#9a0000"
-                         select="#bd1111">
+      <ThemeBoneColorSet normal="#9a0000"
+                         select="#bd1111"
+                         active="#f70a0a"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#fa9900"
-                         show_colored_constraints="FALSE"
-                         normal="#f74018"
-                         select="#f66913">
+      <ThemeBoneColorSet normal="#f74018"
+                         select="#f66913"
+                         active="#fa9900"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#83ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#1e9109"
-                         select="#59b70b">
+      <ThemeBoneColorSet normal="#1e9109"
+                         select="#59b70b"
+                         active="#83ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#5ec1ef"
-                         show_colored_constraints="FALSE"
-                         normal="#0a3694"
-                         select="#3667df">
+      <ThemeBoneColorSet normal="#0a3694"
+                         select="#3667df"
+                         active="#5ec1ef"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="FALSE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
index 05075f06239..8f4a42b6ab7 100644
--- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
+++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
@@ -1,849 +1,852 @@
 <bpy>
   <Theme>
+    <user_interface>
+      <ThemeUserInterface icon_file=""
+                          icon_alpha="1"
+                          axis_x="#dc0000"
+                          axis_y="#00dc00"
+                          axis_z="#0000dc">
+        <wcol_regular>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3c3b37ff"
+                             inner_sel="#131311ff"
+                             item="#cbc3bbff"
+                             text="#dfdfdf"
+                             text_sel="#dfdfdf"
+                             show_shaded="TRUE"
+                             shadetop="21"
+                             shadedown="-21">
+          </ThemeWidgetColors>
+        </wcol_regular>
+        <wcol_tool>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#3c3b37ff"
+                             inner_sel="#3c3b37ff"
+                             item="#cbc3bbff"
+                             text="#dfdbcf"
+                             text_sel="#f47421"
+                             show_shaded="TRUE"
+                             shadetop="17"
+                             shadedown="-17">
+          </ThemeWidgetColors>
+        </wcol_tool>
+        <wcol_radio>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#1a1a1aff"
+                             inner_sel="#6a3859ff"
+                             item="#3c3b37ff"
+                             text="#dfdbcf"
+                             text_sel="#dfdbcf"
+                             show_shaded="TRUE"
+                             shadetop="5"
+                             shadedown="-5">
+          </ThemeWidgetColors>
+        </wcol_radio>
+        <wcol_text>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#272725ff"
+                             inner_sel="#171717ff"
+                             item="#6a3859ff"
+                             text="#dfdbcf"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-10"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_text>
+        <wcol_option>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#272727ff"
+                             inner_sel="#080808ff"
+                             item="#fff8ecff"
+                             text="#84817e"
+                             text_sel="#dfdbcf"
+                             show_shaded="TRUE"
+                             shadetop="15"
+                             shadedown="-5">
+          </ThemeWidgetColors>
+        </wcol_option>
+        <wcol_toggle>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#464640ff"
+                             inner_sel="#151515ff"
+                             item="#cbc3bbff"
+                             text="#c3bfb7"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="7"
+                             shadedown="-3">
+          </ThemeWidgetColors>
+        </wcol_toggle>
+        <wcol_num>
+          <ThemeWidgetColors outline="#080808"
+                             inner="#3c3b37ff"
+                             inner_sel="#171717ff"
+                             item="#ffffffff"
+                             text="#dfdbcf"
+                             text_sel="#f47421"
+                             show_shaded="TRUE"
+                             shadetop="20"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_num>
+        <wcol_numslider>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#181818ff"
+                             inner_sel="#151515ff"
+                             item="#6a3859ff"
+                             text="#eeedeb"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="-22"
+                             shadedown="26">
+          </ThemeWidgetColors>
+        </wcol_numslider>
+        <wcol_box>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#252522ff"
+                             inner_sel="#646464ff"
+                             item="#0d0d0dff"
+                             text="#eeedeb"
+                             text_sel="#eeedeb"
+                             show_shaded="TRUE"
+                             shadetop="-5"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_box>
+        <wcol_menu>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#3c3b37ff"
+                             inner_sel="#121212ff"
+                             item="#ffffffff"
+                             text="#dfdbcf"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_menu>
+        <wcol_pulldown>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#3f3f3fff"
+                             inner_sel="#f47421ff"
+                             item="#ffffffff"
+                             text="#dddddd"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_pulldown>
+        <wcol_menu_back>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#131312db"
+                             inner_sel="#2d2d2de6"
+                             item="#6a3859ff"
+                             text="#dddddd"
+                             text_sel="#dddddd"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_menu_back>
+        <wcol_tooltip>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#191919e6"
+                             inner_sel="#2d2d2de6"
+                             item="#646464ff"
+                             text="#ffffff"
+                             text_sel="#ff5d0d"
+                             show_shaded="FALSE"
+                             shadetop="25"
+                             shadedown="-20">
+          </ThemeWidgetColors>
+        </wcol_tooltip>
+        <wcol_menu_item>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#00000000"
+                             inner_sel="#6a3859ff"
+                             item="#ffffffff"
+                             text="#a4a4a4"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="38"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_menu_item>
+        <wcol_scroll>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#000000b4"
+                             inner_sel="#646464c6"
+                             item="#2e2d2aff"
+                             text="#cbc3bb"
+                             text_sel="#ffffff"
+                             show_shaded="TRUE"
+                             shadetop="10"
+                             shadedown="-10">
+          </ThemeWidgetColors>
+        </wcol_scroll>
+        <wcol_progress>
+          <ThemeWidgetColors outline="#000000"
+                             inner="#00000000"
+                             inner_sel="#00000000"
+                             item="#00000000"
+                             text="#cbc3bb"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="0">
+          </ThemeWidgetColors>
+        </wcol_progress>
+        <wcol_list_item>
+          <ThemeWidgetColors outline="#0d0d0d"
+                             inner="#00000000"
+                             inner_sel="#6a3859ff"
+                             item="#cbc3bbff"
+                             text="#cbc3bb"
+                             text_sel="#ffffff"
+                             show_shaded="FALSE"
+                             shadetop="0"
+                             shadedown="1">
+          </ThemeWidgetColors>
+        </wcol_list_item>
+        <wcol_state>
+          <ThemeWidgetStateColors inner_anim="#308d00"
+                                  inner_anim_sel="#a7ff07"
+                                  inner_key="#105874"
+                                  inner_key_sel="#19b6ee"
+                                  inner_driven="#862074"
+                                  inner_driven_sel="#862074"
+                                  blend="0.1">
+          </ThemeWidgetStateColors>
+        </wcol_state>
+        <panel>
+          <ThemePanelColors header="#00000000"
+                            show_header="TRUE">
+          </ThemePanelColors>
+        </panel>
+      </ThemeUserInterface>
+    </user_interface>
     <view_3d>
-      <ThemeView3D object_active="#f47421"
-                   editmesh_active="#ffffff80"
-                   act_spline="#ee4000"
-                   handle_align="#93237f"
-                   handle_sel_align="#f47421"
-                   handle_auto="#00c59a"
-                   handle_sel_auto="#f47421"
-                   bone_pose="#50c8ff"
-                   bone_pose_active="#8cffff"
-                   bone_solid="#c8c8c8"
-                   bundle_solid="#c8c8c8"
+      <ThemeView3D grid="#3c3b37"
+                   panel="#a5a5a57f"
+                   wire="#93237f"
+                   lamp="#ffffff34"
+                   speaker="#93237f"
                    camera="#159dce"
-                   camera_path="#7dbd00"
-                   frame_current="#60c040"
-                   edge_crease="#ce33b8"
-                   extra_edge_len="#200000"
-                   edge_seam="#db4100"
+                   empty="#93237f"
+                   object_selected="#f15800"
+                   object_active="#f47421"
+                   object_grouped="#117211"
+                   object_grouped_active="#65d665"
+                   transform="#ffffff"
+                   vertex="#c96cb8"
+                   vertex_select="#f47421"
+                   vertex_size="2"
                    edge_select="#f47421"
+                   edge_seam="#db4100"
                    edge_sharp="#ff4c00"
+                   edge_crease="#ce33b8"
                    edge_facesel="#4b4b4b"
-                   empty="#93237f"
                    face="#75757512"
-                   extra_face_angle="#002000"
-                   extra_face_area="#0059ee"
+                   face_select="#f474213c"
                    face_dot="#f47421"
                    facedot_size="3"
-                   normal="#19b6ee"
-                   face_select="#f474213c"
-                   handle_free="#a5ca00"
-                   handle_sel_free="#f47421"
-                   grid="#3c3b37"
-                   lamp="#ffffff34"
-                   lastsel_point="#ffffff"
                    nurb_uline="#909000"
                    nurb_vline="#862074"
                    nurb_sel_uline="#f0ff40"
                    nurb_sel_vline="#d15d85"
-                   object_grouped="#117211"
-                   object_grouped_active="#65d665"
-                   object_selected="#f15800"
-                   outline_width="2"
-                   panel="#a5a5a57f"
-                   skin_root="#000000"
-                   speaker="#93237f"
-                   transform="#ffffff"
+                   act_spline="#ee4000"
+                   handle_free="#a5ca00"
+                   handle_auto="#00c59a"
                    handle_vect="#409030"
+                   handle_align="#93237f"
+                   handle_sel_free="#f47421"
+                   handle_sel_auto="#f47421"
                    handle_sel_vect="#82c036"
-                   vertex="#c96cb8"
+                   handle_sel_align="#f47421"
+                   lastsel_point="#ffffff"
+                   extra_edge_len="#200000"
+                   extra_face_angle="#002000"
+                   extra_face_area="#0059ee"
+                   editmesh_active="#ffffff80"
+                   normal="#19b6ee"
                    vertex_normal="#19b6ee"
-                   vertex_select="#f47421"
-                   vertex_size="2"
-                   wire="#93237f">
+                   bone_solid="#c8c8c8"
+                   bone_pose="#50c8ff"
+                   bone_pose_active="#8cffff"
+                   frame_current="#60c040"
+                   outline_width="2"
+                   bundle_solid="#c8c8c8"
+                   camera_path="#7dbd00"
+                   skin_root="#000000">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#9c9c9c"
+                             text="#9c9c9c"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#9c9c9c"
-                             button_text_hi="#ffffff"
                              button_title="#9c9c9c"
-                             text="#9c9c9c"
-                             text_hi="#ffffff"
-                             title="#9c9c9c"
-                             back="#131311">
+                             button_text="#9c9c9c"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeView3D>
     </view_3d>
-    <clip_editor>
-      <ThemeClipEditor active_marker="#ffffff"
-                       frame_current="#f47421"
-                       disabled_marker="#7f0000"
-                       grid="#302e2c"
-                       handle_vertex="#000000"
-                       handle_vertex_select="#ffff00"
-                       handle_vertex_size="4"
-                       locked_marker="#7f7f7f"
-                       marker="#76243b"
-                       marker_outline="#000000"
-                       path_after="#19b6ee"
-                       path_before="#ff5100"
-                       selected_marker="#d5ff00"
-                       strips="#0c0a0a"
-                       strips_selected="#ff8c00">
+    <graph_editor>
+      <ThemeGraphEditor grid="#3c3b37"
+                        panel="#ffffff"
+                        window_sliders="#95948f"
+                        channels_region="#707070"
+                        vertex="#ffffff"
+                        vertex_select="#f49600"
+                        vertex_size="4"
+                        handle_free="#a5ca00"
+                        handle_auto="#00c59a"
+                        handle_vect="#409030"
+                        handle_align="#93237f"
+                        handle_sel_free="#f49600"
+                        handle_sel_auto="#f49600"
+                        handle_sel_vect="#40c030"
+                        handle_sel_align="#f49600"
+                        handle_auto_clamped="#03aa60"
+                        handle_sel_auto_clamped="#f49600"
+                        lastsel_point="#fafafa"
+                        frame_current="#f58032"
+                        handle_vertex="#bbbbbb"
+                        handle_vertex_select="#f49600"
+                        handle_vertex_size="4"
+                        channel_group="#4f6549"
+                        active_channels_group="#87b17d"
+                        dopesheet_channel="#695c6e"
+                        dopesheet_subchannel="#7c8996">
         <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#9c9c9c"
-                             header_text_hi="#ffffff"
-                             button="#3c3b37"
-                             button_text="#ffffff"
-                             button_text_hi="#ffffff"
-                             button_title="#9c9c9c"
-                             text="#9c9c9c"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#131311"
                              title="#9c9c9c"
-                             back="#131311">
-          </ThemeSpaceGeneric>
-        </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#666666"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeClipEditor>
-    </clip_editor>
-    <console>
-      <ThemeConsole cursor="#f47421"
-                    line_error="#ff0000"
-                    line_info="#f47421"
-                    line_input="#19b6ee"
-                    line_output="#97f500">
-        <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#acacac"
-                             header_text_hi="#ffffff"
-                             button="#3c3b37"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
+                             text="#e9e9e9"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#131311">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeConsole>
-    </console>
-    <dopesheet_editor>
-      <ThemeDopeSheet active_channels_group="#a2b15c"
-                      channel_group="#4f6549"
-                      channels="#9c9c9c"
-                      channels_selected="#6592f5"
-                      frame_current="#f58032"
-                      dopesheet_channel="#64486e"
-                      dopesheet_subchannel="#877096"
-                      grid="#525252"
-                      long_key="#0c0a0a"
-                      long_key_selected="#f47421"
-                      summary="#00000000"
-                      value_sliders="#000000"
-                      view_sliders="#9c9c9c">
-        <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#cacaca"
+                             header="#464541"
+                             header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#9c9c9c"
-                             button_text_hi="#ffffff"
                              button_title="#9c9c9c"
-                             text="#e7e7e7"
-                             text_hi="#ffffff"
-                             title="#9c9c9c"
-                             back="#131311">
+                             button_text="#9c9c9c"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#ffffff"
                                  list_text="#e2e2e2"
-                                 list_text_hi="#f47421"
-                                 list_title="#ffffff">
+                                 list_text_hi="#f47421">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeDopeSheet>
-    </dopesheet_editor>
+      </ThemeGraphEditor>
+    </graph_editor>
     <file_browser>
-      <ThemeFileBrowser active_file="#eeedeb"
-                        active_file_text="#ffffff"
-                        scroll_handle="#7f7070"
+      <ThemeFileBrowser selected_file="#6b395a"
+                        tiles="#3c3b37"
                         scrollbar="#a0a0a0"
-                        selected_file="#6b395a"
-                        tiles="#3c3b37">
+                        scroll_handle="#7f7070"
+                        active_file="#eeedeb"
+                        active_file_text="#ffffff">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#b2b2b1"
+                             text_hi="#0f0f0f"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#727272"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
                              button_title="#000000"
-                             text="#b2b2b1"
-                             text_hi="#0f0f0f"
-                             title="#000000"
-                             back="#131311">
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#95948f"
                                  list_text="#95948f"
-                                 list_text_hi="#ffffff"
-                                 list_title="#95948f">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeFileBrowser>
     </file_browser>
-    <graph_editor>
-      <ThemeGraphEditor active_channels_group="#87b17d"
-                        handle_align="#93237f"
-                        handle_sel_align="#f49600"
-                        handle_auto="#00c59a"
-                        handle_sel_auto="#f49600"
-                        handle_auto_clamped="#03aa60"
-                        handle_sel_auto_clamped="#f49600"
-                        channel_group="#4f6549"
-                        channels_region="#707070"
-                        frame_current="#f58032"
-                        dopesheet_channel="#695c6e"
-                        dopesheet_subchannel="#7c8996"
-                        handle_free="#a5ca00"
-                        handle_sel_free="#f49600"
-                        grid="#3c3b37"
-                        handle_vertex="#bbbbbb"
-                        handle_vertex_select="#f49600"
-                        handle_vertex_size="4"
-                        lastsel_point="#fafafa"
-                        panel="#ffffff"
-                        handle_vect="#409030"
-                        handle_sel_vect="#40c030"
-                        vertex="#ffffff"
-                        vertex_select="#f49600"
-                        vertex_size="4"
-                        window_sliders="#95948f">
+    <nla_editor>
+      <ThemeNLAEditor grid="#5c5c52"
+                      view_sliders="#969696"
+                      active_action="#00000000"
+                      active_action_unset="#00000000"
+                      strips="#0c0a0a"
+                      strips_selected="#6b395a"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
+                      frame_current="#f58032">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#9c9c9c"
-                             button_text_hi="#ffffff"
-                             button_title="#9c9c9c"
-                             text="#e9e9e9"
-                             text_hi="#ffffff"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeNLAEditor>
+    </nla_editor>
+    <dopesheet_editor>
+      <ThemeDopeSheet grid="#525252"
+                      value_sliders="#000000"
+                      view_sliders="#9c9c9c"
+                      channels="#9c9c9c"
+                      channels_selected="#6592f5"
+                      channel_group="#4f6549"
+                      active_channels_group="#a2b15c"
+                      long_key="#0c0a0a"
+                      long_key_selected="#f47421"
+                      frame_current="#f58032"
+                      dopesheet_channel="#64486e"
+                      dopesheet_subchannel="#877096"
+                      summary="#00000000">
+        <space>
+          <ThemeSpaceGeneric back="#131311"
                              title="#9c9c9c"
-                             back="#131311">
+                             text="#e7e7e7"
+                             text_hi="#ffffff"
+                             header="#464541"
+                             header_text="#cacaca"
+                             header_text_hi="#ffffff"
+                             button="#3c3b37"
+                             button_title="#9c9c9c"
+                             button_text="#9c9c9c"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#ffffff"
                                  list_text="#e2e2e2"
-                                 list_text_hi="#f47421"
-                                 list_title="#ffffff">
+                                 list_text_hi="#f47421">
           </ThemeSpaceListGeneric>
         </space_list>
-      </ThemeGraphEditor>
-    </graph_editor>
+      </ThemeDopeSheet>
+    </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor editmesh_active="#ffffff80"
+      <ThemeImageEditor vertex="#000000"
+                        vertex_select="#f47421"
+                        vertex_size="3"
                         face="#ffffff0a"
+                        face_select="#ff85003c"
                         face_dot="#f47421"
                         facedot_size="3"
-                        face_select="#ff85003c"
+                        editmesh_active="#ffffff80"
                         scope_back="#3c3b37ff"
-                        preview_stitch_active="#e1d2c323"
-                        preview_stitch_edge="#ff8500b2"
                         preview_stitch_face="#1242b026"
+                        preview_stitch_edge="#ff8500b2"
+                        preview_stitch_vert="#ff85007f"
                         preview_stitch_stitchable="#00ff00ff"
                         preview_stitch_unstitchable="#ff0000ff"
-                        preview_stitch_vert="#ff85007f"
-                        vertex="#000000"
-                        vertex_select="#f47421"
-                        vertex_size="3">
+                        preview_stitch_active="#e1d2c323">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#b9b9b9"
-                             button_text_hi="#ffffff"
                              button_title="#b1b1b1"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#131311">
+                             button_text="#b9b9b9"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
       </ThemeImageEditor>
     </image_editor>
-    <info>
-      <ThemeInfo>
+    <sequence_editor>
+      <ThemeSequenceEditor grid="#282828"
+                           window_sliders="#a0a0a0"
+                           movie_strip="#516987"
+                           movieclip_strip="#20208f"
+                           image_strip="#6d5881"
+                           scene_strip="#4e983e"
+                           audio_strip="#2e8f8f"
+                           effect_strip="#a9547c"
+                           transition_strip="#a25f6f"
+                           meta_strip="#6d9183"
+                           frame_current="#c06e11"
+                           keyframe="#f47421"
+                           draw_action="#50c8ff"
+                           preview_back="#000000">
         <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#ffffff"
+          <ThemeSpaceGeneric back="#191919"
+                             title="#acacac"
+                             text="#acacac"
+                             text_hi="#ffffff"
+                             header="#464541"
+                             header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#eeedeb"
-                             button_text_hi="#ffffff"
-                             button_title="#eeedeb"
-                             text="#eeedeb"
-                             text_hi="#ffffff"
-                             title="#eeedeb"
-                             back="#3c3b37">
+                             button_title="#acacac"
+                             button_text="#acacac"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeInfo>
-    </info>
-    <logic_editor>
-      <ThemeLogicEditor panel="#acacac">
+      </ThemeSequenceEditor>
+    </sequence_editor>
+    <properties>
+      <ThemeProperties panel="#3c3b37">
         <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#acacac"
-                             header_text_hi="#ffffff"
-                             button="#353430"
-                             button_text="#acacac"
-                             button_text_hi="#ffffff"
-                             button_title="#7d7d7d"
+          <ThemeSpaceGeneric back="#3c3b37"
+                             title="#acacac"
                              text="#acacac"
                              text_hi="#ffffff"
+                             header="#464541"
+                             header_text="#acacac"
+                             header_text_hi="#ffffff"
+                             button="#3c3b37"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeProperties>
+    </properties>
+    <text_editor>
+      <ThemeTextEditor line_numbers_background="#3c3b37"
+                       selected_text="#641f44"
+                       cursor="#f47421"
+                       syntax_builtin="#d6ff01"
+                       syntax_special="#33a500"
+                       syntax_comment="#249d60"
+                       syntax_string="#6e00ff"
+                       syntax_numbers="#972144">
+        <space>
+          <ThemeSpaceGeneric back="#131311"
                              title="#000000"
-                             back="#29001b">
+                             text="#19b6ee"
+                             text_hi="#ffffff"
+                             header="#464541"
+                             header_text="#acacac"
+                             header_text_hi="#ffffff"
+                             button="#191919"
+                             button_title="#64645e"
+                             button_text="#95948f"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeLogicEditor>
-    </logic_editor>
-    <nla_editor>
-      <ThemeNLAEditor active_action="#00000000"
-                      frame_current="#f58032"
-                      grid="#5c5c52"
-                      meta_strips="#000000"
-                      meta_strips_selected="#000000"
-                      active_action_unset="#00000000"
-                      sound_strips="#000000"
-                      sound_strips_selected="#000000"
-                      strips="#0c0a0a"
-                      strips_selected="#6b395a"
-                      transition_strips="#000000"
-                      transition_strips_selected="#000000"
-                      tweak="#000000"
-                      tweak_duplicate="#000000"
-                      view_sliders="#969696">
+      </ThemeTextEditor>
+    </text_editor>
+    <timeline>
+      <ThemeTimeline grid="#272727"
+                     frame_current="#f47421">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#9c9c9c"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#000000"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#131311">
+                             button_title="#9c9c9c"
+                             button_text="#9c9c9c"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-        <space_list>
-          <ThemeSpaceListGeneric list="#3c3b37"
-                                 list_text="#000000"
-                                 list_text_hi="#ffffff"
-                                 list_title="#000000">
-          </ThemeSpaceListGeneric>
-        </space_list>
-      </ThemeNLAEditor>
-    </nla_editor>
+      </ThemeTimeline>
+    </timeline>
     <node_editor>
-      <ThemeNodeEditor node_active="#ffffff"
-                       converter_node="#93be00"
-                       frame_node="#9a9b9ba0"
-                       group_node="#19b6ee"
-                       in_out_node="#f40051"
+      <ThemeNodeEditor node_selected="#ffffff"
+                       node_active="#ffffff"
+                       wire="#f45b00"
+                       wire_select="#f4b696"
+                       selected_text="#7f7070"
                        node_backdrop="#52524ed1"
-                       node_selected="#ffffff"
-                       noodle_curving="5"
+                       in_out_node="#f40051"
+                       converter_node="#93be00"
                        operator_node="#000000"
-                       selected_text="#7f7070"
-                       wire_select="#f4b696"
-                       wire="#f45b00">
+                       group_node="#19b6ee"
+                       frame_node="#9a9b9ba0"
+                       noodle_curving="5">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#29001b"
+                             title="#000000"
+                             text="#eeedeb"
+                             text_hi="#cbcbcb"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#353430"
-                             button_text="#acacac"
-                             button_text_hi="#ffffff"
                              button_title="#acacac"
-                             text="#eeedeb"
-                             text_hi="#cbcbcb"
-                             title="#000000"
-                             back="#29001b">
+                             button_text="#acacac"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
         <space_list>
           <ThemeSpaceListGeneric list="#3c3b37"
+                                 list_title="#acacac"
                                  list_text="#acacac"
-                                 list_text_hi="#ffffff"
-                                 list_title="#acacac">
+                                 list_text_hi="#ffffff">
           </ThemeSpaceListGeneric>
         </space_list>
       </ThemeNodeEditor>
     </node_editor>
+    <logic_editor>
+      <ThemeLogicEditor panel="#acacac">
+        <space>
+          <ThemeSpaceGeneric back="#29001b"
+                             title="#000000"
+                             text="#acacac"
+                             text_hi="#ffffff"
+                             header="#464541"
+                             header_text="#acacac"
+                             header_text_hi="#ffffff"
+                             button="#353430"
+                             button_title="#7d7d7d"
+                             button_text="#acacac"
+                             button_text_hi="#ffffff">
+          </ThemeSpaceGeneric>
+        </space>
+      </ThemeLogicEditor>
+    </logic_editor>
     <outliner>
       <ThemeOutliner match="#337f33"
                      selected_highlight="#6a3859">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#3c3b37"
+                             title="#000000"
+                             text="#cccccc"
+                             text_hi="#f47421"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#000000"
-                             button_text_hi="#f47421"
                              button_title="#000000"
-                             text="#cccccc"
-                             text_hi="#f47421"
-                             title="#000000"
-                             back="#3c3b37">
+                             button_text="#000000"
+                             button_text_hi="#f47421">
           </ThemeSpaceGeneric>
         </space>
       </ThemeOutliner>
     </outliner>
-    <properties>
-      <ThemeProperties panel="#3c3b37">
+    <info>
+      <ThemeInfo>
         <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#acacac"
-                             header_text_hi="#ffffff"
-                             button="#3c3b37"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#acacac"
+          <ThemeSpaceGeneric back="#3c3b37"
+                             title="#eeedeb"
+                             text="#eeedeb"
                              text_hi="#ffffff"
-                             title="#acacac"
-                             back="#3c3b37">
-          </ThemeSpaceGeneric>
-        </space>
-      </ThemeProperties>
-    </properties>
-    <sequence_editor>
-      <ThemeSequenceEditor audio_strip="#2e8f8f"
-                           movieclip_strip="#20208f"
-                           frame_current="#c06e11"
-                           draw_action="#50c8ff"
-                           effect_strip="#a9547c"
-                           grid="#282828"
-                           image_strip="#6d5881"
-                           keyframe="#f47421"
-                           meta_strip="#6d9183"
-                           movie_strip="#516987"
-                           preview_back="#000000"
-                           scene_strip="#4e983e"
-                           transition_strip="#a25f6f"
-                           window_sliders="#a0a0a0">
-        <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#acacac"
+                             header="#464541"
+                             header_text="#ffffff"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#acacac"
-                             button_text_hi="#ffffff"
-                             button_title="#acacac"
-                             text="#acacac"
-                             text_hi="#ffffff"
-                             title="#acacac"
-                             back="#191919">
+                             button_title="#eeedeb"
+                             button_text="#eeedeb"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeSequenceEditor>
-    </sequence_editor>
-    <text_editor>
-      <ThemeTextEditor cursor="#f47421"
-                       syntax_special="#33a500"
-                       line_numbers_background="#3c3b37"
-                       selected_text="#641f44"
-                       syntax_builtin="#d6ff01"
-                       syntax_comment="#249d60"
-                       syntax_numbers="#972144"
-                       syntax_string="#6e00ff">
+      </ThemeInfo>
+    </info>
+    <user_preferences>
+      <ThemeUserPreferences>
         <space>
-          <ThemeSpaceGeneric header="#464541"
-                             header_text="#acacac"
-                             header_text_hi="#ffffff"
-                             button="#191919"
-                             button_text="#95948f"
-                             button_text_hi="#ffffff"
-                             button_title="#64645e"
-                             text="#19b6ee"
-                             text_hi="#ffffff"
+          <ThemeSpaceGeneric back="#3c3b37"
                              title="#000000"
-                             back="#131311">
+                             text="#ccccc8"
+                             text_hi="#ffffff"
+                             header="#3c3b37"
+                             header_text="#d3d2cd"
+                             header_text_hi="#ffffff"
+                             button="#696965"
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTextEditor>
-    </text_editor>
-    <timeline>
-      <ThemeTimeline frame_current="#f47421"
-                     grid="#272727">
+      </ThemeUserPreferences>
+    </user_preferences>
+    <console>
+      <ThemeConsole line_output="#97f500"
+                    line_input="#19b6ee"
+                    line_info="#f47421"
+                    line_error="#ff0000"
+                    cursor="#f47421">
         <space>
-          <ThemeSpaceGeneric header="#464541"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#000000"
+                             text="#000000"
+                             text_hi="#ffffff"
+                             header="#464541"
                              header_text="#acacac"
                              header_text_hi="#ffffff"
                              button="#3c3b37"
-                             button_text="#9c9c9c"
-                             button_text_hi="#ffffff"
-                             button_title="#9c9c9c"
-                             text="#9c9c9c"
-                             text_hi="#ffffff"
-                             title="#000000"
-                             back="#131311">
+                             button_title="#000000"
+                             button_text="#000000"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeTimeline>
-    </timeline>
-    <user_interface>
-      <ThemeUserInterface icon_alpha="1"
-                          icon_file="">
-        <wcol_box>
-          <ThemeWidgetColors inner="#252522ff"
-                             inner_sel="#646464ff"
-                             item="#0d0d0dff"
-                             outline="#0d0d0d"
-                             shadedown="0"
-                             shadetop="-5"
-                             show_shaded="TRUE"
-                             text="#eeedeb"
-                             text_sel="#eeedeb">
-          </ThemeWidgetColors>
-        </wcol_box>
-        <wcol_list_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#6a3859ff"
-                             item="#cbc3bbff"
-                             outline="#0d0d0d"
-                             shadedown="1"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#cbc3bb"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_list_item>
-        <wcol_menu_back>
-          <ThemeWidgetColors inner="#131312db"
-                             inner_sel="#2d2d2de6"
-                             item="#6a3859ff"
-                             outline="#0d0d0d"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#dddddd"
-                             text_sel="#dddddd">
-          </ThemeWidgetColors>
-        </wcol_menu_back>
-        <wcol_menu_item>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#6a3859ff"
-                             item="#ffffffff"
-                             outline="#0d0d0d"
-                             shadedown="0"
-                             shadetop="38"
-                             show_shaded="FALSE"
-                             text="#a4a4a4"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu_item>
-        <wcol_menu>
-          <ThemeWidgetColors inner="#3c3b37ff"
-                             inner_sel="#121212ff"
-                             item="#ffffffff"
-                             outline="#0d0d0d"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_menu>
-        <wcol_num>
-          <ThemeWidgetColors inner="#3c3b37ff"
-                             inner_sel="#171717ff"
-                             item="#ffffffff"
-                             outline="#080808"
-                             shadedown="-20"
-                             shadetop="20"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#f47421">
-          </ThemeWidgetColors>
-        </wcol_num>
-        <wcol_option>
-          <ThemeWidgetColors inner="#272727ff"
-                             inner_sel="#080808ff"
-                             item="#fff8ecff"
-                             outline="#0d0d0d"
-                             shadedown="-5"
-                             shadetop="15"
-                             show_shaded="TRUE"
-                             text="#84817e"
-                             text_sel="#dfdbcf">
-          </ThemeWidgetColors>
-        </wcol_option>
-        <panel>
-          <ThemePanelColors header="#00000000"
-                            show_header="TRUE">
-          </ThemePanelColors>
-        </panel>
-        <wcol_progress>
-          <ThemeWidgetColors inner="#00000000"
-                             inner_sel="#00000000"
-                             item="#00000000"
-                             outline="#000000"
-                             shadedown="0"
-                             shadetop="0"
-                             show_shaded="FALSE"
-                             text="#cbc3bb"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_progress>
-        <wcol_pulldown>
-          <ThemeWidgetColors inner="#3f3f3fff"
-                             inner_sel="#f47421ff"
-                             item="#ffffffff"
-                             outline="#0d0d0d"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#dddddd"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_pulldown>
-        <wcol_radio>
-          <ThemeWidgetColors inner="#1a1a1aff"
-                             inner_sel="#6a3859ff"
-                             item="#3c3b37ff"
-                             outline="#000000"
-                             shadedown="-5"
-                             shadetop="5"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#dfdbcf">
-          </ThemeWidgetColors>
-        </wcol_radio>
-        <wcol_regular>
-          <ThemeWidgetColors inner="#3c3b37ff"
-                             inner_sel="#131311ff"
-                             item="#cbc3bbff"
-                             outline="#000000"
-                             shadedown="-21"
-                             shadetop="21"
-                             show_shaded="TRUE"
-                             text="#dfdfdf"
-                             text_sel="#dfdfdf">
-          </ThemeWidgetColors>
-        </wcol_regular>
-        <wcol_scroll>
-          <ThemeWidgetColors inner="#000000b4"
-                             inner_sel="#646464c6"
-                             item="#2e2d2aff"
-                             outline="#000000"
-                             shadedown="-10"
-                             shadetop="10"
-                             show_shaded="TRUE"
-                             text="#cbc3bb"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_scroll>
-        <wcol_numslider>
-          <ThemeWidgetColors inner="#181818ff"
-                             inner_sel="#151515ff"
-                             item="#6a3859ff"
-                             outline="#0d0d0d"
-                             shadedown="26"
-                             shadetop="-22"
-                             show_shaded="TRUE"
-                             text="#eeedeb"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_numslider>
-        <wcol_state>
-          <ThemeWidgetStateColors inner_anim="#308d00"
-                                  inner_anim_sel="#a7ff07"
-                                  blend="0.1"
-                                  inner_driven="#862074"
-                                  inner_driven_sel="#862074"
-                                  inner_key="#105874"
-                                  inner_key_sel="#19b6ee">
-          </ThemeWidgetStateColors>
-        </wcol_state>
-        <wcol_text>
-          <ThemeWidgetColors inner="#272725ff"
-                             inner_sel="#171717ff"
-                             item="#6a3859ff"
-                             outline="#0d0d0d"
-                             shadedown="0"
-                             shadetop="-10"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_text>
-        <wcol_toggle>
-          <ThemeWidgetColors inner="#464640ff"
-                             inner_sel="#151515ff"
-                             item="#cbc3bbff"
-                             outline="#000000"
-                             shadedown="-3"
-                             shadetop="7"
-                             show_shaded="TRUE"
-                             text="#c3bfb7"
-                             text_sel="#ffffff">
-          </ThemeWidgetColors>
-        </wcol_toggle>
-        <wcol_tool>
-          <ThemeWidgetColors inner="#3c3b37ff"
-                             inner_sel="#3c3b37ff"
-                             item="#cbc3bbff"
-                             outline="#000000"
-                             shadedown="-17"
-                             shadetop="17"
-                             show_shaded="TRUE"
-                             text="#dfdbcf"
-                             text_sel="#f47421">
-          </ThemeWidgetColors>
-        </wcol_tool>
-        <wcol_tooltip>
-          <ThemeWidgetColors inner="#191919e6"
-                             inner_sel="#2d2d2de6"
-                             item="#646464ff"
-                             outline="#000000"
-                             shadedown="-20"
-                             shadetop="25"
-                             show_shaded="FALSE"
-                             text="#ffffff"
-                             text_sel="#ff5d0d">
-          </ThemeWidgetColors>
-        </wcol_tooltip>
-      </ThemeUserInterface>
-    </user_interface>
-    <user_preferences>
-      <ThemeUserPreferences>
+      </ThemeConsole>
+    </console>
+    <clip_editor>
+      <ThemeClipEditor marker_outline="#000000"
+                       marker="#76243b"
+                       active_marker="#ffffff"
+                       selected_marker="#d5ff00"
+                       disabled_marker="#7f0000"
+                       locked_marker="#7f7f7f"
+                       path_before="#ff5100"
+                       path_after="#19b6ee"
+                       grid="#302e2c"
+                       frame_current="#f47421"
+                       handle_vertex="#000000"
+                       handle_vertex_select="#ffff00"
+                       handle_vertex_size="4"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
-          <ThemeSpaceGeneric header="#3c3b37"
-                             header_text="#d3d2cd"
-                             header_text_hi="#ffffff"
-                             button="#696965"
-                             button_text="#000000"
-                             button_text_hi="#ffffff"
-                             button_title="#000000"
-                             text="#ccccc8"
+          <ThemeSpaceGeneric back="#131311"
+                             title="#9c9c9c"
+                             text="#9c9c9c"
                              text_hi="#ffffff"
-                             title="#000000"
-                             back="#3c3b37">
+                             header="#464541"
+                             header_text="#9c9c9c"
+                             header_text_hi="#ffffff"
+                             button="#3c3b37"
+                             button_title="#9c9c9c"
+                             button_text="#ffffff"
+                             button_text_hi="#ffffff">
           </ThemeSpaceGeneric>
         </space>
-      </ThemeUserPreferences>
-    </user_preferences>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_title="#000000"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff">
+          </ThemeSpaceListGeneric>
+        </space_list>
+      </ThemeClipEditor>
+    </clip_editor>
     <bone_color_sets>
-      <ThemeBoneColorSet active="#f74700"
-                         show_colored_constraints="FALSE"
-                         normal="#9a2400"
-                         select="#bd3000">
+      <ThemeBoneColorSet normal="#9a2400"
+                         select="#bd3000"
+                         active="#f74700"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ff9248"
-                         show_colored_constraints="FALSE"
-                         normal="#ff5d06"
-                         select="#ff7b20">
+      <ThemeBoneColorSet normal="#ff5d06"
+                         select="#ff7b20"
+                         active="#ff9248"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#c9ef1d"
-                         show_colored_constraints="FALSE"
-                         normal="#7f9103"
-                         select="#a8b700">
+      <ThemeBoneColorSet normal="#7f9103"
+                         select="#a8b700"
+                         active="#c9ef1d"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#95f5ff"
-                         show_colored_constraints="FALSE"
-                         normal="#19a3d5"
-                         select="#00d9ee">
+      <ThemeBoneColorSet normal="#19a3d5"
+                         select="#00d9ee"
+                         active="#95f5ff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f05d91"
-                         show_colored_constraints="TRUE"
-                         normal="#a9294e"
-                         select="#c1416a">
+      <ThemeBoneColorSet normal="#a9294e"
+                         select="#c1416a"
+                         active="#f05d91"
+                         show_colored_constraints="TRUE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#8764d5"
-                         show_colored_constraints="FALSE"
-                         normal="#430c78"
-                         select="#543aa3">
+      <ThemeBoneColorSet normal="#430c78"
+                         select="#543aa3"
+                         active="#8764d5"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#6fb6ab"
-                         show_colored_constraints="FALSE"
-                         normal="#24785a"
-                         select="#3c9579">
+      <ThemeBoneColorSet normal="#24785a"
+                         select="#3c9579"
+                         active="#6fb6ab"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#9bc2cd"
-                         show_colored_constraints="FALSE"
-                         normal="#4b707c"
-                         select="#6a8691">
+      <ThemeBoneColorSet normal="#4b707c"
+                         select="#6a8691"
+                         active="#9bc2cd"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#f3ff00"
-                         show_colored_constraints="FALSE"
-                         normal="#f4c90c"
-                         select="#eec236">
+      <ThemeBoneColorSet normal="#f4c90c"
+                         select="#eec236"
+                         active="#f3ff00"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#ffffff"
-                         show_colored_constraints="FALSE"
-                         normal="#1e2024"
-                         select="#484c56">
+      <ThemeBoneColorSet normal="#1e2024"
+                         select="#484c56"
+                         active="#ffffff"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#d330d6"
-                         show_colored_constraints="FALSE"
-                         normal="#6f2f6a"
-                         select="#9845be">
+      <ThemeBoneColorSet normal="#6f2f6a"
+                         select="#9845be"
+                         active="#d330d6"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bbef5b"
-                         show_colored_constraints="FALSE"
-                         normal="#6c8e22"
-                         select="#7fb022">
+      <ThemeBoneColorSet normal="#6c8e22"
+                         select="#7fb022"
+                         active="#bbef5b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#dedede"
-                         show_colored_constraints="FALSE"
-                         normal="#8d8d8d"
-                         select="#b0b0b0">
+      <ThemeBoneColorSet normal="#8d8d8d"
+                         select="#b0b0b0"
+                         active="#dedede"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#bd6a11"
-                         show_colored_constraints="FALSE"
-                         normal="#834326"
-                         select="#8b5811">
+      <ThemeBoneColorSet normal="#834326"
+                         select="#8b5811"
+                         active="#bd6a11"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#34622b"
-                         show_colored_constraints="FALSE"
-                         normal="#08310e"
-                         select="#1c430b">
+      <ThemeBoneColorSet normal="#08310e"
+                         select="#1c430b"
+                         active="#34622b"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
-      <ThemeBoneColorSet active="#000000"
-                         show_colored_constraints="FALSE"
-                         normal="#000000"
-                         select="#000000">
+      <ThemeBoneColorSet normal="#000000"
+                         select="#000000"
+                         active="#000000"
+                         show_colored_constraints="FALSE">
       </ThemeBoneColorSet>
     </bone_color_sets>
   </Theme>
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 0945098bd1e..105b532ac38 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1049,6 +1049,8 @@ class WM_OT_properties_edit(Operator):
 
         try:
             value_eval = eval(value)
+            # assert else None -> None, not "None", see [#33431]
+            assert(type(value_eval) in {str, float, int, bool, tuple, list})
         except:
             value_eval = value
 
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 358dc016219..1ea20d96386 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -414,7 +414,9 @@ class IMAGE_HT_header(Header):
 
             row = layout.row(align=True)
             row.prop(toolsettings, "use_snap", text="")
-            row.prop(toolsettings, "snap_target", text="")
+            row.prop(toolsettings, "snap_uv_element", text="", icon_only=True)
+            if toolsettings.snap_uv_element != 'INCREMENT':
+                row.prop(toolsettings, "snap_target", text="")
 
             mesh = context.edit_object.data
             layout.prop_search(mesh.uv_textures, "active", mesh, "uv_textures", text="")
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index f6eaf421a7a..0bb25e98456 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -437,6 +437,7 @@ class USERPREF_PT_system(Panel):
         col.label(text="OpenGL:")
         col.prop(system, "gl_clip_alpha", slider=True)
         col.prop(system, "use_mipmaps")
+        col.prop(system, "use_gpu_mipmap")
         col.prop(system, "use_16bit_textures")
         col.label(text="Anisotropic Filtering")
         col.prop(system, "anisotropic_filter", text="")
diff --git a/release/scripts/templates/bmesh_simple.py b/release/scripts/templates/bmesh_simple.py
index 656febf4918..45e6b52d578 100644
--- a/release/scripts/templates/bmesh_simple.py
+++ b/release/scripts/templates/bmesh_simple.py
@@ -19,3 +19,4 @@ for v in bm.verts:
 
 # Finish up, write the bmesh back to the mesh
 bm.to_mesh(me)
+bm.free()  # free and prevent further access
diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h
index ebfbe94802a..9af0d96884a 100644
--- a/source/blender/blenkernel/BKE_icons.h
+++ b/source/blender/blenkernel/BKE_icons.h
@@ -30,9 +30,7 @@
 
 /** \file BKE_icons.h
  *  \ingroup bke
- */
-
-/*
+ *
  * Resizable Icons for Blender
  */
 
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 515bb37b249..b8f168cbdea 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -314,6 +314,8 @@ void              ntreeUserIncrefID(struct bNodeTree *ntree);
 void              ntreeUserDecrefID(struct bNodeTree *ntree);
 
 
+struct bNodeTree *ntreeFromID(struct ID *id);
+
 void              ntreeMakeLocal(struct bNodeTree *ntree);
 int               ntreeHasType(struct bNodeTree *ntree, int type);
 void              ntreeUpdateTree(struct bNodeTree *ntree);
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 11ff3930ffb..6208bb355b1 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -257,13 +257,13 @@ if(WITH_BULLET)
 	add_definitions(-DUSE_BULLET)
 endif()
 
-if(WITH_MOD_CLOTH_ELTOPO)
-	list(APPEND INC
-		../../../extern/eltopo
-		../../../extern/eltopo/eltopo3d
-	)
-	add_definitions(-DWITH_ELTOPO)
-endif()
+#if(WITH_MOD_CLOTH_ELTOPO)
+#	list(APPEND INC
+#		../../../extern/eltopo
+#		../../../extern/eltopo/eltopo3d
+#	)
+#	add_definitions(-DWITH_ELTOPO)
+#endif()
 
 if(WITH_IMAGE_OPENEXR)
 	add_definitions(-DWITH_OPENEXR)
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 3736395313d..d09bea0f662 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -392,7 +392,7 @@ void DM_ensure_tessface(DerivedMesh *dm)
 	}
 
 	else if (dm->dirty & DM_DIRTY_TESS_CDLAYERS) {
-		BLI_assert(CustomData_has_layer(&dm->faceData, CD_ORIGINDEX));
+		BLI_assert(CustomData_has_layer(&dm->faceData, CD_ORIGINDEX) || numTessFaces == 0);
 		DM_update_tessface_data(dm);
 	}
 
@@ -1159,119 +1159,64 @@ void DM_update_weight_mcol(Object *ob, DerivedMesh *dm, int const draw_flag,
 	ColorBand *coba = stored_cb; /* warning, not a local var */
 
 	unsigned char *wtcol_v;
-#if 0 /* See coment below. */
-	unsigned char *wtcol_f = dm->getTessFaceDataArray(dm, CD_PREVIEW_MCOL);
-#endif
 	unsigned char(*wtcol_l)[4] = CustomData_get_layer(dm->getLoopDataLayout(dm), CD_PREVIEW_MLOOPCOL);
-#if 0 /* See coment below. */
-	MFace *mf = dm->getTessFaceArray(dm);
-#endif
 	MLoop *mloop = dm->getLoopArray(dm), *ml;
 	MPoly *mp = dm->getPolyArray(dm);
-#if 0
-	int numFaces = dm->getNumTessFaces(dm);
-#endif
 	int numVerts = dm->getNumVerts(dm);
 	int totloop;
 	int i, j;
 
-#if 0 /* See comment below */
-	  /* If no CD_PREVIEW_MCOL existed yet, add a new one! */
-	if (!wtcol_f)
-		wtcol_f = CustomData_add_layer(&dm->faceData, CD_PREVIEW_MCOL, CD_CALLOC, NULL, numFaces);
-
-	if (wtcol_f) {
-		unsigned char *wtcol_f_step = wtcol_f;
-# else
-#if 0
-	/* XXX We have to create a CD_PREVIEW_MCOL, else it might sigsev (after a SubSurf mod, eg)... */
-	if (!dm->getTessFaceDataArray(dm, CD_PREVIEW_MCOL))
-		CustomData_add_layer(&dm->faceData, CD_PREVIEW_MCOL, CD_CALLOC, NULL, numFaces);
-#endif
-
-	{
-#endif
-
-		/* Weights are given by caller. */
-		if (weights) {
-			float *w = weights;
-			/* If indices is not NULL, it means we do not have weights for all vertices,
-			 * so we must create them (and set them to zero)... */
-			if (indices) {
-				w = MEM_callocN(sizeof(float) * numVerts, "Temp weight array DM_update_weight_mcol");
-				i = num;
-				while (i--)
-					w[indices[i]] = weights[i];
-			}
-
-			/* Convert float weights to colors. */
-			wtcol_v = calc_colors_from_weights_array(numVerts, w);
-
-			if (indices)
-				MEM_freeN(w);
+	/* Weights are given by caller. */
+	if (weights) {
+		float *w = weights;
+		/* If indices is not NULL, it means we do not have weights for all vertices,
+		 * so we must create them (and set them to zero)... */
+		if (indices) {
+			w = MEM_callocN(sizeof(float) * numVerts, "Temp weight array DM_update_weight_mcol");
+			i = num;
+			while (i--)
+				w[indices[i]] = weights[i];
 		}
 
-		/* No weights given, take them from active vgroup(s). */
-		else
-			wtcol_v = calc_weightpaint_vert_array(ob, dm, draw_flag, coba);
+		/* Convert float weights to colors. */
+		wtcol_v = calc_colors_from_weights_array(numVerts, w);
 
-		/* Now copy colors in all face verts. */
-		/* first add colors to the tessellation faces */
-		/* XXX Why update that layer? We have to update WEIGHT_MLOOPCOL anyway, 
-		 *     and tessellation recreates mface layers from mloop/mpoly ones, so no
-		 *     need to fill WEIGHT_MCOL here. */
-#if 0
-		for (i = 0; i < numFaces; i++, mf++, wtcol_f_step += (4 * 4)) {
-			/*origindex being NULL means we're operating on original mesh data*/
-#if 0
-			unsigned int fidx = mf->v4 ? 3 : 2;
-
-#else   /* better zero out triangles 4th component. else valgrind complains when the buffer's copied */
-			unsigned int fidx;
-			if (mf->v4) {
-				fidx = 3;
-			}
-			else {
-				fidx = 2;
-				*(int *)(&wtcol_f_step[3 * 4]) = 0;
-			}
-#endif
+		if (indices)
+			MEM_freeN(w);
+	}
 
-			do {
-				copy_v4_v4_char((char *)&wtcol_f_step[fidx * 4],
-				                (char *)&wtcol_v[4 * (*(&mf->v1 + fidx))]);
-			} while (fidx--);
-		}
-#endif
-		/*now add to loops, so the data can be passed through the modifier stack*/
-		/* If no CD_PREVIEW_MLOOPCOL existed yet, we have to add a new one! */
-		if (!wtcol_l) {
-			BLI_array_declare(wtcol_l);
-			totloop = 0;
-			for (i = 0; i < dm->numPolyData; i++, mp++) {
-				ml = mloop + mp->loopstart;
-
-				BLI_array_grow_items(wtcol_l, mp->totloop);
-				for (j = 0; j < mp->totloop; j++, ml++, totloop++) {
-					copy_v4_v4_char((char *)&wtcol_l[totloop],
-					                (char *)&wtcol_v[4 * ml->v]);
-				}
+	/* No weights given, take them from active vgroup(s). */
+	else
+		wtcol_v = calc_weightpaint_vert_array(ob, dm, draw_flag, coba);
+
+	/* now add to loops, so the data can be passed through the modifier stack */
+	/* If no CD_PREVIEW_MLOOPCOL existed yet, we have to add a new one! */
+	if (!wtcol_l) {
+		BLI_array_declare(wtcol_l);
+		totloop = 0;
+		for (i = 0; i < dm->numPolyData; i++, mp++) {
+			ml = mloop + mp->loopstart;
+
+			BLI_array_grow_items(wtcol_l, mp->totloop);
+			for (j = 0; j < mp->totloop; j++, ml++, totloop++) {
+				copy_v4_v4_char((char *)&wtcol_l[totloop],
+				                (char *)&wtcol_v[4 * ml->v]);
 			}
-			CustomData_add_layer(&dm->loopData, CD_PREVIEW_MLOOPCOL, CD_ASSIGN, wtcol_l, totloop);
 		}
-		else {
-			totloop = 0;
-			for (i = 0; i < dm->numPolyData; i++, mp++) {
-				ml = mloop + mp->loopstart;
+		CustomData_add_layer(&dm->loopData, CD_PREVIEW_MLOOPCOL, CD_ASSIGN, wtcol_l, totloop);
+	}
+	else {
+		totloop = 0;
+		for (i = 0; i < dm->numPolyData; i++, mp++) {
+			ml = mloop + mp->loopstart;
 
-				for (j = 0; j < mp->totloop; j++, ml++, totloop++) {
-					copy_v4_v4_char((char *)&wtcol_l[totloop],
-					                (char *)&wtcol_v[4 * ml->v]);
-				}
+			for (j = 0; j < mp->totloop; j++, ml++, totloop++) {
+				copy_v4_v4_char((char *)&wtcol_l[totloop],
+				                (char *)&wtcol_v[4 * ml->v]);
 			}
 		}
-		MEM_freeN(wtcol_v);
 	}
+	MEM_freeN(wtcol_v);
 
 	dm->dirty |= DM_DIRTY_TESS_CDLAYERS;
 }
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 03698736459..f0d201ea3f7 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -279,7 +279,7 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filepath
 	/* this can happen when active scene was lib-linked, and doesn't exist anymore */
 	if (CTX_data_scene(C) == NULL) {
 		/* in case we don't even have a local scene, add one */
-		if(!G.main->scene.first)
+		if (!G.main->scene.first)
 			BKE_scene_add("Scene");
 
 		CTX_data_scene_set(C, G.main->scene.first);
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 54f69a49e70..54bbe4bf495 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -653,12 +653,29 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 			else {
 				if (index_mf_to_mpoly) {
 					orig = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, i);
-					if (orig == ORIGINDEX_NONE) { if (nors) nors += 3; continue; }
-					if (drawParamsMapped)       { draw_option = drawParamsMapped(userData, orig); }
-					else                        { if (nors) nors += 3; continue; }
+					if (orig == ORIGINDEX_NONE) {
+						/* XXX, this is not really correct
+						 * it will draw the previous faces context for this one when we don't know its settings.
+						 * but better then skipping it altogether. - campbell */
+						draw_option = DM_DRAW_OPTION_NORMAL;
+					}
+					else if (drawParamsMapped) {
+						draw_option = drawParamsMapped(userData, orig);
+					}
+					else {
+						if (nors) {
+							nors += 3; continue;
+						}
+					}
+				}
+				else if (drawParamsMapped) {
+					draw_option = drawParamsMapped(userData, i);
+				}
+				else {
+					if (nors) {
+						nors += 3; continue;
+					}
 				}
-				else if (drawParamsMapped) { draw_option = drawParamsMapped(userData, i); }
-				else                       { if (nors) nors += 3; continue; }
 			}
 			
 			if (draw_option != DM_DRAW_OPTION_SKIP) {
@@ -742,9 +759,12 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 					if (index_mf_to_mpoly) {
 						orig = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, actualFace);
 						if (orig == ORIGINDEX_NONE) {
-							continue;
+							/* XXX, this is not really correct
+							 * it will draw the previous faces context for this one when we don't know its settings.
+							 * but better then skipping it altogether. - campbell */
+							draw_option = DM_DRAW_OPTION_NORMAL;
 						}
-						if (drawParamsMapped) {
+						else if (drawParamsMapped) {
 							draw_option = drawParamsMapped(userData, orig);
 						}
 					}
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index e300b5e0f19..97d750854f4 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -84,15 +84,9 @@
 #include "BKE_movieclip.h"
 
 #ifdef WITH_PYTHON
-#include "BPY_extern.h"
+#  include "BPY_extern.h"
 #endif
 
-#ifndef M_PI
-#define M_PI        3.14159265358979323846
-#endif
-
-
-
 /* ************************ Constraints - General Utilities *************************** */
 /* These functions here don't act on any specific constraints, and are therefore should/will
  * not require any of the special function-pointers afforded by the relevant constraint 
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index d23a608d31f..3ed759392b6 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1940,13 +1940,13 @@ void DAG_scene_sort(Main *bmain, Scene *sce)
 static void lib_id_recalc_tag(Main *bmain, ID *id)
 {
 	id->flag |= LIB_ID_RECALC;
-	bmain->id_tag_update[id->name[0]] = 1;
+	DAG_id_type_tag(bmain, GS(id->name));
 }
 
 static void lib_id_recalc_data_tag(Main *bmain, ID *id)
 {
 	id->flag |= LIB_ID_RECALC_DATA;
-	bmain->id_tag_update[id->name[0]] = 1;
+	DAG_id_type_tag(bmain, GS(id->name));
 }
 
 /* node was checked to have lasttime != curtime and is if type ID_OB */
@@ -2818,6 +2818,7 @@ void DAG_ids_check_recalc(Main *bmain, Scene *scene, int time)
 void DAG_ids_clear_recalc(Main *bmain)
 {
 	ListBase *lbarray[MAX_LIBARRAY];
+	bNodeTree *ntree;
 	int a;
 
 	/* loop over all ID types */
@@ -2830,9 +2831,15 @@ void DAG_ids_clear_recalc(Main *bmain)
 		/* we tag based on first ID type character to avoid 
 		 * looping over all ID's in case there are no tags */
 		if (id && bmain->id_tag_update[id->name[0]]) {
-			for (; id; id = id->next)
+			for (; id; id = id->next) {
 				if (id->flag & (LIB_ID_RECALC | LIB_ID_RECALC_DATA))
 					id->flag &= ~(LIB_ID_RECALC | LIB_ID_RECALC_DATA);
+
+				/* some ID's contain semi-datablock nodetree */
+				ntree = ntreeFromID(id);
+				if (ntree && (ntree->id.flag & (LIB_ID_RECALC | LIB_ID_RECALC_DATA)))
+					ntree->id.flag &= ~(LIB_ID_RECALC | LIB_ID_RECALC_DATA);
+			}
 		}
 	}
 
@@ -2899,8 +2906,18 @@ void DAG_id_tag_update(ID *id, short flag)
 	}
 }
 
-void DAG_id_type_tag(struct Main *bmain, short idtype)
+void DAG_id_type_tag(Main *bmain, short idtype)
 {
+	if (idtype == ID_NT) {
+		/* stupid workaround so parent datablocks of nested nodetree get looped
+		 * over when we loop over tagged datablock types */
+		DAG_id_type_tag(bmain, ID_MA);
+		DAG_id_type_tag(bmain, ID_TE);
+		DAG_id_type_tag(bmain, ID_LA);
+		DAG_id_type_tag(bmain, ID_WO);
+		DAG_id_type_tag(bmain, ID_SCE);
+	}
+
 	bmain->id_tag_update[((char *)&idtype)[0]] = 1;
 }
 
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index bb3836e3c08..ed85e5b627b 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -3366,7 +3366,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 							    (!hit_found || (brush->flags & MOD_DPAINT_INVERSE_PROX)))
 							{
 								float proxDist = -1.0f;
-								float hitCo[3];
+								float hitCo[3] = {0.0f, 0.0f, 0.0f};
 								short hQuad;
 								int face;
 
@@ -3723,6 +3723,8 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
 					float smooth_range = smooth * (1.0f - strength), dist;
 					/* calculate max range that can have particles with higher influence than the nearest one */
 					float max_range = smooth - strength * smooth + solidradius;
+					/* Make gcc happy! */
+					dist = max_range;
 
 					particles = BLI_kdtree_range_search(tree, max_range, bData->realCoord[bData->s_pos[index]].v, NULL, &nearest);
 
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 70867a45fd7..17dcf34b71f 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -38,9 +38,13 @@
 
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_material_types.h"
 #include "DNA_node_types.h"
 #include "DNA_node_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_texture_types.h"
+#include "DNA_world_types.h"
 
 #include "BLI_string.h"
 #include "BLI_math.h"
@@ -1154,6 +1158,18 @@ void ntreeSetOutput(bNodeTree *ntree)
 	 * might be different for editor or for "real" use... */
 }
 
+bNodeTree *ntreeFromID(ID *id)
+{
+	switch (GS(id->name)) {
+		case ID_MA: return ((Material*)id)->nodetree;
+		case ID_LA: return ((Lamp*)id)->nodetree;
+		case ID_WO: return ((World*)id)->nodetree;
+		case ID_TE: return ((Tex*)id)->nodetree;
+		case ID_SCE: return ((Scene*)id)->nodetree;
+		default: return NULL;
+	}
+}
+
 typedef struct MakeLocalCallData {
 	ID *group_id;
 	ID *new_id;
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index a780a9e8684..90889d7c09e 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2140,16 +2140,22 @@ static void psys_update_effectors(ParticleSimulationData *sim)
 	precalc_guides(sim, sim->psys->effectors);
 }
 
-static void integrate_particle(ParticleSettings *part, ParticleData *pa, float dtime, float *external_acceleration, void (*force_func)(void *forcedata, ParticleKey *state, float *force, float *impulse), void *forcedata)
+static void integrate_particle(ParticleSettings *part, ParticleData *pa, float dtime, float *external_acceleration,
+                               void (*force_func)(void *forcedata, ParticleKey *state, float *force, float *impulse),
+                               void *forcedata)
 {
+#define ZERO_F43 {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}
+
 	ParticleKey states[5];
-	float force[3],acceleration[3],impulse[3],dx[4][3],dv[4][3],oldpos[3];
+	float force[3], acceleration[3], impulse[3], dx[4][3] = ZERO_F43, dv[4][3] = ZERO_F43, oldpos[3];
 	float pa_mass= (part->flag & PART_SIZEMASS ? part->mass * pa->size : part->mass);
 	int i, steps=1;
 	int integrator = part->integrator;
 
+#undef ZERO_F43
+
 	copy_v3_v3(oldpos, pa->state.co);
-	
+
 	/* Verlet integration behaves strangely with moving emitters, so do first step with euler. */
 	if (pa->prev_state.time < 0.f && integrator == PART_INT_VERLET)
 		integrator = PART_INT_EULER;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 2e57df844c8..d0af06d9f90 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -408,6 +408,7 @@ Scene *BKE_scene_add(const char *name)
 	sce->r.im_format.planes = R_IMF_PLANES_RGB;
 	sce->r.im_format.imtype = R_IMF_IMTYPE_PNG;
 	sce->r.im_format.quality = 90;
+	sce->r.im_format.compress = 90;
 
 	sce->r.displaymode = R_OUTPUT_AREA;
 	sce->r.framapto = 100;
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index e6339d07e66..322b77e0462 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -2019,8 +2019,14 @@ void txt_do_undo(Text *text)
 
 			/* get and restore the cursors */
 			txt_undo_read_cursors(text->undo_buf, &text->undo_pos, &curln, &curc, &selln, &selc);
+			
 			txt_move_to(text, curln, curc, 0);
-			txt_move_to(text, curln, curc + linep, 1);
+			txt_move_to(text, selln, selc, 1);
+			
+			if ((curln == selln) && (curc == selc)) {
+				for (i = 0; i < linep; i++)
+					txt_move_right(text, 1);
+			}
 			
 			txt_delete_selected(text);
 			
@@ -2269,6 +2275,8 @@ void txt_split_curline(Text *text)
 
 	txt_delete_sel(text);
 
+	if (!undoing) txt_undo_add_charop(text, UNDO_INSERT_1, '\n');
+	
 	/* Make the two half strings */
 
 	left = MEM_mallocN(text->curc + 1, "textline_string");
@@ -2300,7 +2308,6 @@ void txt_split_curline(Text *text)
 	txt_clean_text(text);
 	
 	txt_pop_sel(text);
-	if (!undoing) txt_undo_add_charop(text, UNDO_INSERT_1, '\n');
 }
 
 static void txt_delete_line(Text *text, TextLine *line)
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 7be636fe150..4a27036050e 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -129,6 +129,7 @@ set(SRC
 	BLI_math_color.h
 	BLI_math_geom.h
 	BLI_math_inline.h
+	BLI_math_interp.h
 	BLI_math_matrix.h
 	BLI_math_rotation.h
 	BLI_math_vector.h
diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index 8b63a94951d..8924d03f736 100644
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -501,7 +501,7 @@ void BLI_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
 			Material *ma = (Material *)id;
 			bNodeTree *ntree = ma->nodetree;
 
-			if(ntree) {
+			if (ntree) {
 				bNode *node;
 
 				for (node = ntree->nodes.first; node; node = node->next) {
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b9e23f60881..55ae56ac4e8 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2410,6 +2410,8 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree)
 	ntree->adt = newdataadr(fd, ntree->adt);
 	direct_link_animdata(fd, ntree->adt);
 	
+	ntree->id.flag &= ~(LIB_ID_RECALC|LIB_ID_RECALC_DATA);
+
 	link_list(fd, &ntree->nodes);
 	for (node = ntree->nodes.first; node; node = node->next) {
 		node->typeinfo = NULL;
@@ -8533,7 +8535,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 			for (clip = main->movieclip.first; clip; clip = clip->id.next) {
 				if (clip->tracking.settings.reconstruction_success_threshold == 0.0f) {
-					clip->tracking.settings.reconstruction_success_threshold = 1e-3;
+					clip->tracking.settings.reconstruction_success_threshold = 1e-3f;
 				}
 			}
 		}
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index ba5e7569c31..590edc45d07 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -42,8 +42,8 @@
 #include "intern/bmesh_private.h"
 
 /* used as an extern, defined in bmesh.h */
-BMAllocTemplate bm_mesh_allocsize_default = {512, 1024, 2048, 512};
-BMAllocTemplate bm_mesh_chunksize_default = {512, 1024, 2048, 512};
+const BMAllocTemplate bm_mesh_allocsize_default = {512, 1024, 2048, 512};
+const BMAllocTemplate bm_mesh_chunksize_default = {512, 1024, 2048, 512};
 
 static void bm_mempool_init(BMesh *bm, const BMAllocTemplate *allocsize)
 {
@@ -109,7 +109,7 @@ void BM_mesh_elem_toolflags_clear(BMesh *bm)
  *
  * \note ob is needed by multires
  */
-BMesh *BM_mesh_create(BMAllocTemplate *allocsize)
+BMesh *BM_mesh_create(const BMAllocTemplate *allocsize)
 {
 	/* allocate the structure */
 	BMesh *bm = MEM_callocN(sizeof(BMesh), __func__);
@@ -206,6 +206,11 @@ void BM_mesh_clear(BMesh *bm)
 
 	bm->stackdepth = 1;
 	bm->totflags = 1;
+
+	CustomData_reset(&bm->vdata);
+	CustomData_reset(&bm->edata);
+	CustomData_reset(&bm->ldata);
+	CustomData_reset(&bm->pdata);
 }
 
 /**
diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h
index b592f863cd1..8baba568fb8 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@ -31,7 +31,7 @@ struct BMAllocTemplate;
 
 void   BM_mesh_elem_toolflags_ensure(BMesh *bm);
 void   BM_mesh_elem_toolflags_clear(BMesh *bm);
-BMesh *BM_mesh_create(struct BMAllocTemplate *allocsize);
+BMesh *BM_mesh_create(const struct BMAllocTemplate *allocsize);
 
 void   BM_mesh_free(BMesh *bm);
 void   BM_mesh_data_free(BMesh *bm);
@@ -57,8 +57,8 @@ typedef struct BMAllocTemplate {
 	int totvert, totedge, totloop, totface;
 } BMAllocTemplate;
 
-extern BMAllocTemplate bm_mesh_allocsize_default;
-extern BMAllocTemplate bm_mesh_chunksize_default;
+extern const BMAllocTemplate bm_mesh_allocsize_default;
+extern const BMAllocTemplate bm_mesh_chunksize_default;
 
 enum {
 	BM_MESH_CREATE_USE_TOOLFLAGS = (1 << 0)
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index ba38f230f0b..baec0b7745d 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -256,7 +256,7 @@ BMOpSlot *BMO_slot_get(BMOpSlot slot_args[BMO_OP_MAX_SLOTS], const char *identif
 	if (UNLIKELY(slot_code < 0)) {
 		//return &BMOpEmptySlot;
 		BLI_assert(0);
-		NULL;  /* better crash */
+		return NULL;  /* better crash */
 	}
 
 	return &slot_args[slot_code];
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index 12edffec213..c7cd1e742d8 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -382,18 +382,19 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op)
 
 				/* compute summed length between vertices in forward direction */
 				len = 0.0f;
-				for (j = 0; j < lenv2; j++) {
+				for (j = 0; (j < lenv2) && (len < min); j++) {
 					len += len_v3v3(vv1[clamp_index(i + j, lenv1)]->co, vv2[j]->co);
 				}
 
 				if (len < min) {
 					min = len;
 					starti = i;
+					dir1 = 1;
 				}
 
 				/* compute summed length between vertices in backward direction */
 				len = 0.0f;
-				for (j = 0; j < lenv2; j++) {
+				for (j = 0; (j < lenv2) && (len < min); j++) {
 					len += len_v3v3(vv1[clamp_index(i - j, lenv1)]->co, vv2[j]->co);
 				}
 
diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c
index cdfd8372d61..3f2ca21bcee 100644
--- a/source/blender/bmesh/tools/BME_bevel.c
+++ b/source/blender/bmesh/tools/BME_bevel.c
@@ -689,8 +689,16 @@ static BMFace *BME_bevel_poly(BMesh *bm, BMFace *f, float value, int options, BM
 		         BMO_elem_flag_test(bm, l->v, BME_BEVEL_ORIG) &&
 		         !BMO_elem_flag_test(bm, l->prev->e, BME_BEVEL_BEVEL))
 		{
-			max = 1.0f;
-			l = BME_bevel_vert(bm, l, value, options, up_vec, td);
+			/* avoid making double vertices [#33438] */
+			BME_TransData *vtd;
+			vtd = BME_get_transdata(td, l->v);
+			if (vtd->weight == 0.0f) {
+				BMO_elem_flag_disable(bm, l->v, BME_BEVEL_BEVEL);
+			}
+			else {
+				max = 1.0f;
+				l = BME_bevel_vert(bm, l, value, options, up_vec, td);
+			}
 		}
 	}
 
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index cb35616a1f7..9125800d3e8 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -375,8 +375,9 @@ static void offset_meet(EdgeHalf *e1, EdgeHalf *e2, BMVert *v, BMFace *f,
 static void offset_in_two_planes(EdgeHalf *e1, EdgeHalf *e2, EdgeHalf *emid,
                                  BMVert *v, BMFace *f1, BMFace *f2, float meetco[3])
 {
-	float dir1[3], dir2[3], norm_perp1[3], norm_perp2[3],
-	      off1a[3], off1b[3], off2a[3], off2b[3], isect2[3], co[3];
+	float dir1[3], dir2[3], dirmid[3], norm_perp1[3], norm_perp2[3],
+	      off1a[3], off1b[3], off2a[3], off2b[3], isect2[3], co[3],
+	      f1no[3], f2no[3];
 	int iret;
 
 	BLI_assert(f1 != NULL && f2 != NULL);
@@ -384,17 +385,21 @@ static void offset_in_two_planes(EdgeHalf *e1, EdgeHalf *e2, EdgeHalf *emid,
 	/* get direction vectors for two offset lines */
 	sub_v3_v3v3(dir1, v->co, BM_edge_other_vert(e1->e, v)->co);
 	sub_v3_v3v3(dir2, BM_edge_other_vert(e2->e, v)->co, v->co);
+	sub_v3_v3v3(dirmid, BM_edge_other_vert(emid->e, v)->co, v->co);
 
 	/* get directions into offset planes */
-	cross_v3_v3v3(norm_perp1, dir1, f1->no);
+	/* calculate face normals at corner in case faces are nonplanar */
+	cross_v3_v3v3(f1no, dirmid, dir1);
+	cross_v3_v3v3(f2no, dirmid, dir2);
+	cross_v3_v3v3(norm_perp1, dir1, f1no);
 	normalize_v3(norm_perp1);
-	cross_v3_v3v3(norm_perp2, dir2, f2->no);
+	cross_v3_v3v3(norm_perp2, dir2, f2no);
 	normalize_v3(norm_perp2);
 
 	/* get points that are offset distances from each line, then another point on each line */
 	copy_v3_v3(off1a, v->co);
 	madd_v3_v3fl(off1a, norm_perp1, e1->offset);
-	add_v3_v3v3(off1b, off1a, dir1);
+	sub_v3_v3v3(off1b, off1a, dir1);
 	copy_v3_v3(off2a, v->co);
 	madd_v3_v3fl(off2a, norm_perp2, e2->offset);
 	add_v3_v3v3(off2b, off2a, dir2);
@@ -404,7 +409,7 @@ static void offset_in_two_planes(EdgeHalf *e1, EdgeHalf *e2, EdgeHalf *emid,
 		copy_v3_v3(meetco, off1a);
 	}
 	else {
-		iret =isect_line_line_v3(off1a, off1b, off2a, off2b, meetco, isect2);
+		iret = isect_line_line_v3(off1a, off1b, off2a, off2b, meetco, isect2);
 		if (iret == 0) {
 			/* lines colinear: another test says they are parallel. so shouldn't happen */
 			copy_v3_v3(meetco, off1a);
@@ -426,10 +431,10 @@ static void offset_in_two_planes(EdgeHalf *e1, EdgeHalf *e2, EdgeHalf *emid,
  * from eh's direction. */
 static void offset_in_plane(EdgeHalf *e, const float plane_no[3], int left, float r[3])
 {
-	float dir[3], no[3];
+	float dir[3], no[3], fdir[3];
 	BMVert *v;
 
-	v = e->is_rev ? e->e->v1 : e->e->v2;
+	v = e->is_rev ? e->e->v2 : e->e->v1;
 
 	sub_v3_v3v3(dir, BM_edge_other_vert(e->e, v)->co, v->co);
 	normalize_v3(dir);
@@ -444,11 +449,12 @@ static void offset_in_plane(EdgeHalf *e, const float plane_no[3], int left, floa
 			no[1] = 1.0f;
 	}
 	if (left)
-		cross_v3_v3v3(r, no, dir);
+		cross_v3_v3v3(fdir, dir, no);
 	else
-		cross_v3_v3v3(r, dir, no);
-	normalize_v3(r);
-	mul_v3_fl(r, e->offset);
+		cross_v3_v3v3(fdir, no, dir);
+	normalize_v3(fdir);
+	copy_v3_v3(r, v->co);
+	madd_v3_v3fl(r, fdir, e->offset);
 }
 
 /* Calculate coordinates of a point a distance d from v on e->e and return it in slideco */
@@ -563,100 +569,11 @@ static void get_point_on_round_edge(const float uv[2],
 
 #else  /* USE_ALTERNATE_ADJ */
 
-#ifdef OLD_ROUND_EDGE
-/*
- * calculation of points on the round profile
- * r - result, coordinate of point on round profile
- * method:
- * Inscribe a circle in angle va - v -vb
- * such that it touches the arms at offset from v.
- * Rotate the center-va segment by (i/n) of the
- * angle va - center -vb, and put the endpoint
- * of that segment in r.
- */
-static void get_point_on_round_profile(float r_co[3], float offset, int k, int count,
-                                       const float va[3], const float v[3], const float vb[3])
-{
-	float vva[3], vvb[3], angle, center[3], rv[3], axis[3], co[3];
-
-	sub_v3_v3v3(vva, va, v);
-	sub_v3_v3v3(vvb, vb, v);
-	normalize_v3(vva);
-	normalize_v3(vvb);
-	angle = angle_normalized_v3v3(vva, vvb);
-
-	add_v3_v3v3(center, vva, vvb);
-	normalize_v3(center);
-	mul_v3_fl(center, offset * (1.0f / cosf(0.5f * angle)));
-	add_v3_v3(center, v);           /* coordinates of the center of the inscribed circle */
-
-
-	sub_v3_v3v3(rv, va, center);    /* radius vector */
-
-
-	sub_v3_v3v3(co, v, center);
-	cross_v3_v3v3(axis, rv, co);    /* calculate axis */
-
-	sub_v3_v3v3(vva, va, center);
-	sub_v3_v3v3(vvb, vb, center);
-	angle = angle_v3v3(vva, vvb);
-
-	rotate_v3_v3v3fl(co, rv, axis, angle * (float)k / (float)count);
-
-	add_v3_v3(co, center);
-	copy_v3_v3(r_co, co);
-}
-
-/*
- * Find the point (/n) of the way around the round profile for e,
- * where start point is va, midarc point is vmid, and end point is vb.
- * Return the answer in profileco.
- * Method:
- * Adjust va and vb (along edge direction) so that they are perpendicular
- * to edge at v, then use get_point_on_round_profile, then project
- * back onto original va - vmid - vb plane.
- * If va, vmid, and vb are all on the same plane, just interpolate between va and vb.
- */
-static void get_point_on_round_edge(EdgeHalf *e, int k,
-                                    const float va[3], const float vmid[3], const float vb[3],
-                                    float r_co[3])
-{
-	float vva[3], vvb[3],  point[3], dir[3], vaadj[3], vbadj[3], p2[3], pn[3];
-	int n = e->seg;
-
-	sub_v3_v3v3(vva, va, vmid);
-	sub_v3_v3v3(vvb, vb, vmid);
-	if (e->is_rev)
-		sub_v3_v3v3(dir, e->e->v1->co, e->e->v2->co);
-	else
-		sub_v3_v3v3(dir, e->e->v2->co, e->e->v1->co);
-	normalize_v3(dir);
-	if (fabsf(angle_v3v3(vva, vvb) - (float)M_PI) > 100.f *(float)BEVEL_EPSILON) {
-		copy_v3_v3(vaadj, va);
-		madd_v3_v3fl(vaadj, dir, -len_v3(vva) * cosf(angle_v3v3(vva, dir)));
-		copy_v3_v3(vbadj, vb);
-		madd_v3_v3fl(vbadj, dir, -len_v3(vvb) * cosf(angle_v3v3(vvb, dir)));
-
-		get_point_on_round_profile(point, e->offset, k, n, vaadj, vmid, vbadj);
-
-		add_v3_v3v3(p2, point, dir);
-		cross_v3_v3v3(pn, vva, vvb);
-		if (!isect_line_plane_v3(r_co, point, p2, vmid, pn, 0)) {
-			/* TODO: track down why this sometimes fails */
-			copy_v3_v3(r_co, point);
-		}
-	}
-	else {
-		/* planar case */
-		interp_v3_v3v3(r_co, va, vb, (float)k / (float)n);
-	}
-}
-#else
-
-/*
- * Find the point (/n) of the way around the round profile for e,
- * where start point is va, midarc point is vmid, and end point is vb.
- * Return the answer in profileco.
+/* Fill matrix r_mat so that a point in the sheared parallelogram with corners
+ * va, vmid, vb (and the 4th that is implied by it being a parallelogram)
+ * is transformed to the unit square by multiplication with r_mat.
+ * If it can't be done because the parallelogram is degenerate, return FALSE
+ * else return TRUE.
  * Method:
  * Find vo, the origin of the parallelogram with other three points va, vmid, vb.
  * Also find vd, which is in direction normal to parallelogram and 1 unit away
@@ -668,16 +585,14 @@ static void get_point_on_round_edge(EdgeHalf *e, int k,
  *    (1,1,0) -> vmid
  *    (1,0,0) -> vb
  *    (0,1,1) -> vd
- * However if va -- vmid -- vb is approximately a straight line, just
- * interpolate along the line.
- */
-static void get_point_on_round_edge(EdgeHalf *e, int k,
-                                    const float va[3], const float vmid[3], const float vb[3],
-                                    float r_co[3])
+ * We want M to make M*A=B where A has the left side above, as columns
+ * and B has the right side as columns - both extended into homogeneous coords.
+ * So M = B*(Ainverse).  Doing Ainverse by hand gives the code below.
+*/
+static int make_unit_square_map(const float va[3], const float vmid[3], const float vb[3],
+                                float r_mat[4][4])
 {
-	float vo[3], vd[3], vb_vmid[3], va_vmid[3], vddir[3], p[3], angle;
-	float m[4][4] = MAT4_UNITY;
-	int n = e->seg;
+	float vo[3], vd[3], vb_vmid[3], va_vmid[3], vddir[3];
 
 	sub_v3_v3v3(va_vmid, vmid, va);
 	sub_v3_v3v3(vb_vmid, vmid, vb);
@@ -688,17 +603,43 @@ static void get_point_on_round_edge(EdgeHalf *e, int k,
 		add_v3_v3v3(vd, vo, vddir);
 
 		/* The cols of m are: {vmid - va, vmid - vb, vmid + vd - va -vb, va + vb - vmid;
-		  * blender transform matrices are stored such that m[i][*] is ith column;
-		  * the last elements of each col remain as they are in unity matrix */
-		sub_v3_v3v3(&m[0][0], vmid, va);
-		sub_v3_v3v3(&m[1][0], vmid, vb);
-		add_v3_v3v3(&m[2][0], vmid, vd);
-		sub_v3_v3(&m[2][0], va);
-		sub_v3_v3(&m[2][0], vb);
-		add_v3_v3v3(&m[3][0], va, vb);
-		sub_v3_v3(&m[3][0], vmid);
-
-		/* Now find point k/(e->seg) along quarter circle from (0,1,0) to (1,0,0) */
+		 * blender transform matrices are stored such that m[i][*] is ith column;
+		 * the last elements of each col remain as they are in unity matrix */
+		sub_v3_v3v3(&r_mat[0][0], vmid, va);
+		r_mat[0][3] = 0.0f;
+		sub_v3_v3v3(&r_mat[1][0], vmid, vb);
+		r_mat[1][3] = 0.0f;
+		add_v3_v3v3(&r_mat[2][0], vmid, vd);
+		sub_v3_v3(&r_mat[2][0], va);
+		sub_v3_v3(&r_mat[2][0], vb);
+		r_mat[2][3] = 0.0f;
+		add_v3_v3v3(&r_mat[3][0], va, vb);
+		sub_v3_v3(&r_mat[3][0], vmid);
+		r_mat[3][3] = 1.0f;
+
+		return TRUE;
+	}
+	else
+		return FALSE;
+}
+
+/*
+ * Find the point (/n) of the way around the round profile for e,
+ * where start point is va, midarc point is vmid, and end point is vb.
+ * Return the answer in profileco.
+ * If va -- vmid -- vb is approximately a straight line, just
+ * interpolate along the line.
+ */
+static void get_point_on_round_edge(EdgeHalf *e, int k,
+                                    const float va[3], const float vmid[3], const float vb[3],
+                                    float r_co[3])
+{
+	float p[3], angle;
+	float m[4][4];
+	int n = e->seg;
+
+	if (make_unit_square_map(va, vmid, vb, m)) {
+		/* Find point k/(e->seg) along quarter circle from (0,1,0) to (1,0,0) */
 		angle = (float)M_PI * (float)k / (2.0f * (float)n);  /* angle from y axis */
 		p[0] = sinf(angle);
 		p[1] = cosf(angle);
@@ -706,11 +647,47 @@ static void get_point_on_round_edge(EdgeHalf *e, int k,
 		mul_v3_m4v3(r_co, m, p);
 	}
 	else {
-		/* planar case */
+		/* degenerate case: profile is a line */
 		interp_v3_v3v3(r_co, va, vb, (float)k / (float)n);
 	}
 }
-#endif  /* ! OLD_ROUND_EDGE */
+
+/* Calculate a snapped point to the transformed profile of edge e, extended as
+ * in a cylinder-like surface in the direction of e.
+ * co is the point to snap and is modified in place.
+ * va and vb are the limits of the profile (with peak on e). */
+static void snap_to_edge_profile(EdgeHalf *e, const float va[3], const float vb[3],
+                                 float co[3])
+{
+	float m[4][4], minv[4][4];
+	float edir[3], va0[3], vb0[3], vmid0[3], p[3], snap[3];
+
+	sub_v3_v3v3(edir, e->e->v1->co, e->e->v2->co);
+	normalize_v3(edir);
+
+	/* project va and vb onto plane P, with normal edir and containing co */
+	closest_to_plane_v3(va0, co, edir, va);
+	closest_to_plane_v3(vb0, co, edir, vb);
+	project_to_edge(e->e, va0, vb0, vmid0);
+	if (make_unit_square_map(va0, vmid0, vb0, m)) {
+		/* Transform co and project it onto the unit circle.
+		 * Projecting is in fact just normalizing the transformed co */
+		if (!invert_m4_m4(minv, m)) {
+			/* shouldn't happen, by angle test and construction of vd */
+			BLI_assert(!"failed inverse during profile snap");
+			return;
+		}
+		mul_v3_m4v3(p, minv, co);
+		normalize_v3(p);
+		mul_v3_m4v3(snap, m, p);
+		copy_v3_v3(co, snap);
+	}
+	else {
+		/* planar case: just snap to line va--vb */
+		closest_to_line_segment_v3(p, co, va, vb);
+		copy_v3_v3(co, p);
+	}
+}
 
 #endif  /* !USE_ALTERNATE_ADJ */
 
@@ -748,7 +725,9 @@ static void build_boundary(MemArena *mem_arena, BevVert *bv)
 		slide_dist(e->next, bv->v, e->offset, co);
 		v = add_new_bound_vert(mem_arena, vm, co);
 		v->efirst = v->elast = e->next;
-		vm->mesh_kind = M_POLY;
+		e->next->leftv = e->next->rightv = v;
+		/* could use M_POLY too, but tri-fan looks nicer)*/
+		vm->mesh_kind = M_TRI_FAN;
 		return;
 	}
 
@@ -839,7 +818,6 @@ static void build_boundary(MemArena *mem_arena, BevVert *bv)
 	else {
 		vm->mesh_kind = M_ADJ;
 	}
-	/* TODO: if vm->count == 4 and bv->selcount == 4, use M_CROSS pattern */
 }
 
 /*
@@ -852,9 +830,11 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
 	VMesh *vm = bv->vmesh;
 	BoundVert *v, *vprev, *vnext;
 	NewVert *nv, *nvprev, *nvnext;
+	EdgeHalf *e1, *e2, *epipe;
 	BMVert *bmv, *bmv1, *bmv2, *bmv3, *bmv4;
 	BMFace *f;
 	float co[3], coa[3], cob[3], midco[3];
+	float va_pipe[3], vb_pipe[3];
 
 #ifdef USE_ALTERNATE_ADJ
 	/* ordered as follows (orig, prev, center, next)*/
@@ -873,6 +853,29 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
 	ns = vm->seg;
 	ns2 = ns / 2;
 	BLI_assert(n > 2 && ns > 1);
+
+	/* special case: two beveled edges are in line and share a face, making a "pipe" */
+	epipe = NULL;
+	if (bv->selcount > 2) {
+		for (e1 = &bv->edges[0]; epipe == NULL && e1 != &bv->edges[bv->edgecount]; e1++) {
+			if (e1->is_bev) {
+				for (e2 = &bv->edges[0]; e2 != &bv->edges[bv->edgecount]; e2++) {
+					if (e1 != e2 && e2->is_bev) {
+						if ((e1->fnext == e2->fprev) || (e1->fprev == e2->fnext)) {
+							float dir1[3], dir2[3];
+							sub_v3_v3v3(dir1, bv->v->co, BM_edge_other_vert(e1->e, bv->v)->co);
+							sub_v3_v3v3(dir2, BM_edge_other_vert(e2->e, bv->v)->co, bv->v->co);
+							if (angle_v3v3(dir1, dir2) < 100.0f * (float)BEVEL_EPSILON) {
+								epipe = e1;
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
 	/* Make initial rings, going between points on neighbors.
 	 * After this loop, will have coords for all (i, r, k) where
 	 * BoundVert for i has a bevel, 0 <= r <= ns2, 0 <= k <= ns */
@@ -943,6 +946,12 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
 					get_point_on_round_edge(v->ebev, k, coa, midco, cob, co);
 					copy_v3_v3(mesh_vert(vm, i, ring, k)->co, co);
 				}
+
+				if (v->ebev == epipe) {
+					/* save profile extremes for later snapping */
+					copy_v3_v3(va_pipe, mesh_vert(vm, i, 0, 0)->co);
+					copy_v3_v3(vb_pipe, mesh_vert(vm, i, 0, ns)->co);
+				}
 #endif
 			}
 		} while ((v = v->next) != vm->boundstart);
@@ -968,6 +977,9 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
 						nv = mesh_vert(vm, i, ring, k);
 						nvprev = mesh_vert(vm, vprev->index, k, ns - ring);
 						mid_v3_v3v3(co, nv->co, nvprev->co);
+						if (epipe)
+							snap_to_edge_profile(epipe, va_pipe, vb_pipe, co);
+
 #ifndef USE_ALTERNATE_ADJ
 						copy_v3_v3(nv->co, co);
 #endif
@@ -1017,6 +1029,8 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
 						nvnext = mesh_vert(vm, vnext->index, ns2, k);
 					if (vprev->ebev && vnext->ebev) {
 						mid_v3_v3v3v3(co, nvprev->co, nv->co, nvnext->co);
+						if (epipe)
+							snap_to_edge_profile(epipe, va_pipe, vb_pipe, co);
 #ifndef USE_ALTERNATE_ADJ
 						copy_v3_v3(nv->co, co);
 #endif
@@ -1027,6 +1041,8 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
 					}
 					else if (vprev->ebev) {
 						mid_v3_v3v3(co, nvprev->co, nv->co);
+						if (epipe)
+							snap_to_edge_profile(epipe, va_pipe, vb_pipe, co);
 #ifndef USE_ALTERNATE_ADJ
 						copy_v3_v3(nv->co, co);
 #endif
@@ -1037,6 +1053,8 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
 					}
 					else if (vnext->ebev) {
 						mid_v3_v3v3(co, nv->co, nvnext->co);
+						if (epipe)
+							snap_to_edge_profile(epipe, va_pipe, vb_pipe, co);
 #ifndef USE_ALTERNATE_ADJ
 						copy_v3_v3(nv->co, co);
 #endif
@@ -1064,6 +1082,8 @@ static void bevel_build_rings(BMesh *bm, BevVert *bv)
 			}
 		} while ((v = v->next) != vm->boundstart);
 		mul_v3_fl(midco, 1.0f / nn);
+		if (epipe)
+			snap_to_edge_profile(epipe, va_pipe, vb_pipe, midco);
 		bmv = BM_vert_create(bm, midco, NULL, 0);
 		v = vm->boundstart;
 		do {
@@ -1275,39 +1295,27 @@ static void bevel_build_quadstrip(BMesh *bm, BevVert *bv)
 		EdgeHalf *eh_b = next_bev(bv, eh_a->next);  /* since (selcount == 2) we know this is valid */
 		BMLoop *l_a = BM_face_vert_share_loop(f, eh_a->rightv->nv.v);
 		BMLoop *l_b = BM_face_vert_share_loop(f, eh_b->leftv->nv.v);
-		int seg_count = bv->vmesh->seg;  /* ensure we don't walk past the segments */
-
-		if (l_a == l_b) {
-			/* step once around if we hit the same loop */
-			l_a = l_a->prev;
-			l_b = l_b->next;
-			seg_count--;
-		}
-
-		BLI_assert(l_a != l_b);
+		int split_count = bv->vmesh->seg + 1;  /* ensure we don't walk past the segments */
 
-		while (f->len > 4) {
+		while (f->len > 4 && split_count > 0) {
 			BMLoop *l_new;
 			BLI_assert(l_a->f == f);
 			BLI_assert(l_b->f == f);
 
-			BM_face_split(bm, f, l_a->v, l_b->v, &l_new, NULL, FALSE);
-			if (seg_count-- == 0) {
-				break;
+			if (l_a-> v == l_b->v || l_a->next == l_b) {
+				/* l_a->v and l_b->v can be the same or such that we'd make a 2-vertex poly */
+				l_a = l_a->prev;
+				l_b = l_b->next;
 			}
+			else {
+				BM_face_split(bm, f, l_a->v, l_b->v, &l_new, NULL, FALSE);
+				f = l_new->f;
 
-			/* turns out we don't need this,
-			 * because of how BM_face_split works we always get the loop of the next face */
-#if 0
-			if (l_new->f->len < l_new->radial_next->f->len) {
-				l_new = l_new->radial_next;
+				/* walk around the new face to get the next verts to split */
+				l_a = l_new->prev;
+				l_b = l_new->next->next;
 			}
-#endif
-			f = l_new->f;
-
-			/* walk around the new face to get the next verts to split */
-			l_a = l_new->prev;
-			l_b = l_new->next->next;
+			split_count--;
 		}
 	}
 }
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 8337a977b3b..de8d1e85eb9 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -589,7 +589,7 @@ void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me)
 				for (int i = 0; i < edge_count; i++, med++) {
 					med->bweight = 0;
 					med->crease  = 0;
-					med->flag    = 0;
+					med->flag   |= ME_LOOSEEDGE;
 					med->v1      = indices[2 * i];
 					med->v2      = indices[2 * i + 1];
 				}
diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp
index d10cd7378e9..61793589422 100644
--- a/source/blender/collada/TransformReader.cpp
+++ b/source/blender/collada/TransformReader.cpp
@@ -84,7 +84,7 @@ void TransformReader::dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[
 	COLLADAFW::Rotate *ro = (COLLADAFW::Rotate *)tm;
 	COLLADABU::Math::Vector3& axis = ro->getRotationAxis();
 	const float angle = (float)DEG2RAD(ro->getRotationAngle());
-	const float ax[] = {axis[0], axis[1], axis[2]};
+	const float ax[] = {(float)axis[0], (float)axis[1], (float)axis[2]};
 	// float quat[4];
 	// axis_angle_to_quat(quat, axis, angle);
 	// quat_to_mat4(m, quat);
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 35844b549de..7bdda387d5e 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -139,7 +139,7 @@ Mesh *bc_to_mesh_apply_modifiers(Scene *scene, Object *ob, BC_export_mesh_type e
 {
 	Mesh *tmpmesh;
 	CustomDataMask mask = CD_MASK_MESH;
-	DerivedMesh *dm;
+	DerivedMesh *dm = NULL;
 	switch (export_mesh_type) {
 		case BC_MESH_TYPE_VIEW: {
 			dm = mesh_create_derived_view(scene, ob, mask);
@@ -151,7 +151,7 @@ Mesh *bc_to_mesh_apply_modifiers(Scene *scene, Object *ob, BC_export_mesh_type e
 		}
 	}
 
-	tmpmesh             = BKE_mesh_add("ColladaMesh"); // name is not important here
+	tmpmesh = BKE_mesh_add("ColladaMesh"); // name is not important here
 	DM_to_mesh(dm, tmpmesh, ob);
 	dm->release(dm);
 	return tmpmesh;
diff --git a/source/blender/compositor/intern/COM_Node.cpp b/source/blender/compositor/intern/COM_Node.cpp
index 300d7ef1952..d49bb5f96fb 100644
--- a/source/blender/compositor/intern/COM_Node.cpp
+++ b/source/blender/compositor/intern/COM_Node.cpp
@@ -137,18 +137,26 @@ void Node::addSetVectorOperation(ExecutionSystem *graph, InputSocket *inputsocke
 	graph->addOperation(operation);
 }
 
-/* when a node has no valid data (missing image or group pointer) */
+NodeOperation *Node::convertToOperations_invalid_index(ExecutionSystem *graph, int index)
+{
+	const float warning_color[4] = {1.0f, 0.0f, 1.0f, 1.0f};
+	SetColorOperation *operation = new SetColorOperation();
+	operation->setChannels(warning_color);
+
+	/* link the operation */
+	this->getOutputSocket(index)->relinkConnections(operation->getOutputSocket());
+	graph->addOperation(operation);
+	return operation;
+}
+
+/* when a node has no valid data (missing image / group pointer, or missing renderlayer from EXR) */
 void Node::convertToOperations_invalid(ExecutionSystem *graph, CompositorContext *context)
 {
 	/* this is a really bad situation - bring on the pink! - so artists know this is bad */
-	const float warning_color[4] = {1.0f, 0.0f, 1.0f, 1.0f};
 	int index;
 	vector<OutputSocket *> &outputsockets = this->getOutputSockets();
 	for (index = 0; index < outputsockets.size(); index++) {
-		SetColorOperation *operation = new SetColorOperation();
-		this->getOutputSocket(index)->relinkConnections(operation->getOutputSocket());
-		operation->setChannels(warning_color);
-		graph->addOperation(operation);
+		convertToOperations_invalid_index(graph, index);
 	}
 }
 
diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h
index 468a95ed434..c098d6da32b 100644
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -106,6 +106,10 @@ public:
 	void addSetVectorOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex);
 	
 	/**
+	 * Create dummy warning operation, use when we can't get the source data.
+	 */
+	NodeOperation *convertToOperations_invalid_index(ExecutionSystem *graph, int index);
+	/**
 	 * when a node has no valid data (missing image or a group nodes ID pointer is NULL)
 	 * call this function from #convertToOperations, this way the node sockets are converted
 	 * into valid outputs, without this the compositor system gets confused and crashes, see [#32490]
diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp
index 729cb1b70a0..4293e344c65 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_ImageNode.cpp
@@ -83,6 +83,7 @@ void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c
 				is_multilayer_ok = true;
 
 				for (index = 0; index < numberOfOutputs; index++) {
+					NodeOperation *operation = NULL;
 					socket = this->getOutputSocket(index);
 					if (socket->isConnected() || index == 0) {
 						bNodeSocket *bnodeSocket = socket->getbNodeSocket();
@@ -91,7 +92,6 @@ void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c
 						
 						RenderPass *rpass = (RenderPass *)BLI_findlink(&rl->passes, passindex);
 						if (rpass) {
-							NodeOperation *operation = NULL;
 							imageuser->pass = passindex;
 							switch (rpass->channels) {
 								case 1:
@@ -105,16 +105,21 @@ void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c
 								case 4:
 									operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_COLOR);
 									break;
-
 								default:
-									/* XXX add a dummy operation? */
+									/* dummy operation is added below */
 									break;
 							}
+
 							if (index == 0 && operation) {
 								addPreviewOperation(graph, context, operation->getOutputSocket());
 							}
 						}
 					}
+
+					/* incase we can't load the layer */
+					if (operation == NULL) {
+						convertToOperations_invalid_index(graph, index);
+					}
 				}
 			}
 		}
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp
index d535e71a33c..6f7bd33db6f 100644
--- a/source/blender/compositor/nodes/COM_ScaleNode.cpp
+++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp
@@ -39,7 +39,7 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c
 	InputSocket *inputXSocket = this->getInputSocket(1);
 	InputSocket *inputYSocket = this->getInputSocket(2);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
-	BaseScaleOperation *scaleoperation;
+	BaseScaleOperation *scaleoperation = NULL;
 	bNode *bnode = this->getbNode();
 
 	switch (bnode->custom1) {
diff --git a/source/blender/compositor/operations/COM_CropOperation.cpp b/source/blender/compositor/operations/COM_CropOperation.cpp
index 16c19f3ebaa..4f9cd771988 100644
--- a/source/blender/compositor/operations/COM_CropOperation.cpp
+++ b/source/blender/compositor/operations/COM_CropOperation.cpp
@@ -58,6 +58,12 @@ void CropBaseOperation::updateArea()
 		this->m_ymax = max(this->m_settings->y1, this->m_settings->y2) + 1;
 		this->m_ymin = min(this->m_settings->y1, this->m_settings->y2);
 	}
+	else {
+		this->m_xmax = 0;
+		this->m_xmin = 0;
+		this->m_ymax = 0;
+		this->m_ymin = 0;
+	}
 }
 
 void CropBaseOperation::initExecution()
diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp
index d4c35f5afaa..84557118a1c 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_ImageOperation.cpp
@@ -109,7 +109,7 @@ void BaseImageOperation::determineResolution(unsigned int resolution[2], unsigne
 		resolution[1] = stackbuf->y;
 	}
 
-	IMB_freeImBuf(stackbuf);
+	BKE_image_release_ibuf(this->m_image, stackbuf, NULL);
 }
 
 void ImageOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c
index a59a3f7a5ec..aee97f40c31 100644
--- a/source/blender/editors/gpencil/editaction_gpencil.c
+++ b/source/blender/editors/gpencil/editaction_gpencil.c
@@ -49,6 +49,7 @@
 #include "ED_anim_api.h"
 #include "ED_gpencil.h"
 #include "ED_keyframes_edit.h"
+#include "ED_markers.h"
 
 #include "gpencil_intern.h"
 
@@ -460,11 +461,12 @@ void paste_gpdata(Scene *scene)
 	/* undo and redraw stuff */
 	BIF_undo_push("Paste Grease Pencil Frames");
 }
+#endif /* XXX disabled until Grease Pencil code stabilises again... */
 
 /* -------------------------------------- */
 /* Snap Tools */
 
-static short snap_gpf_nearest(bGPDframe *gpf, Scene *scene)
+static short snap_gpf_nearest(bGPDframe *gpf, Scene *UNUSED(scene))
 {
 	if (gpf->flag & GP_FRAME_SELECT)
 		gpf->framenum = (int)(floor(gpf->framenum + 0.5));
@@ -475,7 +477,7 @@ static short snap_gpf_nearestsec(bGPDframe *gpf, Scene *scene)
 {
 	float secf = (float)FPS;
 	if (gpf->flag & GP_FRAME_SELECT)
-		gpf->framenum = (int)(floor(gpf->framenum / secf + 0.5f) * secf);
+		gpf->framenum = (int)(floorf(gpf->framenum / secf + 0.5f) * secf);
 	return 0;
 }
 
@@ -489,33 +491,32 @@ static short snap_gpf_cframe(bGPDframe *gpf, Scene *scene)
 static short snap_gpf_nearmarker(bGPDframe *gpf, Scene *scene)
 {
 	if (gpf->flag & GP_FRAME_SELECT)
-		gpf->framenum = (int)find_nearest_marker_time(&scene->markers, (float)gpf->framenum);
+		gpf->framenum = (int)ED_markers_find_nearest_marker_time(&scene->markers, (float)gpf->framenum);
 	return 0;
 }
 
-
 /* snap selected frames to ... */
-void snap_gplayer_frames(bGPDlayer *gpl, Scene *scene, short mode)
+void ED_gplayer_snap_frames(bGPDlayer *gpl, Scene *scene, short mode)
 {
 	switch (mode) {
-		case 1: /* snap to nearest frame */
+		case SNAP_KEYS_NEARFRAME: /* snap to nearest frame */
 			ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
 			break;
-		case 2: /* snap to current frame */
+		case SNAP_KEYS_CURFRAME: /* snap to current frame */
 			ED_gplayer_frames_looper(gpl, scene, snap_gpf_cframe);
 			break;
-		case 3: /* snap to nearest marker */
+		case SNAP_KEYS_NEARMARKER: /* snap to nearest marker */
 			ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearmarker);
 			break;
-		case 4: /* snap to nearest second */
+		case SNAP_KEYS_NEARSEC: /* snap to nearest second */
 			ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearestsec);
 			break;
 		default: /* just in case */
-			ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
 			break;
 	}
 }
 
+#if 0 /* XXX disabled until grease pencil code stabilises again */
 /* -------------------------------------- */
 /* Mirror Tools */
 
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index e04bbc1f2bf..8fdca730674 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1815,10 +1815,16 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, wmEvent *event)
 	 * better in tools that immediately apply
 	 * in 3D space.
 	 */
-	
+
 	/* we don't pass on key events, GP is used with key-modifiers - prevents Dkey to insert drivers */
-	if (ISKEYBOARD(event->type))
-		estate = OPERATOR_RUNNING_MODAL;
+	if (ISKEYBOARD(event->type)) {
+		if (ELEM4(event->type, LEFTARROWKEY, DOWNARROWKEY, RIGHTARROWKEY, UPARROWKEY)) {
+			/* allow some keys - for frame changing: [#33412] */
+		}
+		else {
+			estate = OPERATOR_RUNNING_MODAL;
+		}
+	}
 	
 	//printf("\tGP - handle modal event...\n");
 	
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 39dd8822267..5cc1ecade3e 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -97,12 +97,13 @@ void  ED_gpencil_select_frame(struct bGPDlayer *gpl, int selx, short select_mode
 void  ED_gplayer_frames_delete(struct bGPDlayer *gpl);
 void  ED_gplayer_frames_duplicate(struct bGPDlayer *gpl);
 
+void  ED_gplayer_snap_frames(struct bGPDlayer *gpl, struct Scene *scene, short mode);
+
 #if 0
 void free_gpcopybuf(void);
 void copy_gpdata(void);
 void paste_gpdata(void);
 
-void snap_gplayer_frames(struct bGPDlayer *gpl, short mode);
 void mirror_gplayer_frames(struct bGPDlayer *gpl, short mode);
 #endif
 
diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h
index 46ed9798d32..6644f59be94 100644
--- a/source/blender/editors/include/ED_mask.h
+++ b/source/blender/editors/include/ED_mask.h
@@ -83,12 +83,13 @@ void  ED_mask_select_frame(struct MaskLayer *masklay, int selx, short select_mod
 void ED_masklayer_frames_delete(struct MaskLayer *masklay);
 void ED_masklayer_frames_duplicate(struct MaskLayer *masklay);
 
+void ED_masklayer_snap_frames(struct MaskLayer *masklay, struct Scene *scene, short mode);
+
 #if 0
 void free_gpcopybuf(void);
 void copy_gpdata(void);
 void paste_gpdata(void);
 
-void snap_masklayer_frames(struct MaskLayer *masklay, short mode);
 void mirror_masklayer_frames(struct MaskLayer *masklay, short mode);
 #endif
 
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 10c585aa802..99f7f0856b3 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -97,7 +97,7 @@ DEF_ICON(PLUGIN)
 	/* various ui */
 DEF_ICON(HELP)
 DEF_ICON(GHOST_ENABLED)
-DEF_ICON(COLOR)
+DEF_ICON(COLOR)  /* see COLOR_RED/GREEN/BLUE */
 DEF_ICON(LINKED)
 DEF_ICON(UNLINKED)
 DEF_ICON(HAND)
@@ -428,9 +428,11 @@ DEF_ICON(CURVE_PATH)
 	DEF_ICON(BLANK646)
 	DEF_ICON(BLANK647)
 	DEF_ICON(BLANK648)
-	DEF_ICON(BLANK649)
-	DEF_ICON(BLANK650)
-	DEF_ICON(BLANK651)
+#endif
+DEF_ICON(COLOR_RED)
+DEF_ICON(COLOR_GREEN)
+DEF_ICON(COLOR_BLUE)
+#ifndef DEF_ICON_BLANK_SKIP
 	DEF_ICON(BLANK652)
 	DEF_ICON(BLANK653)
 	DEF_ICON(BLANK654)
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index f5c943fbb87..2dc552d0fce 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -542,7 +542,7 @@ typedef struct uiStringInfo {
 /* Note: Expects pointers to uiStringInfo structs as parameters.
  *       Will fill them with translated strings, when possible.
  *       Strings in uiStringInfo must be MEM_freeN'ed by caller. */
-void uiButGetStrInfo(struct bContext *C, uiBut *but, int nbr, ...);
+void uiButGetStrInfo(struct bContext *C, uiBut *but, ...);
 
 /* Edit i18n stuff. */
 /* Name of the main py op from i18n addon. */
@@ -817,6 +817,7 @@ void uiTemplateImage(uiLayout *layout, struct bContext *C, struct PointerRNA *pt
 void uiTemplateImageSettings(uiLayout *layout, struct PointerRNA *imfptr, int color_management);
 void uiTemplateImageLayers(uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser);
 void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C);
+void uiOperatorSearch_But(uiBut *but);
 void uiTemplateOperatorSearch(uiLayout *layout);
 void uiTemplateHeader3D(uiLayout *layout, struct bContext *C);
 void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C);
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 9037afc472a..ce82e064531 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -3797,16 +3797,16 @@ void uiButSetFocusOnEnter(wmWindow *win, uiBut *but)
 	wm_event_add(win, &event);
 }
 
-void uiButGetStrInfo(bContext *C, uiBut *but, int nbr, ...)
+void uiButGetStrInfo(bContext *C, uiBut *but, ...)
 {
 	va_list args;
+	uiStringInfo *si;
 
 	EnumPropertyItem *items = NULL, *item = NULL;
 	int totitems, free_items = FALSE;
 
-	va_start(args, nbr);
-	while (nbr--) {
-		uiStringInfo *si = (uiStringInfo *) va_arg(args, void *);
+	va_start(args, but);
+	while ((si = (uiStringInfo *) va_arg(args, void *))) {
 		int type = si->type;
 		char *tmp = NULL;
 
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 5f01255b8e0..b80025e0d77 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4633,7 +4633,7 @@ static int ui_but_menu(bContext *C, uiBut *but)
 	uiPopupMenu *pup;
 	uiLayout *layout;
 	int length;
-	char *name;
+	const char *name;
 	uiStringInfo label = {BUT_GET_LABEL, NULL};
 
 /*	if ((but->rnapoin.data && but->rnaprop) == 0 && but->optype == NULL)*/
@@ -4641,7 +4641,7 @@ static int ui_but_menu(bContext *C, uiBut *but)
 	
 	button_timers_tooltip_remove(C, but);
 
-	uiButGetStrInfo(C, but, 1, &label);
+	uiButGetStrInfo(C, but, &label, NULL);
 	name = label.strinfo;
 
 	pup = uiPupMenuBegin(C, name, ICON_NONE);
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index e7a5f993d32..e57e52d74b6 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -960,7 +960,6 @@ static int edittranslation_exec(bContext *C, wmOperator *op)
 		const char *root = U.i18ndir;
 		const char *uilng = BLF_lang_get();
 
-		const int bufs_nbr = 10;
 		uiStringInfo but_label = {BUT_GET_LABEL, NULL};
 		uiStringInfo rna_label = {BUT_GET_RNA_LABEL, NULL};
 		uiStringInfo enum_label = {BUT_GET_RNAENUM_LABEL, NULL};
@@ -990,8 +989,8 @@ static int edittranslation_exec(bContext *C, wmOperator *op)
 			return OPERATOR_CANCELLED;
 		}
 
-		uiButGetStrInfo(C, but, bufs_nbr, &but_label, &rna_label, &enum_label, &but_tip, &rna_tip, &enum_tip,
-		                &rna_struct, &rna_prop, &rna_enum, &rna_ctxt);
+		uiButGetStrInfo(C, but, &but_label, &rna_label, &enum_label, &but_tip, &rna_tip, &enum_tip,
+		                &rna_struct, &rna_prop, &rna_enum, &rna_ctxt, NULL);
 
 		WM_operator_properties_create(&ptr, EDTSRC_I18N_OP_NAME);
 		RNA_string_set(&ptr, "lang", uilng);
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 7c099de9c1e..c13aadee069 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -46,6 +46,7 @@
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
+#include "BKE_idcode.h"
 #include "BKE_global.h"
 
 #include "WM_api.h"
@@ -426,7 +427,6 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 	rctf rect_fl;
 	rcti rect_i;
 
-	const int nbr_info = 6;
 	uiStringInfo but_tip = {BUT_GET_TIP, NULL};
 	uiStringInfo enum_label = {BUT_GET_RNAENUM_LABEL, NULL};
 	uiStringInfo enum_tip = {BUT_GET_RNAENUM_TIP, NULL};
@@ -440,50 +440,11 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 	/* create tooltip data */
 	data = MEM_callocN(sizeof(uiTooltipData), "uiTooltipData");
 
-	uiButGetStrInfo(C, but, nbr_info, &but_tip, &enum_label, &enum_tip, &op_keymap, &rna_struct, &rna_prop);
+	uiButGetStrInfo(C, but, &but_tip, &enum_label, &enum_tip, &op_keymap, &rna_struct, &rna_prop, NULL);
 
 	/* special case, enum rna buttons only have enum item description,
 	 * use general enum description too before the specific one */
-#if 0
-	if (but->rnaprop && RNA_property_type(but->rnaprop) == PROP_ENUM) {
-		const char *descr = RNA_property_description(but->rnaprop);
-		if (descr && descr[0]) {
-			BLI_strncpy(data->lines[data->totline], descr, sizeof(data->lines[0]));
-			data->color_id[data->totline] = UI_TIP_LC_MAIN;
-			data->totline++;
-		}
-
-		if (ELEM(but->type, ROW, MENU)) {
-			EnumPropertyItem *item;
-			int totitem, free;
-			int value = (but->type == ROW) ? (int)but->hardmax : (int)ui_get_but_val(but);
 
-			RNA_property_enum_items_gettexted(C, &but->rnapoin, but->rnaprop, &item, &totitem, &free);
-
-			for (i = 0; i < totitem; i++) {
-				if (item[i].identifier[0] && item[i].value == value) {
-					if (item[i].description && item[i].description[0]) {
-						BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), "%s: %s",
-						             item[i].name, item[i].description);
-						data->color_id[data->totline] = UI_TIP_LC_SUBMENU;
-						data->totline++;
-					}
-					break;
-				}
-			}
-
-			if (free) {
-				MEM_freeN(item);
-			}
-		}
-	}
-	
-	if (but->tip && but->tip[0] != '\0') {
-		BLI_strncpy(data->lines[data->totline], but->tip, sizeof(data->lines[0]));
-		data->color_id[data->totline] = UI_TIP_LC_MAIN;
-		data->totline++;
-	}
-#else
 	/* Tip */
 	if (but_tip.strinfo) {
 		BLI_strncpy(data->lines[data->totline], but_tip.strinfo, sizeof(data->lines[0]));
@@ -497,29 +458,13 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 		data->color_id[data->totline] = UI_TIP_LC_SUBMENU;
 		data->totline++;
 	}
-#endif
 
-#if 0
-	if (but->optype && !(but->block->flag & UI_BLOCK_LOOP)) {
-		/* operator keymap (not menus, they already have it) */
-		prop = (but->opptr) ? but->opptr->data : NULL;
-
-		if (WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE,
-		                                 buf, sizeof(buf)))
-		{
-			BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Shortcut: %s"), buf);
-			data->color_id[data->totline] = UI_TIP_LC_NORMAL;
-			data->totline++;
-		}
-	}
-#else
 	/* Op shortcut */
 	if (op_keymap.strinfo) {
 		BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Shortcut: %s"), op_keymap.strinfo);
 		data->color_id[data->totline] = UI_TIP_LC_NORMAL;
 		data->totline++;
 	}
-#endif
 
 	if (ELEM3(but->type, TEX, IDPOIN, SEARCH_MENU)) {
 		/* full string */
@@ -553,15 +498,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 				data->totline++;
 			}
 		}
-#if 0
-		/* rna info */
-		if ((U.flag & USER_TOOLTIPS_PYTHON) == 0) {
-			BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Python: %s.%s"),
-			             RNA_struct_identifier(but->rnapoin.type), RNA_property_identifier(but->rnaprop));
-			data->color_id[data->totline] = UI_TIP_LC_PYTHON;
-			data->totline++;
-		}
-#endif
+
 		if (but->rnapoin.id.data) {
 			ID *id = but->rnapoin.id.data;
 			if (id->lib && id->lib->name) {
@@ -603,30 +540,55 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 			}
 		}
 	}
-#if 0
-	else if (ELEM(but->type, MENU, PULLDOWN)) {
-		if ((U.flag & USER_TOOLTIPS_PYTHON) == 0) {
-			MenuType *mt = uiButGetMenuType(but);
-			if (mt) {
-				BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Python: %s"), mt->idname);
-				data->color_id[data->totline] = UI_TIP_LC_PYTHON;
-				data->totline++;
-			}
-		}
-	}
-#else
 	if ((U.flag & USER_TOOLTIPS_PYTHON) == 0 && !but->optype && rna_struct.strinfo) {
-		if (rna_prop.strinfo)
+		if (rna_prop.strinfo) {
 			/* Struct and prop */
 			BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]),
-			             TIP_("Python: %s.%s"), rna_struct.strinfo, rna_prop.strinfo);
-		else
+			             TIP_("Python: %s.%s"),
+			             rna_struct.strinfo, rna_prop.strinfo);
+		}
+		else {
 			/* Only struct (e.g. menus) */
-			BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Python: %s"), rna_struct.strinfo);
+			BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]),
+			             TIP_("Python: %s"), rna_struct.strinfo);
+		}
 		data->color_id[data->totline] = UI_TIP_LC_PYTHON;
 		data->totline++;
+
+		if (but->rnapoin.id.data) {
+			/* this could get its own 'BUT_GET_...' type */
+			PointerRNA *ptr = &but->rnapoin;
+			PropertyRNA *prop = but->rnaprop;
+			ID *id = ptr->id.data;
+
+			char *id_path;
+			char *data_path = NULL;
+
+			/* never fails */
+			id_path = RNA_path_from_ID_python(id);
+
+			if (ptr->id.data && ptr->data && prop) {
+				data_path = RNA_path_from_ID_to_property(ptr, prop);
+			}
+
+			if (data_path) {
+				BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]),
+				             "%s.%s",  /* no need to translate */
+				             id_path, data_path);
+				MEM_freeN(data_path);
+			}
+			else if (prop) {
+				/* can't find the path. be explicit in our ignorance "..." */
+				BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]),
+				             "%s ... %s",  /* no need to translate */
+				             id_path, rna_prop.strinfo ? rna_prop.strinfo : RNA_property_identifier(prop));
+			}
+			MEM_freeN(id_path);
+
+			data->color_id[data->totline] = UI_TIP_LC_PYTHON;
+			data->totline++;
+		}
 	}
-#endif
 
 	/* Free strinfo's... */
 	if (but_tip.strinfo)
@@ -642,7 +604,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 	if (rna_prop.strinfo)
 		MEM_freeN(rna_prop.strinfo);
 
-	assert(data->totline < MAX_TOOLTIP_LINES);
+	BLI_assert(data->totline < MAX_TOOLTIP_LINES);
 	
 	if (data->totline == 0) {
 		MEM_freeN(data);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index e90fc1d4695..84ee0ffebe1 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2024,10 +2024,16 @@ static void curvemap_buttons_layout(uiLayout *layout, PointerRNA *ptr, char labe
 	}
 
 	if (cmp) {
+		const float range_clamp[2]   = {0.0f, 1.0f};
+		const float range_unclamp[2] = {-1000.0f, 1000.0f};  /* arbitrary limits here */
+		const float *range = (cumap->flag & CUMA_DO_CLIP) ? range_clamp : range_unclamp;
+
 		uiLayoutRow(layout, TRUE);
 		uiBlockSetNFunc(block, curvemap_buttons_update, MEM_dupallocN(cb), cumap);
-		bt = uiDefButF(block, NUM, 0, "X", 0, 2 * UI_UNIT_Y, UI_UNIT_X * 10, UI_UNIT_Y, &cmp->x, 0.0f, 1.0f, 1, 5, "");
-		bt = uiDefButF(block, NUM, 0, "Y", 0, 1 * UI_UNIT_Y, UI_UNIT_X * 10, UI_UNIT_Y, &cmp->y, 0.0f, 1.0f, 1, 5, "");
+		bt = uiDefButF(block, NUM, 0, "X", 0, 2 * UI_UNIT_Y, UI_UNIT_X * 10, UI_UNIT_Y,
+		               &cmp->x, range[0], range[1], 1, 5, "");
+		bt = uiDefButF(block, NUM, 0, "Y", 0, 1 * UI_UNIT_Y, UI_UNIT_X * 10, UI_UNIT_Y,
+		               &cmp->y, range[0], range[1], 1, 5, "");
 	}
 
 	/* black/white levels */
@@ -2087,19 +2093,19 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna
 	PropertyRNA *prop = RNA_struct_find_property(ptr, propname);
 	uiBlock *block = uiLayoutGetBlock(layout);
 	uiLayout *col, *row;
-	uiBut *but;
+	uiBut *but = NULL;
 	float softmin, softmax, step, precision;
-	
+
 	if (!prop) {
 		RNA_warning("property not found: %s.%s", RNA_struct_identifier(ptr->type), propname);
 		return;
 	}
 
 	RNA_property_float_ui_range(ptr, prop, &softmin, &softmax, &step, &precision);
-	
+
 	col = uiLayoutColumn(layout, TRUE);
 	row = uiLayoutRow(col, TRUE);
-	
+
 	switch (U.color_picker_type) {
 		case USER_CP_CIRCLE:
 			but = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
@@ -2118,7 +2124,6 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna
 			                     -1, 0.0, 0.0, UI_GRAD_HV, 0, "");
 			break;
 	}
-	
 
 	if (lock) {
 		but->flag |= UI_BUT_COLOR_LOCK;
@@ -2136,7 +2141,6 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna
 
 	
 	if (value_slider) {
-		
 		switch (U.color_picker_type) {
 			case USER_CP_CIRCLE:
 				uiItemS(row);
@@ -2159,7 +2163,6 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna
 				               -1, softmin, softmax, UI_GRAD_HV + 3, 0, "");
 				break;
 		}
-		
 	}
 }
 
@@ -2785,6 +2788,9 @@ static void operator_search_cb(const bContext *C, void *UNUSED(arg), const char
 	for (; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
 		wmOperatorType *ot = BLI_ghashIterator_getValue(iter);
 
+		if ((ot->flag & OPTYPE_INTERNAL) && (G.debug & G_DEBUG_WM) == 0)
+			continue;
+
 		if (BLI_strcasestr(ot->name, str)) {
 			if (WM_operator_poll((bContext *)C, ot)) {
 				char name[256];
@@ -2810,6 +2816,11 @@ static void operator_search_cb(const bContext *C, void *UNUSED(arg), const char
 	BLI_ghashIterator_free(iter);
 }
 
+void uiOperatorSearch_But(uiBut *but)
+{
+	uiButSetSearchFunc(but, operator_search_cb, NULL, operator_call_cb, NULL);
+}
+
 void uiTemplateOperatorSearch(uiLayout *layout)
 {
 	uiBlock *block;
@@ -2820,7 +2831,7 @@ void uiTemplateOperatorSearch(uiLayout *layout)
 	uiBlockSetCurLayout(block, layout);
 
 	but = uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 0, 0, UI_UNIT_X * 6, UI_UNIT_Y, 0, 0, "");
-	uiButSetSearchFunc(but, operator_search_cb, NULL, operator_call_cb, NULL);
+	uiOperatorSearch_But(but);
 }
 
 /************************* Running Jobs Template **************************/
diff --git a/source/blender/editors/mask/mask_editaction.c b/source/blender/editors/mask/mask_editaction.c
index 561ad004a1d..707622fa841 100644
--- a/source/blender/editors/mask/mask_editaction.c
+++ b/source/blender/editors/mask/mask_editaction.c
@@ -18,13 +18,13 @@
  * The Original Code is Copyright (C) 2008, Blender Foundation
  * This is a new part of Blender
  *
- * Contributor(s): Joshua Leung
+ * Contributor(s): Campbell Barton
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
 /** \file blender/editors/mask/mask_editaction.c
- *  \ingroup edgpencil
+ *  \ingroup edmask
  */
 
 #include <stdio.h>
@@ -49,17 +49,18 @@
 #include "ED_anim_api.h"
 #include "ED_keyframes_edit.h"
 #include "ED_mask.h"  /* own include */
+#include "ED_markers.h"
 
 /* ***************************************** */
 /* NOTE ABOUT THIS FILE:
- *  This file contains code for editing Grease Pencil data in the Action Editor
- *  as a 'keyframes', so that a user can adjust the timing of Grease Pencil drawings.
- *  Therefore, this file mostly contains functions for selecting Grease-Pencil frames.
+ *  This file contains code for editing Mask data in the Action Editor
+ *  as a 'keyframes', so that a user can adjust the timing of Mask shapekeys.
+ *  Therefore, this file mostly contains functions for selecting Mask frames (shapekeys).
  */
 /* ***************************************** */
 /* Generics - Loopers */
 
-/* Loops over the gp-frames for a gp-layer, and applies the given callback */
+/* Loops over the mask-frames for a mask-layer, and applies the given callback */
 short ED_masklayer_frames_looper(MaskLayer *masklay, Scene *scene, short (*masklay_shape_cb)(MaskLayerShape *, Scene *))
 {
 	MaskLayerShape *masklay_shape;
@@ -82,7 +83,7 @@ short ED_masklayer_frames_looper(MaskLayer *masklay, Scene *scene, short (*maskl
 /* ****************************************** */
 /* Data Conversion Tools */
 
-/* make a listing all the gp-frames in a layer as cfraelems */
+/* make a listing all the mask-frames in a layer as cfraelems */
 void ED_masklayer_make_cfra_list(MaskLayer *masklay, ListBase *elems, short onlysel)
 {
 	MaskLayerShape *masklay_shape;
@@ -92,7 +93,7 @@ void ED_masklayer_make_cfra_list(MaskLayer *masklay, ListBase *elems, short only
 	if (ELEM(NULL, masklay, elems))
 		return;
 
-	/* loop through gp-frames, adding */
+	/* loop through mask-frames, adding */
 	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
 		if ((onlysel == 0) || (masklay_shape->flag & MASK_SHAPE_SELECT)) {
 			ce = MEM_callocN(sizeof(CfraElem), "CfraElem");
@@ -127,7 +128,7 @@ short ED_masklayer_frame_select_check(MaskLayer *masklay)
 	return 0;
 }
 
-/* helper function - select gp-frame based on SELECT_* mode */
+/* helper function - select mask-frame based on SELECT_* mode */
 static void masklayshape_select(MaskLayerShape *masklay_shape, short select_mode)
 {
 	if (masklay_shape == NULL)
@@ -223,7 +224,7 @@ void ED_masklayer_frames_delete(MaskLayer *masklay)
 	}
 }
 
-/* Duplicate selected frames from given gp-layer */
+/* Duplicate selected frames from given mask-layer */
 void ED_masklayer_frames_duplicate(MaskLayer *masklay)
 {
 	MaskLayerShape *masklay_shape, *gpfn;
@@ -249,3 +250,57 @@ void ED_masklayer_frames_duplicate(MaskLayer *masklay)
 		}
 	}
 }
+
+/* -------------------------------------- */
+/* Snap Tools */
+
+static short snap_masklayer_nearest(MaskLayerShape *masklay_shape, Scene *UNUSED(scene))
+{
+	if (masklay_shape->flag & MASK_SHAPE_SELECT)
+		masklay_shape->frame = (int)(floor(masklay_shape->frame + 0.5));
+	return 0;
+}
+
+static short snap_masklayer_nearestsec(MaskLayerShape *masklay_shape, Scene *scene)
+{
+	float secf = (float)FPS;
+	if (masklay_shape->flag & MASK_SHAPE_SELECT)
+		masklay_shape->frame = (int)(floorf(masklay_shape->frame / secf + 0.5f) * secf);
+	return 0;
+}
+
+static short snap_masklayer_cframe(MaskLayerShape *masklay_shape, Scene *scene)
+{
+	if (masklay_shape->flag & MASK_SHAPE_SELECT)
+		masklay_shape->frame = (int)CFRA;
+	return 0;
+}
+
+static short snap_masklayer_nearmarker(MaskLayerShape *masklay_shape, Scene *scene)
+{
+	if (masklay_shape->flag & MASK_SHAPE_SELECT)
+		masklay_shape->frame = (int)ED_markers_find_nearest_marker_time(&scene->markers, (float)masklay_shape->frame);
+	return 0;
+}
+
+/* snap selected frames to ... */
+void ED_masklayer_snap_frames(MaskLayer *masklay, Scene *scene, short mode)
+{
+	switch (mode) {
+		case SNAP_KEYS_NEARFRAME: /* snap to nearest frame */
+			ED_masklayer_frames_looper(masklay, scene, snap_masklayer_nearest);
+			break;
+		case SNAP_KEYS_CURFRAME: /* snap to current frame */
+			ED_masklayer_frames_looper(masklay, scene, snap_masklayer_cframe);
+			break;
+		case SNAP_KEYS_NEARMARKER: /* snap to nearest marker */
+			ED_masklayer_frames_looper(masklay, scene, snap_masklayer_nearmarker);
+			break;
+		case SNAP_KEYS_NEARSEC: /* snap to nearest second */
+			ED_masklayer_frames_looper(masklay, scene, snap_masklayer_nearestsec);
+			break;
+		default: /* just in case */
+			break;
+	}
+}
+
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index cd6063b12d0..eed72935b3c 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -55,6 +55,8 @@
 
 /* ********* add primitive operators ************* */
 
+/* BMESH_TODO: 'state' is not a good name, should be flipped and called 'was_editmode',
+ * or at least something more descriptive */
 static Object *make_prim_init(bContext *C, const char *idname,
                               float *dia, float mat[][4],
                               int *state, const float loc[3], const float rot[3], const unsigned int layer)
@@ -81,16 +83,17 @@ static Object *make_prim_init(bContext *C, const char *idname,
 static void make_prim_finish(bContext *C, Object *obedit, int *state, int enter_editmode)
 {
 	BMEditMesh *em = BMEdit_FromObject(obedit);
+	const int exit_editmode = (*state && !enter_editmode);
 
 	/* Primitive has all verts selected, use vert select flush
 	 * to push this up to edges & faces. */
 	EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
 
 	/* only recalc editmode tessface if we are staying in editmode */
-	EDBM_update_generic(C, em, enter_editmode);
+	EDBM_update_generic(C, em, !exit_editmode);
 
 	/* userdef */
-	if (*state && !enter_editmode) {
+	if (exit_editmode) {
 		ED_object_exit_editmode(C, EM_FREEDATA); /* adding EM_DO_UNDO messes up operator redo */
 	}
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, obedit);
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 9dc68848c69..d5cf174b1a1 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -207,8 +207,12 @@ typedef struct KnifeTool_OpData {
 
 static ListBase *knife_get_face_kedges(KnifeTool_OpData *kcd, BMFace *f);
 
+#if 0
 static void knife_input_ray_cast(KnifeTool_OpData *kcd, const int mval_i[2],
                                  float r_origin[3], float r_ray[3]);
+#endif
+static void knife_input_ray_segment(KnifeTool_OpData *kcd, const int mval_i[2], const float ofs,
+                                    float r_origin[3], float r_dest[3]);
 
 static void knife_update_header(bContext *C, KnifeTool_OpData *kcd)
 {
@@ -379,14 +383,13 @@ static void knife_start_cut(KnifeTool_OpData *kcd)
 
 	if (kcd->prev.vert == NULL && kcd->prev.edge == NULL && is_zero_v3(kcd->prev.cage)) {
 		/* Make prevcage a point on the view ray to mouse closest to a point on model: choose vertex 0 */
-		float origin[3], ray[3], co[3];
+		float origin[3], origin_ofs[3];
 		BMVert *v0;
 
-		knife_input_ray_cast(kcd, kcd->curr.mval, origin, ray);
-		add_v3_v3v3(co, origin, ray);
+		knife_input_ray_segment(kcd, kcd->curr.mval, 1.0f, origin, origin_ofs);
 		v0 = BM_vert_at_index(kcd->em->bm, 0);
 		if (v0) {
-			closest_to_line_v3(kcd->prev.cage, v0->co, co, origin);
+			closest_to_line_v3(kcd->prev.cage, v0->co, origin_ofs, origin);
 			copy_v3_v3(kcd->prev.co, kcd->prev.cage); /*TODO: do we need this? */
 			copy_v3_v3(kcd->curr.cage, kcd->prev.cage);
 			copy_v3_v3(kcd->curr.co, kcd->prev.co);
@@ -1403,6 +1406,8 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd)
 	BLI_smallhash_release(ehash);
 }
 
+/* this works but gives numeric problems [#33400] */
+#if 0
 static void knife_input_ray_cast(KnifeTool_OpData *kcd, const int mval_i[2],
                                  float r_origin[3], float r_ray[3])
 {
@@ -1433,17 +1438,41 @@ static void knife_input_ray_cast(KnifeTool_OpData *kcd, const int mval_i[2],
 	mul_m4_v3(kcd->ob->imat, r_origin);
 	mul_m3_v3(imat, r_ray);
 }
+#endif
+
+static void knife_input_ray_segment(KnifeTool_OpData *kcd, const int mval_i[2], const float ofs,
+                                    float r_origin[3], float r_origin_ofs[3])
+{
+	bglMats mats;
+	float mval[2];
+
+	knife_bgl_get_mats(kcd, &mats);
+
+	mval[0] = (float)mval_i[0];
+	mval[1] = (float)mval_i[1];
+
+	/* unproject to find view ray */
+	ED_view3d_unproject(&mats, r_origin,     mval[0], mval[1], 0.0f);
+	ED_view3d_unproject(&mats, r_origin_ofs, mval[0], mval[1], ofs);
+
+	/* transform into object space */
+	invert_m4_m4(kcd->ob->imat, kcd->ob->obmat);
+
+	mul_m4_v3(kcd->ob->imat, r_origin);
+	mul_m4_v3(kcd->ob->imat, r_origin_ofs);
+}
 
 static BMFace *knife_find_closest_face(KnifeTool_OpData *kcd, float co[3], float cageco[3], int *is_space)
 {
 	BMFace *f;
 	float dist = KMAXDIST;
 	float origin[3];
+	float origin_ofs[3];
 	float ray[3];
 
 	/* unproject to find view ray */
-	knife_input_ray_cast(kcd, kcd->vc.mval, origin, ray);
-	add_v3_v3v3(co, origin, ray);
+	knife_input_ray_segment(kcd, kcd->vc.mval, 1.0f, origin, origin_ofs);
+	sub_v3_v3v3(ray, origin_ofs, origin);
 
 	f = BMBVH_RayCast(kcd->bmbvh, origin, ray, co, cageco);
 
@@ -1768,12 +1797,12 @@ static int knife_update_active(KnifeTool_OpData *kcd)
 	 * Note that drawing lines in `free-space` isn't properly supported
 	 * but theres no guarantee (0, 0, 0) has any geometry either - campbell */
 	if (kcd->curr.vert == NULL && kcd->curr.edge == NULL) {
-		float origin[3], ray[3], co[3];
+		float origin[3];
+		float origin_ofs[3];
 
-		knife_input_ray_cast(kcd, kcd->vc.mval, origin, ray);
-		add_v3_v3v3(co, origin, ray);
+		knife_input_ray_segment(kcd, kcd->vc.mval, 1.0f, origin, origin_ofs);
 
-		closest_to_line_v3(kcd->curr.cage, kcd->prev.cage, co, origin);
+		closest_to_line_v3(kcd->curr.cage, kcd->prev.cage, origin_ofs, origin);
 	}
 
 	if (kcd->mode == MODE_DRAGGING) {
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index f886b52e2ce..0988a196fb1 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -643,8 +643,8 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
 
 			/* apply transformation of previous parenting */
 			if (keep_transform) {
-				 /* was removed because of bug [#23577],
-				  * but this can be handy in some cases too [#32616], so make optional */
+				/* was removed because of bug [#23577],
+				 * but this can be handy in some cases too [#32616], so make optional */
 				BKE_object_apply_mat4(ob, ob->obmat, FALSE, FALSE);
 			}
 
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 9a49a1970a0..f8154f4abda 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -560,10 +560,10 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	rj->iuser.ok = 1;
 	rj->reports = op->reports;
 
-	if(v3d) {
+	if (v3d) {
 		rj->lay = v3d->lay;
 
-		if(v3d->localvd)
+		if (v3d->localvd)
 			rj->lay |= v3d->localvd->lay;
 	}
 
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index effb984c083..73f8abdf15f 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -481,7 +481,7 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
 	Main *bmain = CTX_data_main(C);
 	OGLRender *oglrender = op->customdata;
 	Scene *scene = oglrender->scene;
-	ImBuf *ibuf;
+	ImBuf *ibuf, *ibuf_save = NULL;
 	void *lock;
 	char name[FILE_MAX];
 	int ok = 0;
@@ -549,47 +549,46 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
 	if (ibuf) {
 		int needs_free = FALSE;
 
-		if (is_movie || !BKE_imtype_requires_linear_float(scene->r.im_format.imtype)) {
-			ImBuf *colormanage_ibuf;
+		ibuf_save = ibuf;
 
-			colormanage_ibuf = IMB_colormanagement_imbuf_for_write(ibuf, TRUE, TRUE, &scene->view_settings,
-			                                                       &scene->display_settings, &scene->r.im_format);
+		if (is_movie || !BKE_imtype_requires_linear_float(scene->r.im_format.imtype)) {
+			ibuf_save = IMB_colormanagement_imbuf_for_write(ibuf, TRUE, TRUE, &scene->view_settings,
+			                                                &scene->display_settings, &scene->r.im_format);
 
-			// IMB_freeImBuf(ibuf); /* owned by the image */
-			ibuf = colormanage_ibuf;
 			needs_free = TRUE;
 		}
 
 		/* color -> grayscale */
 		/* editing directly would alter the render view */
 		if (scene->r.im_format.planes == R_IMF_PLANES_BW) {
-			 ImBuf *ibuf_bw = IMB_dupImBuf(ibuf);
+			ImBuf *ibuf_bw = IMB_dupImBuf(ibuf_save);
 			IMB_color_to_bw(ibuf_bw);
 
 			if (needs_free)
-				IMB_freeImBuf(ibuf);
+				IMB_freeImBuf(ibuf_save);
 
-			ibuf = ibuf_bw;
+			ibuf_save = ibuf_bw;
 		}
 		else {
 			/* this is lightweight & doesnt re-alloc the buffers, only do this
 			 * to save the correct bit depth since the image is always RGBA */
-			ImBuf *ibuf_cpy = IMB_allocImBuf(ibuf->x, ibuf->y, scene->r.im_format.planes, 0);
-			ibuf_cpy->rect = ibuf->rect;
-			ibuf_cpy->rect_float = ibuf->rect_float;
-			ibuf_cpy->zbuf_float = ibuf->zbuf_float;
+			ImBuf *ibuf_cpy = IMB_allocImBuf(ibuf_save->x, ibuf_save->y, scene->r.im_format.planes, 0);
+
+			ibuf_cpy->rect = ibuf_save->rect;
+			ibuf_cpy->rect_float = ibuf_save->rect_float;
+			ibuf_cpy->zbuf_float = ibuf_save->zbuf_float;
 
 			if (needs_free) {
-				ibuf_cpy->mall = ibuf->mall;
-				ibuf->mall = 0;
-				IMB_freeImBuf(ibuf);
+				ibuf_cpy->mall = ibuf_save->mall;
+				ibuf_save->mall = 0;
+				IMB_freeImBuf(ibuf_save);
 			}
 
-			ibuf = ibuf_cpy;
+			ibuf_save = ibuf_cpy;
 		}
 
 		if (is_movie) {
-			ok = oglrender->mh->append_movie(&scene->r, SFRA, CFRA, (int *)ibuf->rect,
+			ok = oglrender->mh->append_movie(&scene->r, SFRA, CFRA, (int *)ibuf_save->rect,
 			                                 oglrender->sizex, oglrender->sizey, oglrender->reports);
 			if (ok) {
 				printf("Append frame %d", scene->r.cfra);
@@ -597,7 +596,7 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
 			}
 		}
 		else {
-			ok = BKE_imbuf_write_stamp(scene, camera, ibuf, name, &scene->r.im_format);
+			ok = BKE_imbuf_write_stamp(scene, camera, ibuf_save, name, &scene->r.im_format);
 
 			if (ok == 0) {
 				printf("Write error: cannot save %s\n", name);
@@ -609,8 +608,8 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
 			}
 		}
 
-		/* imbuf knows which rects are not part of ibuf */
-		IMB_freeImBuf(ibuf);
+		if (needs_free)
+			IMB_freeImBuf(ibuf_save);
 	}
 
 	BKE_image_release_ibuf(oglrender->ima, ibuf, lock);
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index e9fbb3a0885..1ed1cbb2c6b 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -156,12 +156,16 @@ void ED_render_engine_changed(Main *bmain)
 	/* on changing the render engine type, clear all running render engines */
 	bScreen *sc;
 	ScrArea *sa;
+	Scene *scene;
 
 	for (sc = bmain->screen.first; sc; sc = sc->id.next)
 		for (sa = sc->areabase.first; sa; sa = sa->next)
 			ED_render_engine_area_exit(sa);
 
 	RE_FreePersistentData();
+
+	for (scene = bmain->scene.first; scene; scene = scene->id.next)
+		ED_render_id_flush_update(bmain, &scene->id);
 }
 
 /***************************** Updates ***********************************
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index a929c3ef585..b704414c321 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -3937,7 +3937,7 @@ BLI_INLINE void rgba_float_to_uchar__mul_v3(unsigned char rgba_ub[4], const floa
 {
 	rgba_ub[0] = f_to_char(rgba[0] * rgb[0]);
 	rgba_ub[1] = f_to_char(rgba[1] * rgb[1]);
-	rgba_ub[2] = f_to_char(rgba[2] * rgb[3]);
+	rgba_ub[2] = f_to_char(rgba[2] * rgb[2]);
 	rgba_ub[3] = f_to_char(rgba[3]);
 }
 
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index ae78b71f2ad..a80d425b90a 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -52,6 +52,7 @@
 
 #include "BKE_action.h"
 #include "BKE_fcurve.h"
+#include "BKE_global.h"
 #include "BKE_nla.h"
 #include "BKE_context.h"
 #include "BKE_report.h"
@@ -493,7 +494,7 @@ static int actkeys_copy_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 
 	/* copy keyframes */
-	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
+	if (ac.datatype == ANIMCONT_GPENCIL) {
 		/* FIXME... */
 		BKE_report(op->reports, RPT_ERROR, "Keyframe pasting is not available for grease pencil mode");
 		return OPERATOR_CANCELLED;
@@ -1308,6 +1309,15 @@ void ACTION_OT_keyframe_type(wmOperatorType *ot)
 
 /* ***************** Jump to Selected Frames Operator *********************** */
 
+static int actkeys_framejump_poll(bContext *C)
+{
+	/* prevent changes during render */
+	if (G.is_rendering)
+		return 0;
+
+	return ED_operator_action_active(C);
+}
+
 /* snap current-frame indicator to 'average time' of selected keyframe */
 static int actkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op))
 {
@@ -1361,7 +1371,7 @@ void ACTION_OT_frame_jump(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec = actkeys_framejump_exec;
-	ot->poll = ED_operator_action_active;
+	ot->poll = actkeys_framejump_poll;
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -1412,15 +1422,20 @@ static void snap_action_keys(bAnimContext *ac, short mode)
 	for (ale = anim_data.first; ale; ale = ale->next) {
 		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
 		
-		if (adt) {
+		if (ale->type == ANIMTYPE_GPLAYER) {
+			ED_gplayer_snap_frames(ale->data, ac->scene, mode);
+		}
+		else if (ale->type == ANIMTYPE_MASKLAYER) {
+			ED_masklayer_snap_frames(ale->data, ac->scene, mode);
+		}
+		else if (adt) {
 			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1); 
 			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, edit_cb, calchandles_fcurve);
 			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
 		}
-		//else if (ale->type == ACTTYPE_GPLAYER)
-		//	snap_gplayer_frames(ale->data, mode);
-		else 
+		else {
 			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, edit_cb, calchandles_fcurve);
+		}
 	}
 	
 	BLI_freelistN(&anim_data);
@@ -1436,11 +1451,7 @@ static int actkeys_snap_exec(bContext *C, wmOperator *op)
 	/* get editor data */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return OPERATOR_CANCELLED;
-		
-	/* XXX... */
-	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
-		return OPERATOR_PASS_THROUGH;
-		
+	
 	/* get snapping mode */
 	mode = RNA_enum_get(op->ptr, "type");
 	
@@ -1448,7 +1459,8 @@ static int actkeys_snap_exec(bContext *C, wmOperator *op)
 	snap_action_keys(&ac, mode);
 	
 	/* validate keyframes after editing */
-	ANIM_editkeyframes_refresh(&ac);
+	if (!ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
+		ANIM_editkeyframes_refresh(&ac);
 	
 	/* set notifier that keyframes have changed */
 	WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index a7f18c9de53..91f069d16de 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -823,12 +823,12 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		ButsContextTexture *ct = sbuts->texuser;
 		PointerRNA *ptr;
 
-		if (ct)
-			return 0;  /* new shading system */
-
 		if ((ptr = get_pointer_type(path, &RNA_Material))) {
 			Material *ma = ptr->data;
 
+			if (ct)
+				return 0;  /* new shading system */
+
 			/* if we have a node material, get slot from material in material node */
 			if (ma && ma->use_nodes && ma->nodetree) {
 				/* if there's an active texture node in the node tree,
@@ -849,12 +849,18 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		else if ((ptr = get_pointer_type(path, &RNA_Lamp))) {
 			Lamp *la = ptr->data;
 
+			if (ct)
+				return 0;  /* new shading system */
+
 			if (la)
 				CTX_data_pointer_set(result, &la->id, &RNA_LampTextureSlot, la->mtex[(int)la->texact]);
 		}
 		else if ((ptr = get_pointer_type(path, &RNA_World))) {
 			World *wo = ptr->data;
 
+			if (ct)
+				return 0;  /* new shading system */
+
 			if (wo)
 				CTX_data_pointer_set(result, &wo->id, &RNA_WorldTextureSlot, wo->mtex[(int)wo->texact]);
 		}
diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c
index f19835b7f85..a215b476094 100644
--- a/source/blender/editors/space_console/console_draw.c
+++ b/source/blender/editors/space_console/console_draw.c
@@ -146,7 +146,8 @@ static int console_textview_line_get(struct TextViewContext *tvc, const char **l
 	ConsoleLine *cl = (ConsoleLine *)tvc->iter;
 	*line = cl->line;
 	*len = cl->len;
-
+	// printf("'%s' %d\n", *line, cl->len);
+	BLI_assert(cl->line[cl->len] == '\0' && (cl->len == 0 || cl->line[cl->len - 1] != '\0'));
 	return 1;
 }
 
diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c
index bb46135545c..36716aeab95 100644
--- a/source/blender/editors/space_console/console_ops.c
+++ b/source/blender/editors/space_console/console_ops.c
@@ -444,7 +444,7 @@ static int console_indent_exec(bContext *C, wmOperator *UNUSED(op))
 
 	console_line_verify_length(ci, ci->len + len);
 
-	memmove(ci->line + len, ci->line, ci->len);
+	memmove(ci->line + len, ci->line, ci->len + 1);
 	memset(ci->line, ' ', len);
 	ci->len += len;
 	BLI_assert(ci->len >= 0);
diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c
index 75add570708..be8febdab23 100644
--- a/source/blender/editors/space_console/space_console.c
+++ b/source/blender/editors/space_console/space_console.c
@@ -170,16 +170,13 @@ static int id_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(event
 
 static void id_drop_copy(wmDrag *drag, wmDropBox *drop)
 {
-	char text[64];
+	char *text;
 	ID *id = drag->poin;
-	char id_esc[(sizeof(id->name) - 2) * 2];
-
-	BLI_strescape(id_esc, id->name + 2, sizeof(id_esc));
-
-	BLI_snprintf(text, sizeof(text), "bpy.data.%s[\"%s\"]", BKE_idcode_to_name_plural(GS(id->name)), id_esc);
 
 	/* copy drag path to properties */
+	text = RNA_path_from_ID_python(id);
 	RNA_string_set(drop->ptr, "text", text);
+	MEM_freeN(text);
 }
 
 static int path_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(event))
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 453549ebf79..21b0ed99f0b 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -56,6 +56,7 @@
 #include "BLF_translation.h"
 
 #include "BKE_fcurve.h"
+#include "BKE_global.h"
 #include "BKE_nla.h"
 #include "BKE_context.h"
 #include "BKE_report.h"
@@ -1763,6 +1764,15 @@ void GRAPH_OT_euler_filter(wmOperatorType *ot)
 
 /* ***************** Jump to Selected Frames Operator *********************** */
 
+static int graphkeys_framejump_poll(bContext *C)
+{
+	/* prevent changes during render */
+	if (G.is_rendering)
+		return 0;
+
+	return graphop_visible_keyframes_poll(C);
+}
+
 /* snap current-frame indicator to 'average time' of selected keyframe */
 static int graphkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op))
 {
@@ -1829,7 +1839,7 @@ void GRAPH_OT_frame_jump(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec = graphkeys_framejump_exec;
-	ot->poll = graphop_visible_keyframes_poll;
+	ot->poll = graphkeys_framejump_poll;
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c
index 9b031c015a9..54b417e740a 100644
--- a/source/blender/editors/space_graph/graph_ops.c
+++ b/source/blender/editors/space_graph/graph_ops.c
@@ -39,6 +39,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
+#include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_sound.h"
 
@@ -66,6 +67,15 @@
  *	2) Value Indicator (stored per Graph Editor instance)
  */
 
+static int graphview_cursor_poll(bContext *C)
+{
+	/* prevent changes during render */
+	if (G.is_rendering)
+		return 0;
+
+	return ED_operator_graphedit_active(C);
+}
+
 /* Set the new frame number */
 static void graphview_cursor_apply(bContext *C, wmOperator *op)
 {
@@ -172,7 +182,7 @@ static void GRAPH_OT_cursor_set(wmOperatorType *ot)
 	ot->exec = graphview_cursor_exec;
 	ot->invoke = graphview_cursor_invoke;
 	ot->modal = graphview_cursor_modal;
-	ot->poll = ED_operator_graphedit_active;
+	ot->poll = graphview_cursor_poll;
 	
 	/* flags */
 	ot->flag = OPTYPE_BLOCKING | OPTYPE_UNDO;
diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c
index 04d2947ce89..96ac716f383 100644
--- a/source/blender/editors/space_node/node_add.c
+++ b/source/blender/editors/space_node/node_add.c
@@ -386,6 +386,9 @@ static int node_add_file_exec(bContext *C, wmOperator *op)
 	node->id = (ID *)ima;
 	id_us_plus(node->id);
 
+	BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD);
+	WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, ima);
+
 	snode_notify(C, snode);
 	snode_dag_update(C, snode);
 
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 4e2bf982ff3..e7f77db3b9e 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -2405,6 +2405,15 @@ static int strip_jump_internal(Scene *scene,
 	return change;
 }
 
+static int sequencer_strip_jump_poll(bContext *C)
+{
+	/* prevent changes during render */
+	if (G.is_rendering)
+		return 0;
+
+	return sequencer_edit_poll(C);
+}
+
 /* jump frame to edit point operator */
 static int sequencer_strip_jump_exec(bContext *C, wmOperator *op)
 {
@@ -2431,7 +2440,7 @@ void SEQUENCER_OT_strip_jump(wmOperatorType *ot)
 
 	/* api callbacks */
 	ot->exec = sequencer_strip_jump_exec;
-	ot->poll = sequencer_edit_poll;
+	ot->poll = sequencer_strip_jump_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -3076,8 +3085,12 @@ static int sequencer_change_path_invoke(bContext *C, wmOperator *op, wmEvent *UN
 {
 	Scene *scene = CTX_data_scene(C);
 	Sequence *seq = BKE_sequencer_active_get(scene);
+	char filepath[FILE_MAX];
+
+	BLI_join_dirfile(filepath, sizeof(filepath), seq->strip->dir, seq->strip->stripdata->name);
 
 	RNA_string_set(op->ptr, "directory", seq->strip->dir);
+	RNA_string_set(op->ptr, "filepath",  filepath);
 
 	/* set default display depending on seq type */
 	if (seq->type == SEQ_TYPE_IMAGE) {
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index cd6d8719544..5b7f92739ed 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -615,6 +615,8 @@ static int text_run_script(bContext *C, ReportList *reports)
 		}
 
 		BKE_report(reports, RPT_ERROR, "Python script fail, look in the console for now...");
+
+		return OPERATOR_FINISHED;
 	}
 #else
 	(void)C;
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 79c34f93a10..f272cb61c26 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -229,7 +229,10 @@ static int check_alpha_pass(Base *base)
 
 	if (G.f & G_PICKSEL)
 		return 0;
-	
+
+	if (base->object->mode & OB_MODE_ALL_PAINT)
+		return 0;
+
 	return (base->object->dtx & OB_DRAWTRANSP);
 }
 
@@ -2595,7 +2598,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 	BMIter iter;
 	int i;
 
-	/* make the precision of the pronted value proportionate to the gridsize */
+	/* make the precision of the display value proportionate to the gridsize */
 
 	if (grid < 0.01f) conv_float = "%.6g";
 	else if (grid < 0.1f) conv_float = "%.5g";
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 53f983912ac..cffa53b5dfb 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -221,7 +221,7 @@ static void edbm_backbuf_check_and_select_faces(BMEditMesh *em, int select)
 }
 
 
-/* object mode, EM_ prefix is confusing here, rename? */
+/* object mode, edbm_ prefix is confusing here, rename? */
 static void edbm_backbuf_check_and_select_verts_obmode(Mesh *me, int select)
 {
 	MVert *mv = me->mvert;
@@ -237,8 +237,8 @@ static void edbm_backbuf_check_and_select_verts_obmode(Mesh *me, int select)
 		}
 	}
 }
-/* object mode, EM_ prefix is confusing here, rename? */
 
+/* object mode, edbm_ prefix is confusing here, rename? */
 static void edbm_backbuf_check_and_select_tfaces(Mesh *me, int select)
 {
 	MPoly *mpoly = me->mpoly;
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index a6fb7e7ed00..2d95e2ecdc6 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -408,9 +408,15 @@ static void initSnappingMode(TransInfo *t)
 		
 		t->tsnap.mode = ts->snap_node_mode;
 	}
+	else if (t->spacetype == SPACE_IMAGE) {
+		/* force project off when not supported */
+		t->tsnap.project = 0;
+		
+		t->tsnap.mode = ts->snap_uv_mode;
+	}
 	else {
 		/* force project off when not supported */
-		if (t->spacetype == SPACE_IMAGE || ts->snap_mode != SCE_SNAP_MODE_FACE)
+		if (ts->snap_mode != SCE_SNAP_MODE_FACE)
 			t->tsnap.project = 0;
 		
 		t->tsnap.mode = ts->snap_mode;
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 1eec06eee75..1f3f21967f4 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -232,7 +232,7 @@ static ParamHandle *construct_param_handle(Scene *scene, Object *ob, BMEditMesh
 	BLI_srand(0);
 	
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		ScanFillVert *sf_vert, *sf_vert_last, *sf_vert_first;
+		ScanFillVert *sf_vert = NULL, *sf_vert_last, *sf_vert_first;
 		ScanFillFace *sf_tri;
 		ParamKey key, vkeys[4];
 		ParamBool pin[4], select[4];
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 5f6eb45ad70..b26c25558c3 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -116,7 +116,7 @@ void GPU_set_anisotropic(float value);
 float GPU_get_anisotropic(void);
 
 /* enable gpu mipmapping */
-void GPU_set_gpu_mipmapping(void);
+void GPU_set_gpu_mipmapping(int gpu_mipmap);
 
 /* Image updates and free
  * - these deal with images bound as opengl textures */
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index f2ddedcd76c..d466e59452b 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -240,10 +240,16 @@ static struct GPUTextureState {
 
 /* Mipmap settings */
 
-void GPU_set_gpu_mipmapping()
+void GPU_set_gpu_mipmapping(int gpu_mipmap)
 {
-	/* always enable if it's supported */
-	GTS.gpu_mipmap = GLEW_EXT_framebuffer_object;
+	int old_value = GTS.gpu_mipmap;
+
+	/* only actually enable if it's supported */
+	GTS.gpu_mipmap = gpu_mipmap && GLEW_EXT_framebuffer_object;
+
+	if (old_value != GTS.gpu_mipmap) {
+		GPU_free_images();
+	}
 }
 
 void GPU_set_mipmap(int mipmap)
@@ -721,8 +727,8 @@ int GPU_upload_dxt_texture(ImBuf *ibuf)
 	GLint format = 0;
 	int blocksize, height, width, i, size, offset = 0;
 
-	height = ibuf->x;
-	width = ibuf->y;
+	width = ibuf->x;
+	height = ibuf->y;
 
 	if (GLEW_EXT_texture_compression_s3tc) {
 		if (ibuf->dds_data.fourcc == FOURCC_DXT1)
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index cef664437b7..7a0ac29c9ab 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -253,6 +253,9 @@ static void GPU_print_framebuffer_error(GLenum status, char err_out[256])
 	switch (status) {
 		case GL_FRAMEBUFFER_COMPLETE_EXT:
 			break;
+		case GL_INVALID_OPERATION:
+			err= "Invalid operation";
+			break;
 		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
 			err= "Incomplete attachment";
 			break;
@@ -754,6 +757,7 @@ int GPU_framebuffer_texture_attach(GPUFrameBuffer *fb, GPUTexture *tex, char err
 {
 	GLenum status;
 	GLenum attachment;
+	GLenum error;
 
 	if (tex->depth)
 		attachment = GL_DEPTH_ATTACHMENT_EXT;
@@ -766,6 +770,14 @@ int GPU_framebuffer_texture_attach(GPUFrameBuffer *fb, GPUTexture *tex, char err
 	glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, attachment, 
 		tex->target, tex->bindcode, 0);
 
+	error = glGetError();
+
+	if (error == GL_INVALID_OPERATION) {
+		GPU_framebuffer_restore();
+		GPU_print_framebuffer_error(error, err_out);
+		return 0;
+	}
+
 	if (tex->depth) {
 		glDrawBuffer(GL_NONE);
 		glReadBuffer(GL_NONE);
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 497105d94ec..9c48f74bf5f 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -1497,6 +1497,16 @@ static GPUNodeLink *GPU_blender_material(GPUMaterial *mat, Material *ma)
 	return shr.combined;
 }
 
+static GPUNodeLink *gpu_material_diffuse_bsdf(GPUMaterial *mat, Material *ma)
+{
+	static float roughness = 0.0f;
+	GPUNodeLink *outlink;
+
+	GPU_link(mat, "node_bsdf_diffuse", GPU_uniform(&ma->r), GPU_uniform(&roughness), GPU_builtin(GPU_VIEW_NORMAL), &outlink);
+
+	return outlink;
+}
+
 GPUMaterial *GPU_material_from_blender(Scene *scene, Material *ma)
 {
 	GPUMaterial *mat;
@@ -1516,8 +1526,15 @@ GPUMaterial *GPU_material_from_blender(Scene *scene, Material *ma)
 		ntreeGPUMaterialNodes(ma->nodetree, mat);
 	}
 	else {
-		/* create material */
-		outlink = GPU_blender_material(mat, ma);
+		if(BKE_scene_use_new_shading_nodes(scene)) {
+			/* create simple diffuse material instead of nodes */
+			outlink = gpu_material_diffuse_bsdf(mat, ma);
+		}
+		else {
+			/* create blender material */
+			outlink = GPU_blender_material(mat, ma);
+		}
+
 		GPU_material_output_link(mat, outlink);
 	}
 
diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp
index 5cf762af3e8..903080d5b79 100644
--- a/source/blender/ikplugin/intern/itasc_plugin.cpp
+++ b/source/blender/ikplugin/intern/itasc_plugin.cpp
@@ -1636,7 +1636,7 @@ static void execute_scene(Scene *blscene, IK_Scene *ikscene, bItasc *ikparam, fl
 	// compute constraint error
 	for (i = ikscene->targets.size(); i > 0; --i) {
 		IK_Target *iktarget = ikscene->targets[i - 1];
-		if (!(iktarget->blenderConstraint->flag & CONSTRAINT_OFF)) {
+		if (!(iktarget->blenderConstraint->flag & CONSTRAINT_OFF) && iktarget->constraint) {
 			unsigned int nvalues;
 			const iTaSC::ConstraintValues *values;
 			values = iktarget->constraint->getControlParameters(&nvalues);
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 5b64416c309..8dfdbd4fddc 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -821,6 +821,14 @@ static int ffmpeg_decode_video_frame(struct anim *anim)
 	}
 	
 	if (rval == AVERROR_EOF) {
+		/* this sets size and data fields to zero,
+		   which is necessary to decode the remaining data
+		   in the decoder engine after EOF. It also prevents a memory
+		   leak, since av_read_frame spills out a full size packet even
+		   on EOF... (and: it's save to call on NULL packets) */
+
+		av_free_packet(&anim->next_packet);
+
 		anim->next_packet.size = 0;
 		anim->next_packet.data = 0;
 
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c
index 8d289de9970..f049c404e2d 100644
--- a/source/blender/imbuf/intern/divers.c
+++ b/source/blender/imbuf/intern/divers.c
@@ -196,7 +196,7 @@ void IMB_buffer_byte_from_float(uchar *rect_to, const float *rect_from,
 {
 	float tmp[4];
 	int x, y;
-	DitherContext *di;
+	DitherContext *di = NULL;
 
 	/* we need valid profiles */
 	BLI_assert(profile_to != IB_PROFILE_NONE);
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index 38bd28452f3..277f50bcdbc 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -912,6 +912,8 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context,
 	AVPacket next_packet;
 	uint64_t stream_size;
 
+	memset(&next_packet, 0, sizeof(AVPacket));
+
 	in_frame = avcodec_alloc_frame();
 
 	stream_size = avio_size(context->iFormatCtx->pb);
@@ -959,12 +961,13 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context,
 	 * according to ffmpeg docs using 0-size packets.
 	 *
 	 * At least, if we haven't already stopped... */
+
+	/* this creates the 0-size packet and prevents a memory leak. */
+	av_free_packet(&next_packet);
+
 	if (!*stop) {
 		int frame_finished;
 
-		next_packet.size = 0;
-		next_packet.data = 0;
-
 		do {
 			frame_finished = 0;
 
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 3e226135741..8af971b9b65 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1018,7 +1018,7 @@ typedef struct ToolSettings {
 
 	/* Transform */
 	char snap_mode, snap_node_mode;
-	char pad3;
+	char snap_uv_mode;
 	short snap_flag, snap_target;
 	short proportional, prop_mode;
 	char proportional_objects; /* proportional edit, object mode */
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 0df6fc41269..e22bffd7db7 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -897,6 +897,7 @@ int RNA_path_resolve_full(PointerRNA *ptr, const char *path,
 
 char *RNA_path_from_ID_to_struct(PointerRNA *ptr);
 char *RNA_path_from_ID_to_property(PointerRNA *ptr, PropertyRNA *prop);
+char *RNA_path_from_ID_python(struct ID *id);
 
 /* Quick name based property access
  *
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 470e87daeea..488dbffc3db 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -46,6 +46,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_context.h"
+#include "BKE_idcode.h"
 #include "BKE_idprop.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
@@ -4163,6 +4164,19 @@ char *RNA_path_from_ID_to_property(PointerRNA *ptr, PropertyRNA *prop)
 	return path;
 }
 
+/**
+ * Get the ID as a python representation, eg:
+ *   bpy.data.foo["bar"]
+ */
+char *RNA_path_from_ID_python(ID *id)
+{
+	char id_esc[(sizeof(id->name) - 2) * 2];
+
+	BLI_strescape(id_esc, id->name + 2, sizeof(id_esc));
+
+	return BLI_sprintfN("bpy.data.%s[\"%s\"]", BKE_idcode_to_name_plural(GS(id->name)), id_esc);
+}
+
 /* Quick name based property access */
 
 int RNA_boolean_get(PointerRNA *ptr, const char *name)
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 06df6c5afbc..a2b0945fb46 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -2207,6 +2207,7 @@ static void rna_def_modifier_smoke(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "type");
 	RNA_def_property_enum_items(prop, prop_smoke_type_items);
 	RNA_def_property_ui_text(prop, "Type", "");
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_update(prop, 0, "rna_Smoke_set_type");
 }
 
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index ffcca772764..6527fe29263 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -146,6 +146,11 @@ EnumPropertyItem snap_node_element_items[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
+EnumPropertyItem snap_uv_element_items[] = {
+	{SCE_SNAP_MODE_INCREMENT, "INCREMENT", ICON_SNAP_INCREMENT, "Increment", "Snap to increments of grid"},
+	{SCE_SNAP_MODE_VERTEX, "VERTEX", ICON_SNAP_VERTEX, "Vertex", "Snap to vertices"},
+	{0, NULL, 0, NULL, NULL}
+};
 
 /* workaround for duplicate enums,
  * have each enum line as a defne then conditionally set it or not
@@ -1689,6 +1694,13 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 	RNA_def_property_enum_items(prop, snap_node_element_items);
 	RNA_def_property_ui_text(prop, "Snap Node Element", "Type of element to snap to");
 	RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */
+	
+	/* image editor uses own set of snap modes */
+	prop = RNA_def_property(srna, "snap_uv_element", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "snap_uv_mode");
+	RNA_def_property_enum_items(prop, snap_uv_element_items);
+	RNA_def_property_ui_text(prop, "Snap UV Element", "Type of element to snap to");
+	RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */
 
 	prop = RNA_def_property(srna, "snap_target", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "snap_target");
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 2aa907b72f2..c928e91ea1f 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2977,10 +2977,9 @@ static void rna_def_space_node(BlenderRNA *brna)
 		{SNODE_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, "Color and Alpha",
 		                  "Draw image with RGB colors and alpha transparency"},
 		{SNODE_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Draw alpha transparency channel"},
-		                        /* XXX, we could use better icons here  */
-		{SNODE_SHOW_R, "RED",   ICON_COLOR, "Red", ""},
-		{SNODE_SHOW_G, "GREEN", ICON_COLOR, "Green", ""},
-		{SNODE_SHOW_B, "BLUE",  ICON_COLOR, "Blue", ""},
+		{SNODE_SHOW_R, "RED",   ICON_COLOR_RED, "Red", ""},
+		{SNODE_SHOW_G, "GREEN", ICON_COLOR_GREEN, "Green", ""},
+		{SNODE_SHOW_B, "BLUE",  ICON_COLOR_BLUE, "Blue", ""},
 		{0, NULL, 0, NULL, NULL}
 	};
 
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index b212879512e..bdf9fa4e436 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -264,19 +264,24 @@ char *rna_TextureSlot_path(PointerRNA *ptr)
 	 * may be used multiple times in the same stack
 	 */
 	if (ptr->id.data) {
-		PointerRNA id_ptr;
-		PropertyRNA *prop;
-		
-		/* find the 'textures' property of the ID-struct */
-		RNA_id_pointer_create(ptr->id.data, &id_ptr);
-		prop = RNA_struct_find_property(&id_ptr, "texture_slots");
-		
-		/* get an iterator for this property, and try to find the relevant index */
-		if (prop) {
-			int index = RNA_property_collection_lookup_index(&id_ptr, prop, ptr);
-			
-			if (index >= 0)
-				return BLI_sprintfN("texture_slots[%d]", index);
+		if (GS(((ID *)ptr->id.data)->name) == ID_BR) {
+			return BLI_strdup("texture_slot");
+		}
+		else {
+			PointerRNA id_ptr;
+			PropertyRNA *prop;
+
+			/* find the 'textures' property of the ID-struct */
+			RNA_id_pointer_create(ptr->id.data, &id_ptr);
+			prop = RNA_struct_find_property(&id_ptr, "texture_slots");
+
+			/* get an iterator for this property, and try to find the relevant index */
+			if (prop) {
+				int index = RNA_property_collection_lookup_index(&id_ptr, prop, ptr);
+
+				if (index >= 0)
+					return BLI_sprintfN("texture_slots[%d]", index);
+			}
 		}
 	}
 	
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 50341c84b8f..59a3a8c2522 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -144,6 +144,12 @@ static void rna_userdef_anisotropic_update(Main *bmain, Scene *scene, PointerRNA
 	rna_userdef_update(bmain, scene, ptr);
 }
 
+static void rna_userdef_gl_gpu_mipmaps(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
+	rna_userdef_update(bmain, scene, ptr);
+}
+
 static void rna_userdef_gl_texture_limit_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	GPU_free_images();
@@ -3228,6 +3234,11 @@ static void rna_def_userdef_system(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "16 Bit Float Textures", "Use 16 bit per component texture for float images");
 	RNA_def_property_update(prop, 0, "rna_userdef_gl_use_16bit_textures");
 
+	prop = RNA_def_property(srna, "use_gpu_mipmap", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "use_gpu_mipmap", 1);
+	RNA_def_property_ui_text(prop, "GPU Mipmap Generation", "Generate Image Mipmaps on the GPU");
+	RNA_def_property_update(prop, 0, "rna_userdef_gl_gpu_mipmaps");
+
 	prop = RNA_def_property(srna, "use_vertex_buffer_objects", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_VBO);
 	RNA_def_property_ui_text(prop, "VBOs",
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index fbd3c084e70..75e54d77b15 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -750,6 +750,10 @@ static DerivedMesh *applyModifier(
 		CDDM_calc_normals(result);
 	}
 
+	if (numFaces == 0 && numEdges != 0) {
+		modifier_setError(md, "Faces needed for useful output");
+	}
+
 	return result;
 }
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.c b/source/blender/nodes/composite/nodes/node_composite_blur.c
index b9b2406631b..eb7f7763afb 100644
--- a/source/blender/nodes/composite/nodes/node_composite_blur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_blur.c
@@ -726,7 +726,9 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
 
 static void node_composit_init_blur(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
 {
-	node->storage = MEM_callocN(sizeof(NodeBlurData), "node blur data");
+	NodeBlurData *data = MEM_callocN(sizeof(NodeBlurData), "node blur data");
+	data->filtertype = R_FILTER_GAUSS;
+	node->storage = data;
 }
 
 void register_node_type_cmp_blur(bNodeTreeType *ttype)
diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
index 656e2a72c03..214617c91e5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c
+++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
@@ -242,7 +242,7 @@ static void exec_output_file_singlelayer(RenderData *rd, bNode *node, bNodeStack
 			ImageFormatData *format = (sockdata->use_node_format ? &nimf->format : &sockdata->format);
 			char path[FILE_MAX];
 			char filename[FILE_MAX];
-			CompBuf *cbuf;
+			CompBuf *cbuf = NULL;
 			ImBuf *ibuf;
 			
 			switch (format->planes) {
diff --git a/source/blender/nodes/shader/nodes/node_shader_material.c b/source/blender/nodes/shader/nodes/node_shader_material.c
index bccf6d349cf..2902bf143c8 100644
--- a/source/blender/nodes/shader/nodes/node_shader_material.c
+++ b/source/blender/nodes/shader/nodes/node_shader_material.c
@@ -85,7 +85,7 @@ static void node_shader_exec_material(void *data, bNode *node, bNodeStack **in,
 		float col[4];
 		bNodeSocket *sock;
 		char hasinput[NUM_MAT_IN] = {'\0'};
-		int i;
+		int i, mode;
 		
 		/* note: cannot use the in[]->hasinput flags directly, as these are not necessarily
 		 * the constant input stack values (e.g. in case material node is inside a group).
@@ -142,10 +142,18 @@ static void node_shader_exec_material(void *data, bNode *node, bNodeStack **in,
 				nodestack_get_vec(&shi->translucency, SOCK_FLOAT, in[MAT_IN_TRANSLUCENCY]);
 		}
 		
+		/* make alpha output give results even if transparency is only enabled on
+		 * the material linked in this not and not on the parent material */
+		mode = shi->mode;
+		if(shi->mat->mode & MA_TRANSP)
+			shi->mode |= MA_TRANSP;
+
 		shi->nodes= 1; /* temp hack to prevent trashadow recursion */
 		node_shader_lamp_loop(shi, &shrnode);	/* clears shrnode */
 		shi->nodes= 0;
 		
+		shi->mode = mode;
+
 		/* write to outputs */
 		if (node->custom1 & SH_NODE_MAT_DIFF) {
 			copy_v3_v3(col, shrnode.combined);
diff --git a/source/blender/python/bmesh/bmesh_py_api.c b/source/blender/python/bmesh/bmesh_py_api.c
index 697a9259b37..18f5d895132 100644
--- a/source/blender/python/bmesh/bmesh_py_api.c
+++ b/source/blender/python/bmesh/bmesh_py_api.c
@@ -153,13 +153,6 @@ static struct PyMethodDef BPy_BM_methods[] = {
 PyDoc_STRVAR(BPy_BM_doc,
 "This module provides access to blenders bmesh data structures.\n"
 "\n"
-"\n"
-"Submodules:\n"
-"\n"
-"* :mod:`bmesh.utils`\n"
-"* :mod:`bmesh.types`\n"
-"\n"
-"\n"
 ".. include:: include__bmesh.rst\n"
 );
 static struct PyModuleDef BPy_BM_module_def = {
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 94cbee383ea..cdecf64c93c 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -268,6 +268,23 @@ void BPY_python_start(int argc, const char **argv)
 
 	Py_Initialize();
 
+	/* THIS IS BAD: see http://bugs.python.org/issue16129 */
+#if 1
+	/* until python provides a reliable way to set the env var */
+	PyRun_SimpleString("import sys, io\n"
+	                   "sys.__backup_stdio__ = sys.__stdout__, sys.__stderr__\n"  /* else we loose the FD's [#32720] */
+	                   "sys.__stdout__ = sys.stdout = io.TextIOWrapper(io.open(sys.stdout.fileno(), 'wb', -1), "
+	                   "encoding='utf-8', errors='surrogateescape', newline='\\n', line_buffering=True)\n"
+	                   "sys.__stderr__ = sys.stderr = io.TextIOWrapper(io.open(sys.stderr.fileno(), 'wb', -1), "
+	                   "encoding='utf-8', errors='surrogateescape', newline='\\n', line_buffering=True)\n");
+	if (PyErr_Occurred()) {
+		PyErr_Print();
+		PyErr_Clear();
+	}
+#endif
+	/* end the baddness */
+
+
 	// PySys_SetArgv(argc, argv);  /* broken in py3, not a huge deal */
 	/* sigh, why do python guys not have a (char **) version anymore? */
 	{
@@ -601,7 +618,7 @@ int BPY_button_exec(bContext *C, const char *expr, double *value, const short ve
 		}
 	}
 
-	PyC_MainModule_Backup(&main_mod);
+	PyC_MainModule_Restore(main_mod);
 	
 	bpy_context_clear(C, &gilstate);
 	
diff --git a/source/blender/python/intern/bpy_traceback.c b/source/blender/python/intern/bpy_traceback.c
index f7aa6e0880b..48bf65a841b 100644
--- a/source/blender/python/intern/bpy_traceback.c
+++ b/source/blender/python/intern/bpy_traceback.c
@@ -39,70 +39,80 @@ static const char *traceback_filepath(PyTracebackObject *tb, PyObject **coerce)
 	return PyBytes_AS_STRING((*coerce = PyUnicode_EncodeFSDefault(tb->tb_frame->f_code->co_filename)));
 }
 
-/* copied from pythonrun.c, 3.2.0 */
+/* copied from pythonrun.c, 3.3.0 */
 static int
 parse_syntax_error(PyObject *err, PyObject **message, const char **filename,
                    int *lineno, int *offset, const char **text)
 {
 	long hold;
 	PyObject *v;
+	_Py_IDENTIFIER(msg);
+	_Py_IDENTIFIER(filename);
+	_Py_IDENTIFIER(lineno);
+	_Py_IDENTIFIER(offset);
+	_Py_IDENTIFIER(text);
 
-	/* old style errors */
-	if (PyTuple_Check(err))
-		return PyArg_ParseTuple(err, "O(ziiz)", message, filename,
-		                        lineno, offset, text);
+	*message = NULL;
 
 	/* new style errors.  `err' is an instance */
-
-	if (!(v = PyObject_GetAttrString(err, "msg")))
+	*message = _PyObject_GetAttrId(err, &PyId_msg);
+	if (!*message)
 		goto finally;
-	*message = v;
 
-	if (!(v = PyObject_GetAttrString(err, "filename")))
+	v = _PyObject_GetAttrId(err, &PyId_filename);
+	if (!v)
 		goto finally;
-	if (v == Py_None)
+	if (v == Py_None) {
+		Py_DECREF(v);
 		*filename = NULL;
-	else if (!(*filename = _PyUnicode_AsString(v)))
-		goto finally;
+	}
+	else {
+		*filename = _PyUnicode_AsString(v);
+		Py_DECREF(v);
+		if (!*filename)
+			goto finally;
+	}
 
-	Py_DECREF(v);
-	if (!(v = PyObject_GetAttrString(err, "lineno")))
+	v = _PyObject_GetAttrId(err, &PyId_lineno);
+	if (!v)
 		goto finally;
 	hold = PyLong_AsLong(v);
 	Py_DECREF(v);
-	v = NULL;
 	if (hold < 0 && PyErr_Occurred())
 		goto finally;
 	*lineno = (int)hold;
 
-	if (!(v = PyObject_GetAttrString(err, "offset")))
+	v = _PyObject_GetAttrId(err, &PyId_offset);
+	if (!v)
 		goto finally;
 	if (v == Py_None) {
 		*offset = -1;
 		Py_DECREF(v);
-		v = NULL;
-	}
-	else {
+	} else {
 		hold = PyLong_AsLong(v);
 		Py_DECREF(v);
-		v = NULL;
 		if (hold < 0 && PyErr_Occurred())
 			goto finally;
 		*offset = (int)hold;
 	}
 
-	if (!(v = PyObject_GetAttrString(err, "text")))
+	v = _PyObject_GetAttrId(err, &PyId_text);
+	if (!v)
 		goto finally;
-	if (v == Py_None)
+	if (v == Py_None) {
+		Py_DECREF(v);
 		*text = NULL;
-	else if (!PyUnicode_Check(v) ||
-	         !(*text = _PyUnicode_AsString(v)))
-		goto finally;
-	Py_DECREF(v);
+	}
+	else {
+		*text = _PyUnicode_AsString(v);
+		Py_DECREF(v);
+		if (!*text)
+			goto finally;
+	}
 	return 1;
 
 finally:
-	Py_XDECREF(v);
+	Py_XDECREF(*message);
 	return 0;
 }
 /* end copied function! */
diff --git a/source/blender/python/intern/bpy_util.h b/source/blender/python/intern/bpy_util.h
index 6aa50cf88de..b5f679b741f 100644
--- a/source/blender/python/intern/bpy_util.h
+++ b/source/blender/python/intern/bpy_util.h
@@ -27,16 +27,8 @@
 #ifndef __BPY_UTIL_H__
 #define __BPY_UTIL_H__
 
-#if PY_VERSION_HEX <  0x03020000
-#  error "Python 3.2 or greater is required, you'll need to update your python."
-#endif
-
 #if PY_VERSION_HEX <  0x03030000
-#  ifdef _MSC_VER
-#    pragma message("Python 3.2 will be deprecated soon, upgrade to Python 3.3.")
-#  else
-#    warning "Python 3.2 will be deprecated soon, upgrade to Python 3.3."
-#  endif
+#  error "Python 3.3 or greater is required, you'll need to update your python."
 #endif
 
 struct EnumPropertyItem;
diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c
index a4a4010005a..202598233b6 100644
--- a/source/blender/python/mathutils/mathutils.c
+++ b/source/blender/python/mathutils/mathutils.c
@@ -35,7 +35,10 @@
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_dynstr.h"
+
+#ifndef MATH_STANDALONE
+#  include "BLI_dynstr.h"
+#endif
 
 PyDoc_STRVAR(M_Mathutils_doc,
 "This module provides access to matrices, eulers, quaternions and vectors."
@@ -302,7 +305,7 @@ int EXPP_FloatsAreEqual(float af, float bf, int maxDiff)
 
 /*---------------------- EXPP_VectorsAreEqual -------------------------
  * Builds on EXPP_FloatsAreEqual to test vectors */
-int EXPP_VectorsAreEqual(float *vecA, float *vecB, int size, int floatSteps)
+int EXPP_VectorsAreEqual(const float *vecA, const float *vecB, int size, int floatSteps)
 {
 	int x;
 	for (x = 0; x < size; x++) {
@@ -312,6 +315,7 @@ int EXPP_VectorsAreEqual(float *vecA, float *vecB, int size, int floatSteps)
 	return 1;
 }
 
+#ifndef MATH_STANDALONE
 /* dynstr as python string utility funcions, frees 'ds'! */
 PyObject *mathutils_dynstr_to_py(struct DynStr *ds)
 {
@@ -324,6 +328,7 @@ PyObject *mathutils_dynstr_to_py(struct DynStr *ds)
 	PyMem_Free(ds_buf);
 	return ret;
 }
+#endif
 
 /* silly function, we dont use arg. just check its compatible with __deepcopy__ */
 int mathutils_deepcopy_args_check(PyObject *args)
diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h
index d4673d14823..7b03b149459 100644
--- a/source/blender/python/mathutils/mathutils.h
+++ b/source/blender/python/mathutils/mathutils.h
@@ -74,7 +74,7 @@ void BaseMathObject_dealloc(BaseMathObject * self);
 PyMODINIT_FUNC PyInit_mathutils(void);
 
 int EXPP_FloatsAreEqual(float A, float B, int floatSteps);
-int EXPP_VectorsAreEqual(float *vecA, float *vecB, int size, int floatSteps);
+int EXPP_VectorsAreEqual(const float *vecA, const float *vecB, int size, int floatSteps);
 
 #define Py_NEW  1
 #define Py_WRAP 2
@@ -120,8 +120,11 @@ int mathutils_any_to_rotmat(float rmat[3][3], PyObject *value, const char *error
 
 int column_vector_multiplication(float rvec[4], VectorObject *vec, MatrixObject *mat);
 
+#ifndef MATH_STANDALONE
 /* dynstr as python string utility funcions */
 PyObject *mathutils_dynstr_to_py(struct DynStr *ds);
+#endif
+
 int mathutils_deepcopy_args_check(PyObject *args);
 
 #endif /* __MATHUTILS_H__ */
diff --git a/source/blender/python/mathutils/mathutils_Color.c b/source/blender/python/mathutils/mathutils_Color.c
index f16b488f9d0..4a29e72418b 100644
--- a/source/blender/python/mathutils/mathutils_Color.c
+++ b/source/blender/python/mathutils/mathutils_Color.c
@@ -31,7 +31,10 @@
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_dynstr.h"
+
+#ifndef MATH_STANDALONE
+#  include "BLI_dynstr.h"
+#endif
 
 #define COLOR_SIZE 3
 
@@ -131,6 +134,7 @@ static PyObject *Color_repr(ColorObject *self)
 	return ret;
 }
 
+#ifndef MATH_STANDALONE
 static PyObject *Color_str(ColorObject *self)
 {
 	DynStr *ds;
@@ -145,6 +149,7 @@ static PyObject *Color_str(ColorObject *self)
 
 	return mathutils_dynstr_to_py(ds); /* frees ds */
 }
+#endif
 
 /* ------------------------tp_richcmpr */
 /* returns -1 exception, 0 false, 1 true */
@@ -820,7 +825,11 @@ PyTypeObject color_Type = {
 	&Color_AsMapping,               /* tp_as_mapping */
 	NULL,                           /* tp_hash */
 	NULL,                           /* tp_call */
+#ifndef MATH_STANDALONE
 	(reprfunc) Color_str,           /* tp_str */
+#else
+	NULL,                           /* tp_str */
+#endif
 	NULL,                           /* tp_getattro */
 	NULL,                           /* tp_setattro */
 	NULL,                           /* tp_as_buffer */
diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c
index 829d3ee27e1..1be8a5efe28 100644
--- a/source/blender/python/mathutils/mathutils_Euler.c
+++ b/source/blender/python/mathutils/mathutils_Euler.c
@@ -35,7 +35,10 @@
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_dynstr.h"
+
+#ifndef MATH_STANDALONE
+#  include "BLI_dynstr.h"
+#endif
 
 #define EULER_SIZE 3
 
@@ -323,6 +326,7 @@ static PyObject *Euler_repr(EulerObject *self)
 	return ret;
 }
 
+#ifndef MATH_STANDALONE
 static PyObject *Euler_str(EulerObject *self)
 {
 	DynStr *ds;
@@ -337,6 +341,7 @@ static PyObject *Euler_str(EulerObject *self)
 
 	return mathutils_dynstr_to_py(ds); /* frees ds */
 }
+#endif
 
 static PyObject *Euler_richcmpr(PyObject *a, PyObject *b, int op)
 {
@@ -663,7 +668,11 @@ PyTypeObject euler_Type = {
 	&Euler_AsMapping,               /* tp_as_mapping */
 	NULL,                           /* tp_hash */
 	NULL,                           /* tp_call */
+#ifndef MATH_STANDALONE
 	(reprfunc) Euler_str,           /* tp_str */
+#else
+	NULL,                           /* tp_str */
+#endif
 	NULL,                           /* tp_getattro */
 	NULL,                           /* tp_setattro */
 	NULL,                           /* tp_as_buffer */
diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c
index 64112024dd1..05306f230d1 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.c
+++ b/source/blender/python/mathutils/mathutils_Matrix.c
@@ -35,7 +35,10 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 #include "BLI_string.h"
-#include "BLI_dynstr.h"
+
+#ifndef MATH_STANDALONE
+#  include "BLI_dynstr.h"
+#endif
 
 typedef enum eMatrixAccess_t {
 	MAT_ACCESS_ROW,
@@ -1647,6 +1650,7 @@ static PyObject *Matrix_repr(MatrixObject *self)
 	return NULL;
 }
 
+#ifndef MATH_STANDALONE
 static PyObject *Matrix_str(MatrixObject *self)
 {
 	DynStr *ds;
@@ -1682,6 +1686,7 @@ static PyObject *Matrix_str(MatrixObject *self)
 
 	return mathutils_dynstr_to_py(ds); /* frees ds */
 }
+#endif
 
 static PyObject *Matrix_richcmpr(PyObject *a, PyObject *b, int op)
 {
@@ -2418,7 +2423,11 @@ PyTypeObject matrix_Type = {
 	&Matrix_AsMapping,                  /*tp_as_mapping*/
 	NULL,                               /*tp_hash*/
 	NULL,                               /*tp_call*/
+#ifndef MATH_STANDALONE
 	(reprfunc) Matrix_str,              /*tp_str*/
+#else
+	NULL,                               /*tp_str*/
+#endif
 	NULL,                               /*tp_getattro*/
 	NULL,                               /*tp_setattro*/
 	NULL,                               /*tp_as_buffer*/
diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c
index cda39932610..c28631e5045 100644
--- a/source/blender/python/mathutils/mathutils_Quaternion.c
+++ b/source/blender/python/mathutils/mathutils_Quaternion.c
@@ -35,7 +35,10 @@
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_dynstr.h"
+
+#ifndef MATH_STANDALONE
+#  include "BLI_dynstr.h"
+#endif
 
 #define QUAT_SIZE 4
 
@@ -496,6 +499,7 @@ static PyObject *Quaternion_repr(QuaternionObject *self)
 	return ret;
 }
 
+#ifndef MATH_STANDALONE
 static PyObject *Quaternion_str(QuaternionObject *self)
 {
 	DynStr *ds;
@@ -510,6 +514,7 @@ static PyObject *Quaternion_str(QuaternionObject *self)
 
 	return mathutils_dynstr_to_py(ds); /* frees ds */
 }
+#endif
 
 static PyObject *Quaternion_richcmpr(PyObject *a, PyObject *b, int op)
 {
@@ -1202,7 +1207,11 @@ PyTypeObject quaternion_Type = {
 	&Quaternion_AsMapping,              /* tp_as_mapping */
 	NULL,                               /* tp_hash */
 	NULL,                               /* tp_call */
+#ifndef MATH_STANDALONE
 	(reprfunc) Quaternion_str,          /* tp_str */
+#else
+	NULL,                               /* tp_str */
+#endif
 	NULL,                               /* tp_getattro */
 	NULL,                               /* tp_setattro */
 	NULL,                               /* tp_as_buffer */
diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c
index e98af997507..f8159f6f187 100644
--- a/source/blender/python/mathutils/mathutils_Vector.c
+++ b/source/blender/python/mathutils/mathutils_Vector.c
@@ -35,7 +35,10 @@
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_dynstr.h"
+
+#ifndef MATH_STANDALONE
+#  include "BLI_dynstr.h"
+#endif
 
 #define MAX_DIMENSIONS 4
 
@@ -1231,6 +1234,7 @@ static PyObject *Vector_repr(VectorObject *self)
 	return ret;
 }
 
+#ifndef MATH_STANDALONE
 static PyObject *Vector_str(VectorObject *self)
 {
 	int i;
@@ -1252,7 +1256,7 @@ static PyObject *Vector_str(VectorObject *self)
 
 	return mathutils_dynstr_to_py(ds); /* frees ds */
 }
-
+#endif
 
 /* Sequence Protocol */
 /* sequence length len(vector) */
@@ -2816,7 +2820,11 @@ PyTypeObject vector_Type = {
 
 	NULL,                       /* hashfunc tp_hash; */
 	NULL,                       /* ternaryfunc tp_call; */
+#ifndef MATH_STANDALONE
 	(reprfunc)Vector_str,       /* reprfunc tp_str; */
+#else
+	NULL,                       /* reprfunc tp_str; */
+#endif
 	NULL,                       /* getattrofunc tp_getattro; */
 	NULL,                       /* setattrofunc tp_setattro; */
 
diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c
index 22317636faa..1db0538eb07 100644
--- a/source/blender/python/mathutils/mathutils_geometry.c
+++ b/source/blender/python/mathutils/mathutils_geometry.c
@@ -973,12 +973,14 @@ static PyObject *M_Geometry_points_in_planes(PyObject *UNUSED(self), PyObject *a
 
 		float n1n2[3], n2n3[3], n3n1[3];
 		float potentialVertex[3];
-		char *planes_used = MEM_callocN(sizeof(char) * len, __func__);
+		char *planes_used = PyMem_Malloc(sizeof(char) * len);
 
 		/* python */
 		PyObject *py_verts = PyList_New(0);
 		PyObject *py_plene_index = PyList_New(0);
 
+		memset(planes_used, 0, sizeof(char) * len);
+
 		for (i = 0; i < len; i++) {
 			const float *N1 = planes[i];
 			for (j = i + 1; j < len; j++) {
@@ -1031,7 +1033,7 @@ static PyObject *M_Geometry_points_in_planes(PyObject *UNUSED(self), PyObject *a
 				Py_DECREF(item);
 			}
 		}
-		MEM_freeN(planes_used);
+		PyMem_Free(planes_used);
 
 		{
 			PyObject *ret = PyTuple_New(2);
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 1b8bcd51564..c9f0bbffc63 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -183,7 +183,7 @@ void WM_init(bContext *C, int argc, const char **argv)
 		GPU_extensions_init();
 		GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
 		GPU_set_anisotropic(U.anisotropic_filter);
-		GPU_set_gpu_mipmapping();
+		GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
 
 		UI_init();
 	}
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 4fe1e3b64ab..3739462ac2c 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -392,7 +392,7 @@ int WM_keymap_remove_item(wmKeyMap *keymap, wmKeyMapItem *kmi)
 		}
 		BLI_freelinkN(&keymap->items, kmi);
 
-		WM_keyconfig_update_tag(keymap, kmi);
+		WM_keyconfig_update_tag(keymap, NULL);
 		return TRUE;
 	}
 	else {
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 80ceb5700e5..c555f771a48 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1523,49 +1523,6 @@ static void WM_OT_splash(wmOperatorType *ot)
 
 
 /* ***************** Search menu ************************* */
-static void operator_call_cb(struct bContext *C, void *UNUSED(arg1), void *arg2)
-{
-	wmOperatorType *ot = arg2;
-	
-	if (ot)
-		WM_operator_name_call(C, ot->idname, WM_OP_INVOKE_DEFAULT, NULL);
-}
-
-static void operator_search_cb(const struct bContext *C, void *UNUSED(arg), const char *str, uiSearchItems *items)
-{
-	GHashIterator *iter = WM_operatortype_iter();
-
-	for (; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
-		wmOperatorType *ot = BLI_ghashIterator_getValue(iter);
-
-		if ((ot->flag & OPTYPE_INTERNAL) && (G.debug & G_DEBUG_WM) == 0)
-			continue;
-
-		if (BLI_strcasestr(ot->name, str)) {
-			if (WM_operator_poll((bContext *)C, ot)) {
-				char name[256];
-				int len = strlen(ot->name);
-				
-				/* display name for menu, can hold hotkey */
-				BLI_strncpy(name, ot->name, sizeof(name));
-				
-				/* check for hotkey */
-				if (len < sizeof(name) - 6) {
-					if (WM_key_event_operator_string(C, ot->idname, WM_OP_EXEC_DEFAULT, NULL, TRUE,
-					                                 &name[len + 1], sizeof(name) - len - 1))
-					{
-						name[len] = '|';
-					}
-				}
-				
-				if (0 == uiSearchItemAdd(items, name, ot, 0))
-					break;
-			}
-		}
-	}
-	BLI_ghashIterator_free(iter);
-}
-
 static uiBlock *wm_block_search_menu(bContext *C, ARegion *ar, void *UNUSED(arg_op))
 {
 	static char search[256] = "";
@@ -1578,7 +1535,7 @@ static uiBlock *wm_block_search_menu(bContext *C, ARegion *ar, void *UNUSED(arg_
 	uiBlockSetFlag(block, UI_BLOCK_LOOP | UI_BLOCK_MOVEMOUSE_QUIT | UI_BLOCK_SEARCH_MENU);
 	
 	but = uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 10, 9 * UI_UNIT_X, UI_UNIT_Y, 0, 0, "");
-	uiButSetSearchFunc(but, operator_search_cb, NULL, operator_call_cb, NULL);
+	uiOperatorSearch_But(but);
 	
 	/* fake button, it holds space for search items */
 	uiDefBut(block, LABEL, 0, "", 10, 10 - uiSearchBoxHeight(), uiSearchBoxWidth(), uiSearchBoxHeight(), NULL, 0, 0, 0, 0, NULL);
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
index d29d08a5431..8b387196da7 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -82,7 +82,7 @@ typedef struct PlayState {
 
 	/* playback state */
 	short direction;
-	short next;
+	short next_frame;
 	short once;
 	short turbo;
 	short pingpong;
@@ -207,6 +207,21 @@ static int fromdisk = FALSE;
 static float zoomx = 1.0, zoomy = 1.0;
 static double ptottime = 0.0, swaptime = 0.04;
 
+static PlayAnimPict *playanim_step(PlayAnimPict *playanim, int step)
+{
+	if (step > 0) {
+		while (step-- && playanim) {
+			playanim = playanim->next;
+		}
+	}
+	else if (step < 0) {
+		while (step++ && playanim) {
+			playanim = playanim->prev;
+		}
+	}
+	return playanim;
+}
+
 static int pupdate_time(void)
 {
 	static double ltime;
@@ -485,10 +500,10 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void)
 						ps->wait2 = FALSE;
 						if (g_WS.qual & WS_QUAL_SHIFT) {
 							ps->picture = picsbase.first;
-							ps->next = 0;
+							ps->next_frame = 0;
 						}
 						else {
-							ps->next = -1;
+							ps->next_frame = -1;
 						}
 					}
 					break;
@@ -496,10 +511,10 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void)
 					if (val) {
 						ps->wait2 = FALSE;
 						if (g_WS.qual & WS_QUAL_SHIFT) {
-							ps->next = ps->direction = -1;
+							ps->next_frame = ps->direction = -1;
 						}
 						else {
-							ps->next = -10;
+							ps->next_frame = -10;
 							ps->sstep = TRUE;
 						}
 					}
@@ -510,10 +525,10 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void)
 						ps->wait2 = FALSE;
 						if (g_WS.qual & WS_QUAL_SHIFT) {
 							ps->picture = picsbase.last;
-							ps->next = 0;
+							ps->next_frame = 0;
 						}
 						else {
-							ps->next = 1;
+							ps->next_frame = 1;
 						}
 					}
 					break;
@@ -521,10 +536,10 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void)
 					if (val) {
 						ps->wait2 = FALSE;
 						if (g_WS.qual & WS_QUAL_SHIFT) {
-							ps->next = ps->direction = 1;
+							ps->next_frame = ps->direction = 1;
 						}
 						else {
-							ps->next = 10;
+							ps->next_frame = 10;
 							ps->sstep = TRUE;
 						}
 					}
@@ -535,7 +550,8 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void)
 					if (val) {
 						if (g_WS.qual & WS_QUAL_SHIFT) {
 							if (ps->curframe_ibuf)
-								printf(" Name: %s | Speed: %.2f frames/s\n", ps->curframe_ibuf->name, ps->fstep / swaptime);
+								printf(" Name: %s | Speed: %.2f frames/s\n",
+								       ps->curframe_ibuf->name, ps->fstep / swaptime);
 						}
 						else {
 							swaptime = ps->fstep / 5.0;
@@ -668,7 +684,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void)
 				}
 				ps->sstep = TRUE;
 				ps->wait2 = FALSE;
-				ps->next = 0;
+				ps->next_frame = 0;
 			}
 			break;
 		}
@@ -780,7 +796,7 @@ void WM_main_playanim(int argc, const char **argv)
 	/* ps.doubleb   = TRUE;*/ /* UNUSED */
 	ps.go        = TRUE;
 	ps.direction = TRUE;
-	ps.next      = 1;
+	ps.next_frame = 1;
 	ps.once      = FALSE;
 	ps.turbo     = FALSE;
 	ps.pingpong  = FALSE;
@@ -1033,7 +1049,7 @@ void WM_main_playanim(int argc, const char **argv)
 				}
 			}
 
-			ps.next = ps.direction;
+			ps.next_frame = ps.direction;
 
 
 			while ((hasevent = GHOST_ProcessEvents(g_WS.ghost_system, 0) || ps.wait2 != 0)) {
@@ -1062,15 +1078,10 @@ void WM_main_playanim(int argc, const char **argv)
 
 			pupdate_time();
 
-			if (ps.picture && ps.next) {
+			if (ps.picture && ps.next_frame) {
 				/* always at least set one step */
 				while (ps.picture) {
-					if (ps.next < 0) {
-						ps.picture = ps.picture->prev;
-					}
-					else {
-						ps.picture = ps.picture->next;
-					}
+					ps.picture = playanim_step(ps.picture, ps.next_frame);
 
 					if (ps.once && ps.picture != NULL) {
 						if (ps.picture->next == NULL) {
@@ -1085,12 +1096,7 @@ void WM_main_playanim(int argc, const char **argv)
 					ptottime -= swaptime;
 				}
 				if (ps.picture == NULL && ps.sstep) {
-					if (ps.next < 0) {
-						ps.picture = picsbase.last;
-					}
-					else if (ps.next > 0) {
-						ps.picture = picsbase.first;
-					}
+					ps.picture = playanim_step(ps.picture, ps.next_frame);
 				}
 			}
 			if (ps.go == FALSE) {
diff --git a/source/gameengine/GamePlayer/common/bmfont.cpp b/source/gameengine/GamePlayer/common/bmfont.cpp
index fe6f2187138..8ffbe757222 100644
--- a/source/gameengine/GamePlayer/common/bmfont.cpp
+++ b/source/gameengine/GamePlayer/common/bmfont.cpp
@@ -73,9 +73,6 @@ void printfGlyph(bmGlyph * glyph)
 }
 */
 
-#define MAX2(x,y)          ( (x)>(y) ? (x) : (y) )
-#define MAX3(x,y,z)                MAX2( MAX2((x),(y)) , (z) )  
-
 void calcAlpha(ImBuf * ibuf)
 {
 	int i;
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 475e139bfcc..a82f9ce1779 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -756,7 +756,7 @@ int main(int argc, char** argv)
 		}
 
 		GPU_set_anisotropic(U.anisotropic_filter);
-		GPU_set_gpu_mipmapping();
+		GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
 		
 		// Create the system
 		if (GHOST_ISystem::createSystem() == GHOST_kSuccess)